Ported menubar-add. Lots of changes to the hierarchy