Lots of style updates
Merge remote-tracking branch 'origin/design' into design