styling everywhere
Merge branch 'styling'