Improve some of the styling