Various tweaks to menu and views.