Added menubar, small updates