CSS and HTML layout cleanup