Updated handling for main menu buttons
Merge branch 'production' into development