More CSS but also a bit of cleaning up HTML.