Added menubar fixes