Lots of aesthetic tweaks