a bunch of menu edits