more menubar refactoring