Misc improvements to the css and layout