rm menu code from nested layouts
move menu handling code to MainController
restore lost text constants
Merge branch 'feature-gui-modular-menu' into develop