Merge of new menubar code