more main menus stuff
Merge remote-tracking branch 'origin/Nick'
merge