Move menubar to another class