Fix menu handling
Final branch commit