Changes to CSS, more HTML