Misc CSS

Re-adding a couple of tweaks
Merge pull request #401 from gavin19/master

Misc CSS