Revert "Style tweaks again"

This reverts commit d4297f9293a64870fefeb8615cea39f516c16155.
Design refresh