Refactored Menubar