Refactor parts of the CSS, fix style issues

Merged Sébastiaan Versteeg requested to merge refactor-css into master

Closes #220 (closed)

Merge request reports