Added Menubar. Updated Parser