Fixed menus to work with their control classes. A simpler example.