Back to main menu and continueing
Merge branch 'back-to-main-menu'