Refactored menubar to new directory