CSS cleanup

Reorganizing the css for easier editing