Lots of style tweaks