Slightly better menu handling