Lots of changes to catalogue, modal, and edit.