Improved layout
Split up the CSS rules