Styling tweaks and minor bits