better main menu handling