More changes to CSS and HTML