Cleanup the css

WIP refactoring