Style tweaks
Merge branch 'menu_tweaks'