better menu handling