Menu editing populates
Menu item list, can add new items
merge fix