Lots of visual tweaks