MORE styling
Merge branch 'last-minute-styling'