Finally cleaned up the CSS