Menu changes

See commit messages for more info.