View Tweaks
Merge branch 'menu_rework'