CSS and HTML Cleanup