Styling wave 1

First wave of styling. Plenty more to do.
use new hash syntax