Added Menubar
Some refactoring