Alterations to the menu

References #1219 and #1258.