added menubar, fixed layout/sizing a bit