CSS and HTML Fixes