CSS and layout cleanup