Menubar additions/fixes