Fixes to HTML and CSS