Merge pull request #26 from ppscvalentin/master

[#262]
merged conflict
[#262]

CSS cleanup