Menu improvements

Some minor fixes and additions.