Menu improvements

Fix for #752