Fixed menu handling and screen clearing