lots of CSS and HTML changes #3 #4 #8 #10 #17