Major changes to both CSS and HTML