refactored menu events