Lots of style tweaks, gotta make it pretty