Merge items and catalog controllers
the edit view should include all the show view partials, plus our edit views