Styling wave 1

First wave of styling. Plenty more to do.
Why are we doing this in here instead of using the helper?