Merge pull request #3 from philwareham/master

Some more CSS tweaks and stuff
Merge pull request #4 from philwareham/master

Last amends for today
Merge remote-tracking branch 'upstream/master'