Updated css and html

More fixes and some tidy up