Add some more styles (and pull in a few bits from live)

I've just cherry picked a few bits from live, and it's already live, but this seems to be out of date compared to live, so I've pushed in my change and another I know happened recently.
Resync styles.css to live website
Merge pull request #1 from peternewman/master

Add some more styles and resync styles.css to live website