Rewritten CSS #38

Merged
merged 2 commits into from Sep 20, 2016