HTML and CSS Markup Cleanup