Corrected issues with navigation after save or cancel of an editor. Handle add/edit cases for machine type shelves.