Tweak new style

Lots of little tweaks to the new design as it looks as though some of my changes broke when the design was updated.