Style tweaks
Merge branch 'redesign' into develop