Added all menus. Issue with jpa to resolve that didn't appear in tests but is in CL app