Added menu handling