Misc minor fixes to the menu

terencehill requested to merge terencehill/menu_fixes into master May 01, 2016