More cleaning up and refactoring of the css