Formatting update
Tweaks to menus