Tiny rework of main menu construct and usage..