Improved the menu controls to allow more valid control options.