Refactor to support OrganisationUpdateView
Merge with flash messages for create/edit/delete