Step 4.6

CSS and HTML cleanup