lots of more little adjustments to styling, can't remember
Merge branch 'ben'
d333git add .git add .