More work on menus. Much menu functionality working, except keyboard shortcuts when menus not visible.