diff --git a/app/components/forms/activity-form.hbs b/app/components/forms/activity-form.hbs
index d3331c998..4774924dd 100644
--- a/app/components/forms/activity-form.hbs
+++ b/app/components/forms/activity-form.hbs
@@ -140,13 +140,13 @@
         @errors={{@combinedErrors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo
-          @route='activities.show'
-          @model={{@model.id}}
+        <button
+          {{action @onCancel}}
+          type="button"
           class='btn btn-default'
         >
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/article-form.hbs b/app/components/forms/article-form.hbs
index 2e8f93dc0..6fafbf4a6 100644
--- a/app/components/forms/article-form.hbs
+++ b/app/components/forms/article-form.hbs
@@ -73,7 +73,7 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo @route='index' class='btn btn-default'>Annuleren</LinkTo>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>Annuleren</button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/book-form.hbs b/app/components/forms/book-form.hbs
index 44eca7305..1bca986f1 100644
--- a/app/components/forms/book-form.hbs
+++ b/app/components/forms/book-form.hbs
@@ -98,19 +98,13 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        {{#if @model.isNew}}
-          <LinkTo @route='books.index' class='btn btn-default'>
-            Annuleren
-          </LinkTo>
-        {{else}}
-          <LinkTo
-            @route='books.show'
-            @model={{@model.id}}
-            class='btn btn-default'
-          >
-            Annuleren
-          </LinkTo>
-        {{/if}}
+        <button
+          {{action @onCancel}}
+          type="button"
+          class='btn btn-default'
+        >
+          Annuleren
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/category-form.hbs b/app/components/forms/category-form.hbs
index c3075a1af..ea030c6db 100644
--- a/app/components/forms/category-form.hbs
+++ b/app/components/forms/category-form.hbs
@@ -15,15 +15,9 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        {{#if @model.isNew}}
-          <LinkTo @route='forum.categories' class='btn btn-default'>
-            Annuleren
-          </LinkTo>
-        {{else}}
-          <LinkTo @route='forum.categories.category' class='btn btn-default'>
-            Annuleren
-          </LinkTo>
-        {{/if}}
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
+          Annuleren
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/group-form.hbs b/app/components/forms/group-form.hbs
index 1e71335e6..f04b6a2c3 100644
--- a/app/components/forms/group-form.hbs
+++ b/app/components/forms/group-form.hbs
@@ -55,7 +55,7 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo @route='groups.index' class='btn btn-default'>Annuleren</LinkTo>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>Annuleren</button>
       </ModelForm::FormActions>
     </div>
   </div>
diff --git a/app/components/forms/mail-alias-form.hbs b/app/components/forms/mail-alias-form.hbs
index da9766427..48c77351c 100644
--- a/app/components/forms/mail-alias-form.hbs
+++ b/app/components/forms/mail-alias-form.hbs
@@ -101,9 +101,9 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo @route='mail-aliases.index' class='btn btn-default'>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/mandate-form.hbs b/app/components/forms/mandate-form.hbs
index f210ee574..e43b0f43b 100644
--- a/app/components/forms/mandate-form.hbs
+++ b/app/components/forms/mandate-form.hbs
@@ -41,9 +41,9 @@
       </div>
 
       <ModelForm::FormActions @model={{@model}} @errorMessage={{@errorMessage}}>
-        <LinkTo @route='debit.mandates.index' class='btn btn-default'>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/photo-album-form.hbs b/app/components/forms/photo-album-form.hbs
index 0d7b0a797..e16c2e753 100644
--- a/app/components/forms/photo-album-form.hbs
+++ b/app/components/forms/photo-album-form.hbs
@@ -73,9 +73,9 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo @route='photo-albums.index' class='btn btn-default'>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/poll-form.hbs b/app/components/forms/poll-form.hbs
index a8d667a7d..6e25c7782 100644
--- a/app/components/forms/poll-form.hbs
+++ b/app/components/forms/poll-form.hbs
@@ -36,13 +36,13 @@
         @errors={{@combinedErrors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo
-          @route='polls.show'
-          @model={{@model.id}}
+        <button
+          {{action @onCancel}}
+          type="button"
           class='btn btn-default'
         >
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/post-form.hbs b/app/components/forms/post-form.hbs
index a57309289..1b53df8f3 100644
--- a/app/components/forms/post-form.hbs
+++ b/app/components/forms/post-form.hbs
@@ -21,13 +21,13 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <LinkTo
-          @route='forum.categories.category.threads.thread.show'
-          @model={{@model.thread}}
+        <button
+          {{action @onCancel}}
+          type="button"
           class='btn btn-default'
         >
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/static-page-form.hbs b/app/components/forms/static-page-form.hbs
index f58bacdca..49c0287bc 100644
--- a/app/components/forms/static-page-form.hbs
+++ b/app/components/forms/static-page-form.hbs
@@ -42,9 +42,9 @@
       </div>
 
       <ModelForm::FormActions @model={{@model}} @errorMessage={{@errorMessage}}>
-        <LinkTo @route='static-pages.index' class='btn btn-default'>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/thread-form.hbs b/app/components/forms/thread-form.hbs
index 33b9b52f4..f4389ad3c 100644
--- a/app/components/forms/thread-form.hbs
+++ b/app/components/forms/thread-form.hbs
@@ -1,26 +1,26 @@
 <div class='card'>
   <div class='card-header'>
-    <h5>{{if @model.thread.isNew 'Topic aanmaken' 'Topic wijzigen'}}</h5>
+    <h5>{{if @model.isNew 'Topic aanmaken' 'Topic wijzigen'}}</h5>
   </div>
   <div class='card-body'>
     <form {{action @onSubmit on='submit'}}>
       <ModelForm::TextInput
-        @model={{@model.thread}}
+        @model={{@model}}
         @property='title'
         @label='Titel'
         @required={{true}}
       />
 
-      {{#if @model.post}}
+      {{#if @model.isNew }}
         <label for='forumpost-message'>Bericht *</label>
         <MdEditor
-          @content={{@model.post.message}}
+          @content={{@model.firstPost.message}}
           @textareaId='forumpost-message'
         />
       {{else}}
         {{#if (can 'edit forum/threads')}}
           <ModelForm::CheckboxInput
-            @model={{@model.thread}}
+            @model={{@model}}
             @property='isOpen'
             @label='Open voor reacties'
           />
@@ -31,22 +31,13 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        {{#if @model.thread.isNew}}
-          <LinkTo
-            @route='forum.categories.category.threads'
-            class='btn btn-default'
-          >
-            Annuleren
-          </LinkTo>
-        {{else}}
-          <LinkTo
-            @route='forum.categories.category.threads.thread'
-            @model={{@model.thread}}
-            class='btn btn-default'
-          >
-            Annuleren
-          </LinkTo>
-        {{/if}}
+        <button
+          {{action @onCancel}}
+          type="button"
+          class='btn btn-default'
+        >
+          Annuleren
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/transaction-form.hbs b/app/components/forms/transaction-form.hbs
index 64956be86..d25208572 100644
--- a/app/components/forms/transaction-form.hbs
+++ b/app/components/forms/transaction-form.hbs
@@ -36,9 +36,9 @@
       </div>
 
       <ModelForm::FormActions @model={{@model}} @errorMessage={{@errorMessage}}>
-        <LinkTo @route='debit.collections' class='btn btn-default'>
+        <button {{action @onCancel}} type="button" class='btn btn-default'>
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/user-form.hbs b/app/components/forms/user-form.hbs
index 62ba5a11d..a1dd04a49 100644
--- a/app/components/forms/user-form.hbs
+++ b/app/components/forms/user-form.hbs
@@ -170,8 +170,8 @@
     @errorMessage={{@errorMessage}}
     @inputLayout='vertical'
   >
-    <LinkTo @route='users.show' @model={{@model.id}} class='btn btn-default'>
+    <button {{action @onCancel}} type="button" class='btn btn-default'>
       Annuleren
-    </LinkTo>
+    </button>
   </ModelForm::FormActions>
 </form>
\ No newline at end of file
diff --git a/app/components/forum/forum-post-new.js b/app/components/forum/forum-post-new.js
index 6cd0f08c9..037605e85 100644
--- a/app/components/forum/forum-post-new.js
+++ b/app/components/forum/forum-post-new.js
@@ -2,25 +2,23 @@ import { inject as service } from '@ember/service';
 import Component from '@ember/component';
 import { action } from '@ember/object';
 
+// todo: incorporate the model-save-util into components?
 export default class ForumPostNewComponent extends Component {
   @service store;
-  @service('flash-notice') flashNotice;
+  @service flashNotice;
 
   @action
-  save() {
+  async save() {
     let { content, thread } = this;
-
-    this.store
+    await this.store
       .createRecord('forum/post', {
         message: content,
         thread,
       })
-      .save()
-      .then(() => {
-        this.flashNotice.sendSuccess('Forumbericht toegevoegd!');
-        this.set('content', '');
-        this.onSubmit();
-      });
+      .save();
+    this.flashNotice.sendSuccess('Forumbericht toegevoegd!');
+    this.set('content', '');
+    this.onSubmit();
   }
 
   @action
diff --git a/app/components/users/privacy-settings.hbs b/app/components/users/privacy-settings.hbs
index 819c308ba..3da63404b 100644
--- a/app/components/users/privacy-settings.hbs
+++ b/app/components/users/privacy-settings.hbs
@@ -1,5 +1,5 @@
 <h5>Privacyinstellingen</h5>
-<form class='form' {{action 'submit' on='submit'}}>
+<form class='form' {{action @onSubmit on='submit'}}>
   {{#if isOwnUser}}
     <div class='form-group row'>
       <label class='col-sm-6 col-form-label form-control-label'>
@@ -105,9 +105,9 @@
       @errorMessage={{this.errorMessage}}
       @inputLayout='vertical'
     >
-      <LinkTo @route='users.show' @model={{model.id}} class='btn btn-default'>
+      <button {{action @onCancel}} type="button" class='btn btn-default'>
         Annuleren
-      </LinkTo>
+      </button>
     </ModelForm::FormActions>
   {{/if}}
 </form>
\ No newline at end of file
diff --git a/app/components/users/privacy-settings.js b/app/components/users/privacy-settings.js
index 2211c8d9b..f306541eb 100644
--- a/app/components/users/privacy-settings.js
+++ b/app/components/users/privacy-settings.js
@@ -4,7 +4,6 @@ import {
 } from 'amber-ui/constants';
 import Component from '@glimmer/component';
 import ModelSaveUtil from 'amber-ui/utils/model-save';
-import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { isPresent } from '@ember/utils';
 import { tracked } from '@glimmer/tracking';
@@ -17,7 +16,10 @@ export default class PrivacySettingsComponent extends Component {
 
   successMessage = 'Privacyinstellingen gewijzigd!';
   successTransitionTarget = null;
-  successTransitionModel = null;
+  get successTransitionModel() {
+    return null;
+  }
+
   formActionsVisible = true;
 
   constructor() {
@@ -48,9 +50,4 @@ export default class PrivacySettingsComponent extends Component {
       this.args.model.allowTomatoSharing
     );
   }
-
-  @action
-  submit() {
-    this.modelSaveUtil.saveModel(this.args.model);
-  }
 }
diff --git a/app/controllers/activities/destroy.js b/app/controllers/activities/destroy.js
index 46c76cdd1..8673e0f8a 100644
--- a/app/controllers/activities/destroy.js
+++ b/app/controllers/activities/destroy.js
@@ -1,5 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'activities.index',
-});
+export default class ActivityDestroyController extends DestroyController {
+  successTransitionTarget = 'activities.index';
+  cancelTransitionTarget = 'activities.show';
+}
diff --git a/app/controllers/activities/edit.js b/app/controllers/activities/edit.js
index fc8130635..7a938961a 100644
--- a/app/controllers/activities/edit.js
+++ b/app/controllers/activities/edit.js
@@ -1,17 +1,18 @@
 // eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 import { ActivityCategories } from 'amber-ui/constants';
-import Controller from '@ember/controller';
 import { isNone } from '@ember/utils';
 import { inject as service } from '@ember/service';
 // eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { union } from '@ember/object/computed';
+import EditController from '../application/edit';
+import { union } from '../../utils/array-operations';
+
+export default class EditActivityController extends EditController {
+  successMessage = 'Activiteit opgeslagen!';
+  successTransitionTarget = 'activities.show';
 
-export default class EditActivityController extends Controller {
   @service session;
-  @service store;
   @service abilities;
-  @service('flash-notice') flashNotice;
 
   _activityCategoryToOption(activityCategory) {
     return {
@@ -20,57 +21,47 @@ export default class EditActivityController extends Controller {
     };
   }
 
-  @union('model.errors', 'model.form.errors')
-  combinedErrors;
+  get combinedErrors() {
+    const combined = union(
+      this.model.errors.content,
+      this.model.form?.get('errors')?.content
+    );
+    return combined.length > 0 ? combined : null;
+  }
 
-  @computed('model.form.content', {
-    get() {
-      return !isNone(this.model.form.content);
-    },
-    set(_, value) {
-      if (value) {
-        const form = this.store.createRecord('form/form');
-        this.store.createRecord('form/open-question', {
-          form,
-          question: 'Opmerkingen',
-          fieldType: 'text',
-          position: 0,
-        });
-        this.set('model.form', form);
-      } else {
-        this.set('model.form', null);
-      }
+  get activityHasForm() {
+    return !isNone(this.model.form.content);
+  }
 
-      return value;
-    },
-  })
-  activityHasForm;
+  set activityHasForm(value) {
+    if (value) {
+      const form = this.store.createRecord('form/form');
+      this.store.createRecord('form/open-question', {
+        form,
+        question: 'Opmerkingen',
+        fieldType: 'text',
+        position: 0,
+      });
+      this.model.form = form;
+    } else {
+      this.model.form = null;
+    }
+  }
 
-  @computed('session.currentUser', function () {
+  get groups() {
     if (this.abilities.can('select all groups for activities')) {
       return this.store.findAll('group');
     }
-
     return this.session.currentUser.get('groups');
-  })
-  groups;
+  }
 
-  @computed('_activityCategoryToOption', function () {
+  get activityCategoryOptions() {
     return ActivityCategories.map(this._activityCategoryToOption);
-  })
-  activityCategoryOptions;
+  }
 
   @action
   submit() {
-    this.model
-      .saveWithForm()
-      .then((savedActivity) => {
-        this.transitionToRoute('activities.show', savedActivity.id);
-        this.flashNotice.sendSuccess('Activiteit opgeslagen!');
-      })
-      .catch((error) => {
-        this.set('errorMessage', error.message);
-      });
+    this.modelSaveUtil.saveModelWithForm(this.model);
   }
 
   @action
diff --git a/app/controllers/activities/new.js b/app/controllers/activities/new.js
index cfaad13b1..480e91672 100644
--- a/app/controllers/activities/new.js
+++ b/app/controllers/activities/new.js
@@ -1,3 +1,10 @@
 import EditActivityController from './edit';
 
-export default class NewActivityController extends EditActivityController {}
+export default class NewActivityController extends EditActivityController {
+  successMessage = 'Aanmaken gelukt!';
+  cancelMessage = 'Aanmaken geannuleerd.';
+  cancelTransitionTarget = 'activities.index';
+  get cancelTransitionModel() {
+    return null;
+  }
+}
diff --git a/app/controllers/application/destroy.js b/app/controllers/application/destroy.js
index 9d80f445c..523a7bf8f 100644
--- a/app/controllers/application/destroy.js
+++ b/app/controllers/application/destroy.js
@@ -1,22 +1,38 @@
-import { isNone } from '@ember/utils';
 import EditController from 'amber-ui/controllers/application/edit';
-import ModelSaveUtil from 'amber-ui/utils/model-save';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
 
-export default EditController.extend({
-  successMessage: 'Verwijderen gelukt!',
-  actions: {
-    destroy() {
-      const modelSaveUtil = new ModelSaveUtil(this);
-      this.set('errorMessage', null);
+export default class DestroyController extends EditController {
+  @tracked destroyed = false;
+  successMessage = 'Verwijderen gelukt!';
+  cancelMessage = 'Verwijderen geannuleerd.';
+  @tracked cancelTransitionTarget = null;
+  get successTransitionModel() {
+    return null;
+  }
 
-      if (!isNone(this.model)) {
-        this.model
-          .destroyRecord()
-          .then(modelSaveUtil.onSuccess.bind(modelSaveUtil))
-          .catch(modelSaveUtil.onError.bind(modelSaveUtil));
-      }
-    },
-    saveModel: undefined,
-    submit: undefined,
-  },
-});
+  get cancelTransitionModel() {
+    return this.model;
+  }
+
+  @action
+  destroyModel() {
+    this.modelSaveUtil.destroyModel(this.model);
+  }
+
+  onError(error) {
+    // todo: somehow incorporate the error into the message in a more robust manner?
+    this.errorMessage = `Er ging iets fout bij het verwijderen: ${error}`;
+  }
+
+  transition() {
+    // todo: this does not quite work everywhere, because navigating back after the transition
+    if (this.destroyed) {
+      this.replaceRoute(...arguments);
+    } else {
+      this.transitionToRoute(...arguments);
+    }
+  }
+
+  submit = undefined;
+}
diff --git a/app/controllers/application/edit.js b/app/controllers/application/edit.js
index 13ccbe436..68cb35fe9 100644
--- a/app/controllers/application/edit.js
+++ b/app/controllers/application/edit.js
@@ -5,13 +5,20 @@ import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
 export default class EditController extends Controller {
-  @service('flash-notice') flashNotice;
+  @service flashNotice;
 
   @tracked errorMessage = null;
-
   successMessage = 'Wijzigen gelukt!';
-  successTransitionTarget = null;
-  successTransitionModel = null;
+  cancelMessage = 'Wijzigen geannuleerd.';
+  @tracked successTransitionTarget = null;
+  @tracked cancelTransitionTarget = this.successTransitionTarget; // sensible default
+  get successTransitionModel() {
+    return this.model;
+  }
+
+  get cancelTransitionModel() {
+    return this.successTransitionModel;
+  }
 
   constructor() {
     super(...arguments);
@@ -22,4 +29,15 @@ export default class EditController extends Controller {
   submit() {
     this.modelSaveUtil.saveModel(this.model);
   }
+
+  onError(error) {
+    // todo: somehow incorporate the error into the message maybe? could be useful if users can show us the error message
+    this.errorMessage =
+      'Er ging iets fout bij het opslaan van je wijzigingen. ' + error;
+  }
+
+  @action
+  cancel() {
+    this.modelSaveUtil.cancelEdit();
+  }
 }
diff --git a/app/controllers/application/new.js b/app/controllers/application/new.js
index df7eaee7e..eabb43b94 100644
--- a/app/controllers/application/new.js
+++ b/app/controllers/application/new.js
@@ -1,5 +1,10 @@
 import EditController from 'amber-ui/controllers/application/edit';
 
-export default EditController.extend({
-  successMessage: 'Aanmaken gelukt!',
-});
+export default class NewController extends EditController {
+  successMessage = 'Aanmaken gelukt!';
+  cancelMessage = 'Aanmaken geannuleerd.';
+  cancelTransitionTarget = null; // default should not be successTransitionTarget, in contrast to the edit controller
+  get cancelTransitionModel() {
+    return null;
+  }
+}
diff --git a/app/controllers/article-comments/destroy.js b/app/controllers/article-comments/destroy.js
index 2f9404321..b8eeb6244 100644
--- a/app/controllers/article-comments/destroy.js
+++ b/app/controllers/article-comments/destroy.js
@@ -1,15 +1,28 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
+import { action } from '@ember/object';
 
-export default DestroyController.extend({
-  successMessage: 'Artikelreactie verwijderd!',
-  actions: {
-    destroy() {
-      this.set('article', this.model.article);
-      this._super(...arguments);
-    },
-    onSuccess() {
-      this._super(...arguments);
-      this.transitionToRoute('articles.show', this.article);
-    },
-  },
-});
+export default class ArticleCommentDestroyController extends DestroyController {
+  successMessage = 'Artikelreactie verwijderd!';
+  successTransitionTarget = 'articles.show';
+  cancelTransitionTarget = 'articles.show';
+
+  get successTransitionModel() {
+    return this.article;
+  }
+
+  get cancelTransitionModel() {
+    return this.article;
+  }
+
+  @action
+  async destroyModel() {
+    this.article = await this.model.article;
+    super.destroyModel();
+  }
+
+  @action
+  async cancel() {
+    this.article = await this.model.article;
+    super.cancel();
+  }
+}
diff --git a/app/controllers/articles/destroy.js b/app/controllers/articles/destroy.js
index 98b57bb82..8180029e9 100644
--- a/app/controllers/articles/destroy.js
+++ b/app/controllers/articles/destroy.js
@@ -1,5 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'articles.index',
-});
+export default class ArticleDestroyController extends DestroyController {
+  successTransitionTarget = 'articles.index';
+  cancelTransitionTarget = 'articles.show';
+}
diff --git a/app/controllers/articles/edit.js b/app/controllers/articles/edit.js
index 514f49d72..5ec66fec5 100644
--- a/app/controllers/articles/edit.js
+++ b/app/controllers/articles/edit.js
@@ -1,20 +1,18 @@
 import EditController from 'amber-ui/controllers/application/edit';
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default class EditArticleController extends EditController {
+  successTransitionTarget = 'articles.show';
+
   @service session;
   @service abilities;
 
-  successTransitionTarget = 'articles.show';
-
-  @computed('session.currentUser', function () {
+  get canPin() {
     return this.session.hasPermission('article.update');
-  })
-  canPin;
+  }
 
-  @computed('session.currentUser.{group,groups}', function () {
+  get groupOptions() {
     const optionArray = [
       {
         label: '',
@@ -29,17 +27,15 @@ export default class EditArticleController extends EditController {
       });
     });
     return optionArray;
-  })
-  groupOptions;
+  }
 
-  @computed('session.currentUser', 'store', function () {
+  get groups() {
     if (this.abilities.can('select all groups for articles')) {
       return this.store.findAll('group');
     }
 
     return this.session.currentUser.get('groups');
-  })
-  groups;
+  }
 
   @action
   coverPhotoLoaded(file) {
diff --git a/app/controllers/articles/new.js b/app/controllers/articles/new.js
index b090aaaf0..8e9f92616 100644
--- a/app/controllers/articles/new.js
+++ b/app/controllers/articles/new.js
@@ -1,3 +1,10 @@
 import EditArticleController from './edit';
 
-export default class NewArticleController extends EditArticleController {}
+export default class NewArticleController extends EditArticleController {
+  successMessage = 'Artikel aangemaakt!';
+  cancelMessage = 'Artikel aanmaken geannuleerd.';
+  cancelTransitionTarget = 'articles.index';
+  get cancelTransitionModel() {
+    return null;
+  }
+}
diff --git a/app/controllers/books/destroy.js b/app/controllers/books/destroy.js
index cbbfc510e..36256fc49 100644
--- a/app/controllers/books/destroy.js
+++ b/app/controllers/books/destroy.js
@@ -2,4 +2,5 @@ import DestroyController from 'amber-ui/controllers/application/destroy';
 
 export default class BookDestroyController extends DestroyController {
   successTransitionTarget = 'books.index';
+  cancelTransitionTarget = 'books.show';
 }
diff --git a/app/controllers/books/edit.js b/app/controllers/books/edit.js
index b60b81422..5a4e83ecc 100644
--- a/app/controllers/books/edit.js
+++ b/app/controllers/books/edit.js
@@ -3,7 +3,7 @@ import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 
-export default class BookEditController extends EditController {
+export default class EditBookController extends EditController {
   @service fetch;
 
   successTransitionTarget = 'books.show';
diff --git a/app/controllers/books/new.js b/app/controllers/books/new.js
index b834f9f06..15ac9a0fc 100644
--- a/app/controllers/books/new.js
+++ b/app/controllers/books/new.js
@@ -1,3 +1,10 @@
-import EditController from './edit';
+import EditBookController from './edit';
 
-export default class NewBookController extends EditController {}
+export default class NewBookController extends EditBookController {
+  successMessage = 'Aanmaken gelukt!';
+  cancelMessage = 'Aanmaken geannuleerd.';
+  cancelTransitionTarget = 'books.index';
+  get cancelTransitionModel() {
+    return null;
+  }
+}
diff --git a/app/controllers/debit/collections/destroy.js b/app/controllers/debit/collections/destroy.js
index 43c0779f7..68a5d67a2 100644
--- a/app/controllers/debit/collections/destroy.js
+++ b/app/controllers/debit/collections/destroy.js
@@ -1,5 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'debit.collections.index',
-});
+export default class DebitCollectionDestroyController extends DestroyController {
+  successTransitionTarget = 'debit.collections.index';
+  cancelTransitionTarget = 'debit.collections.show';
+}
diff --git a/app/controllers/debit/collections/edit.js b/app/controllers/debit/collections/edit.js
index 41621d0c5..c244cb389 100644
--- a/app/controllers/debit/collections/edit.js
+++ b/app/controllers/debit/collections/edit.js
@@ -1,57 +1,38 @@
-import { computed } from '@ember/object';
-import { all } from 'rsvp';
-import { isNone } from '@ember/utils';
+import { action } from '@ember/object';
 import EditController from 'amber-ui/controllers/application/edit';
 
-export default EditController.extend({
-  successMessage: 'Incasso aangepast!',
-  users: computed('store', function () {
+export default class DebitCollectionEditController extends EditController {
+  successMessage = 'Incasso aangepast!';
+  cancelMessage = 'Incasso aanpassen geannuleerd.';
+  successTransitionTarget = 'debit.collections.show';
+
+  get users() {
     return this.store.findAll('user');
-  }),
-  actions: {
-    addUser(user) {
-      this.model
-        .get('transactions')
-        .pushObject(this.store.createRecord('debit/transaction', { user }));
-    },
-    removeTransaction(transaction) {
-      transaction.deleteRecord();
-    },
-    submit() {
-      const collection = this.model;
-      this.set('errorMessage', null);
+  }
+
+  @action
+  addUser(user) {
+    this.model
+      .get('transactions')
+      .pushObject(this.store.createRecord('debit/transaction', { user }));
+  }
+
+  @action
+  removeTransaction(transaction) {
+    // note: this deletion only persists when calling .save() on the transaction,
+    // or by calling something like saveWithTransactions() on the collection.
+    // TLDR: deleteRecord is not the same as destroyRecord
+    transaction.deleteRecord();
+  }
 
-      if (!isNone(collection)) {
-        let failedTransactions = 0;
-        collection
-          .save()
-          .then(() => {
-            return all(
-              collection.get('transactions').map((transaction) => {
-                if (transaction.get('hasDirtyAttributes')) {
-                  return transaction.save().catch(() => {
-                    failedTransactions++;
-                  });
-                }
-              })
-            );
-          })
-          .then(() => {
-            if (failedTransactions) {
-              const prefix = failedTransactions > 1 ? 'zijn' : 'is';
-              this.set(
-                'errorMessage',
-                `Er ${prefix} ${failedTransactions} transacties niet juist opgeslagen`
-              );
-            } else {
-              this.flashNotice.sendSuccess('Incasso aangepast!');
-              this.transitionToRoute('debit.collections.show', collection.id);
-            }
-          })
-          .catch((error) => {
-            this.set('errorMessage', error.message);
-          });
-      }
-    },
-  },
-});
+  @action
+  async submit() {
+    this.errorMessage = null;
+    try {
+      await this.model.saveWithTransactions();
+      this.modelSaveUtil.onSuccess();
+    } catch (error) {
+      this.modelSaveUtil.onError(error);
+    }
+  }
+}
diff --git a/app/controllers/debit/collections/new.js b/app/controllers/debit/collections/new.js
index 5792cd6f6..3864b36f6 100644
--- a/app/controllers/debit/collections/new.js
+++ b/app/controllers/debit/collections/new.js
@@ -1,19 +1,21 @@
-import { alias } from '@ember/object/computed';
 import EmberArray from '@ember/array';
-import NewController from 'amber-ui/controllers/application/new';
+import { action } from '@ember/object';
+import EditController from 'amber-ui/controllers/application/edit';
 
-export default NewController.extend({
-  successMessage: 'Incasso opgeslagen!',
-  successTransitionTarget: 'debit.collections.show',
-  successTransitionModel: alias('model.id'),
+export default class DebitCollectionNewController extends EditController {
+  successMessage = 'Incasso aangemaakt!';
+  cancelMessage = 'Incasso aanmaken geannuleerd.';
+  successTransitionTarget = 'debit.collections.show';
+  cancelTransitionTarget = 'debit.collections.index';
+  get cancelTransitionModel() {
+    return null;
+  }
 
-  validMimetypes: 'text/csv',
-  validExtensions: EmberArray.apply(['csv']),
-
-  actions: {
-    fileLoaded(file) {
-      const collection = this.model;
-      collection.set('importFile', file.data);
-    },
-  },
-});
+  validMimetypes = 'text/csv';
+  validExtensions = EmberArray.apply(['csv']);
+  @action
+  fileLoaded(file) {
+    const collection = this.model;
+    collection.importFile = file.data;
+  }
+}
diff --git a/app/controllers/debit/mandates/edit.js b/app/controllers/debit/mandates/edit.js
index e6978d04d..7779047ff 100644
--- a/app/controllers/debit/mandates/edit.js
+++ b/app/controllers/debit/mandates/edit.js
@@ -1,12 +1,13 @@
 import EditController from 'amber-ui/controllers/application/edit';
 // eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { computed } from '@ember/object';
+import { inject as service } from '@ember/service';
 
 export default class EditMandateController extends EditController {
   successTransitionTarget = 'debit.mandates.show';
 
-  @computed('store', function () {
+  @service store;
+
+  get users() {
     return this.store.findAll('user');
-  })
-  users;
+  }
 }
diff --git a/app/controllers/debit/mandates/new.js b/app/controllers/debit/mandates/new.js
index 673f6942e..6ee9e76e0 100644
--- a/app/controllers/debit/mandates/new.js
+++ b/app/controllers/debit/mandates/new.js
@@ -1,3 +1,10 @@
 import EditMandateController from './edit';
 
-export default class NewMandateController extends EditMandateController {}
+export default class NewMandateController extends EditMandateController {
+  successMessage = 'Aanmaken gelukt!';
+  cancelMessage = 'Aanmaken geannuleerd.';
+  cancelTransitionTarget = 'debit.mandates.index';
+  get cancelTransitionModel() {
+    return null;
+  }
+}
diff --git a/app/controllers/debit/transactions/destroy.js b/app/controllers/debit/transactions/destroy.js
index 1245b8f62..27d375e20 100644
--- a/app/controllers/debit/transactions/destroy.js
+++ b/app/controllers/debit/transactions/destroy.js
@@ -1,5 +1,27 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
+import { action } from '@ember/object';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'debit.collections',
-});
+export default class DebitTransactionDestroyController extends DestroyController {
+  successTransitionTarget = 'debit.collections.show';
+  cancelTransitionTarget = 'debit.collections.show';
+
+  get successTransitionModel() {
+    return this.collection;
+  }
+
+  get cancelTransitionModel() {
+    return this.collection;
+  }
+
+  @action
+  async destroyModel() {
+    this.collection = await this.model.collection;
+    super.destroyModel();
+  }
+
+  @action
+  async cancel() {
+    this.collection = await this.model.collection;
+    super.cancel();
+  }
+}
diff --git a/app/controllers/debit/transactions/edit.js b/app/controllers/debit/transactions/edit.js
index cd895c046..056a6ee12 100644
--- a/app/controllers/debit/transactions/edit.js
+++ b/app/controllers/debit/transactions/edit.js
@@ -1,23 +1,35 @@
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 import EditController from 'amber-ui/controllers/application/edit';
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { alias } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
 
 export default class EditTransactionController extends EditController {
   successMessage = 'Transactie aangepast!';
+  cancelMessage = 'Transactie wijzigen geannuleerd.';
   successTransitionTarget = 'debit.collections.show';
+  @service store;
 
-  @alias('model.collection.id')
-  successTransitionModel;
+  get successTransitionModel() {
+    return this.collection;
+  }
+
+  @action
+  async submit() {
+    this.collection = await this.model.collection;
+    super.submit();
+  }
 
-  @computed('store', function () {
+  @action
+  async cancel() {
+    this.collection = await this.model.collection;
+    super.cancel();
+  }
+
+  get users() {
     return this.store.findAll('user');
-  })
-  users;
+  }
 
   @action
   setUser(user) {
-    this.model.set('user', user);
+    this.model.user = user;
   }
 }
diff --git a/app/controllers/form/responses/destroy.js b/app/controllers/form/responses/destroy.js
index cba341929..4a90b0673 100644
--- a/app/controllers/form/responses/destroy.js
+++ b/app/controllers/form/responses/destroy.js
@@ -1,22 +1,27 @@
 import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  store: service(),
-  successMessage: 'Je inschrijving is verwijderd.',
-  successTransitionTarget: 'activities.index',
-  actions: {
-    destroy() {
-      this.set('form', this.model.form);
-      this._super(...arguments);
-    },
-    onSuccess() {
-      this._super(...arguments);
-      // Reload form to update fields as 'currentUserResponseCompleted', 'currentUserResponseId' and 'amountOfResponses'
-      this.store.peekRecord('form/form', this.form.id).reload();
-    },
-    onError() {
-      this.set('errorMessage', 'Er ging iets fout bij het verwijderen');
-    },
-  },
-});
+export default class FormResponseDestroyController extends DestroyController {
+  @service store;
+  successMessage = 'Je inschrijving is verwijderd.';
+  successTransitionTarget = 'activities.index';
+  cancelTransitionTarget = 'activities.index';
+  // important note: there is no way (currently) to redirect from a form response to the activity, since the models
+  // are not designed with this in mind.
+  // I would not mind this being enabled by a slight redesign in the future, though.
+  get cancelTransitionModel() {
+    return null;
+  }
+
+  @action
+  async destroyModel() {
+    this.form = await this.model.form;
+    super.destroyModel();
+  }
+
+  onSuccess() {
+    this.form.reload();
+    this.modelSaveUtil.redirectSuccess();
+  }
+}
diff --git a/app/controllers/forum/categories/category/destroy.js b/app/controllers/forum/categories/category/destroy.js
index eb027613a..c58211298 100644
--- a/app/controllers/forum/categories/category/destroy.js
+++ b/app/controllers/forum/categories/category/destroy.js
@@ -1,6 +1,7 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successMessage: 'Categorie verwijderd!',
-  successTransitionTarget: 'forum.index',
-});
+export default class ForumCategoryDestroyController extends DestroyController {
+  successMessage = 'Categorie verwijderd!';
+  successTransitionTarget = 'forum.index';
+  cancelTransitionTarget = 'forum.categories.category';
+}
diff --git a/app/controllers/forum/categories/category/threads/new.js b/app/controllers/forum/categories/category/threads/new.js
index 7adcd3427..9f3d170c8 100644
--- a/app/controllers/forum/categories/category/threads/new.js
+++ b/app/controllers/forum/categories/category/threads/new.js
@@ -1,51 +1,26 @@
 import NewController from 'amber-ui/controllers/application/new';
 import { action } from '@ember/object';
-import { isNone } from '@ember/utils';
-import { inject as service } from '@ember/service';
 
 export default class NewThreadController extends NewController {
-  @service('flash-notice') flashNotice;
-
-  successTransitionTarget = 'forum.categories.category.threads.thread';
-
-  routeIsNew = true;
-  content = '';
-
-  @action
-  onSuccess() {
-    // Reload thread to update thread.amountOfPosts
-    this.model.thread.reload();
-    // Reload category to update category.amountOfThreads
-    this.model.category.reload();
+  successTransitionTarget = 'forum.categories.category.threads.thread.show';
+  cancelTransitionTarget = 'forum.categories.category.show';
+  get cancelTransitionModel() {
+    return this.category;
   }
 
   @action
-  submit() {
-    this.set('errorMessage', null);
-    const { thread } = this.model;
-    const { post } = this.model;
-
-    if (isNone(post.get('message'))) {
-      this.set('errorMessage', 'Je moet eerst een bericht aanmaken');
-      return;
+  async submit() {
+    this.errorMessage = null;
+    try {
+      await this.model.saveWithFirstPost();
+      this.modelSaveUtil.onSuccess();
+    } catch (error) {
+      this.modelSaveUtil.onError(error);
     }
+  }
 
-    if (!isNone(thread)) {
-      thread
-        .save()
-        .then((savedModel) => {
-          post
-            .save()
-            .then(() => {
-              this.send('onSuccess', savedModel);
-            })
-            .catch((error) => {
-              this.send('onError', error);
-            });
-        })
-        .catch((error) => {
-          this.send('onError', error);
-        });
-    }
+  @action
+  async cancel() {
+    this.category = await this.model.category;
   }
 }
diff --git a/app/controllers/forum/categories/category/threads/thread/destroy.js b/app/controllers/forum/categories/category/threads/thread/destroy.js
index 7c05d68bf..6f9cbbf34 100644
--- a/app/controllers/forum/categories/category/threads/thread/destroy.js
+++ b/app/controllers/forum/categories/category/threads/thread/destroy.js
@@ -1,6 +1,28 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
+import { action } from '@ember/object';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'forum.categories.category',
-  successMessage: 'Topic verwijderd!',
-});
+export default class ForumThreadDestroyController extends DestroyController {
+  successTransitionTarget = 'forum.categories.category';
+  cancelTransitionTarget = 'forum.categories.category.threads.thread';
+  successMessage = 'Topic verwijderd!';
+
+  get successTransitionModel() {
+    return this.category;
+  }
+
+  get cancelTransitionModel() {
+    return this.thread;
+  }
+
+  @action
+  async destroyModel() {
+    this.category = await this.model.category;
+    super.destroyModel();
+  }
+
+  @action
+  async cancel() {
+    this.thread = await this.model.thread;
+    super.cancel();
+  }
+}
diff --git a/app/controllers/forum/categories/category/threads/thread/edit.js b/app/controllers/forum/categories/category/threads/thread/edit.js
index 49bddd270..97704fe21 100644
--- a/app/controllers/forum/categories/category/threads/thread/edit.js
+++ b/app/controllers/forum/categories/category/threads/thread/edit.js
@@ -1,12 +1,6 @@
 import EditController from 'amber-ui/controllers/application/edit';
-import { action } from '@ember/object';
 
 export default class EditThreadController extends EditController {
   successMessage = 'Topic aangepast!';
-  successTransitionTarget = 'forum.categories.category.threads.thread';
-
-  @action
-  submit() {
-    this.send('saveModel', this.model.thread);
-  }
+  successTransitionTarget = 'forum.categories.category.threads.thread.show';
 }
diff --git a/app/controllers/forum/categories/category/threads/thread/posts/destroy.js b/app/controllers/forum/categories/category/threads/thread/posts/destroy.js
index 8429d5ac3..096e466e7 100644
--- a/app/controllers/forum/categories/category/threads/thread/posts/destroy.js
+++ b/app/controllers/forum/categories/category/threads/thread/posts/destroy.js
@@ -1,6 +1,28 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
+import { action } from '@ember/object';
 
-export default DestroyController.extend({
-  successMessage: 'Forumbericht verwijderd!',
-  successTransitionTarget: 'forum.categories.category.threads.thread',
-});
+export default class ForumPostDestroyController extends DestroyController {
+  successMessage = 'Forumbericht verwijderd!';
+  successTransitionTarget = 'forum.categories.category.threads.thread.show';
+  cancelTransitionTarget = 'forum.categories.category.threads.thread.show';
+
+  get successTransitionModel() {
+    return this.thread;
+  }
+
+  get cancelTransitionModel() {
+    return this.thread;
+  }
+
+  @action
+  async cancel() {
+    this.thread = await this.model.thread;
+    super.cancel();
+  }
+
+  @action
+  async destroyModel() {
+    this.thread = await this.model.thread;
+    super.destroyModel();
+  }
+}
diff --git a/app/controllers/forum/categories/category/threads/thread/posts/edit.js b/app/controllers/forum/categories/category/threads/thread/posts/edit.js
index 380683c74..f223038d4 100644
--- a/app/controllers/forum/categories/category/threads/thread/posts/edit.js
+++ b/app/controllers/forum/categories/category/threads/thread/posts/edit.js
@@ -1,15 +1,22 @@
-import EditController from 'amber-ui/controllers/application/edit';
 import { action } from '@ember/object';
+import EditController from 'amber-ui/controllers/application/edit';
 
 export default class EditPostController extends EditController {
   successMessage = 'Forumbericht aangepast!';
-  successTransitionTarget = null; // Custom transition is used in onSuccess.
+  successTransitionTarget = 'forum.categories.category.threads.thread';
+  get successTransitionModel() {
+    return this.thread;
+  }
+
+  @action
+  async submit() {
+    this.thread = await this.model.thread;
+    super.submit();
+  }
 
   @action
-  onSuccess(model) {
-    this.transitionToRoute(
-      'forum.categories.category.threads.thread',
-      model.get('thread')
-    );
+  async cancel() {
+    this.thread = await this.model.thread;
+    super.cancel();
   }
 }
diff --git a/app/controllers/forum/categories/category/threads/thread/posts/index.js b/app/controllers/forum/categories/category/threads/thread/posts/index.js
index 9eeb6abb6..ae789b390 100644
--- a/app/controllers/forum/categories/category/threads/thread/posts/index.js
+++ b/app/controllers/forum/categories/category/threads/thread/posts/index.js
@@ -1,63 +1,86 @@
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
-import { computed } from '@ember/object';
+import { action } from '@ember/object';
 import { next } from '@ember/runloop';
+import { tracked } from '@glimmer/tracking';
 
-export default Controller.extend({
-  session: service(),
-  newContent: '',
-  queryParams: ['page'],
+export default class PostsIndexController extends Controller {
+  @service session;
+  @service store;
+  @tracked
+  newContent = '';
 
-  count: computed.reads('model.posts.length'),
+  queryParams = ['page'];
 
-  currentPageIsLastPage: computed(
-    'model.posts.meta.{page,totalPages}',
-    function () {
-      const page = parseInt(this.model.posts.meta.page, 10);
-      const totalPages = parseInt(this.model.posts.meta.totalPages, 10);
+  get count() {
+    return this.model.postsPaged.length;
+  }
 
-      return totalPages === 0 || page === totalPages;
-    }
-  ),
+  get currentPageIsLastPage() {
+    const page = parseInt(this.model.postsPaged.meta.page, 10);
+    const totalPages = parseInt(this.model.postsPaged.meta.totalPages, 10);
+
+    return totalPages === 0 || page === totalPages;
+  }
 
   advanceToPage(delta) {
-    const page = this.model.posts.meta.page;
-    const pages = this.model.posts.meta.totalPages;
+    const page = this.model.postsPaged.meta.page;
+    const pages = this.model.postsPaged.meta.totalPages;
     this.replaceRoute({
       queryParams: { page: ((page - 1 + delta + pages) % pages) + 1 },
     });
-  },
-  actions: {
-    async newPostCreated() {
-      await this.model.posts.reload();
-    },
-    addQuote(q) {
-      this.set('newContent', `${this.newContent}${q} \n\n`);
-      function scrollToNewForumPost() {
-        document
-          .getElementById('newForumPostCard')
-          .scrollIntoView({ behavior: 'smooth', block: 'center' });
-      }
-      if (!this.currentPageIsLastPage) {
-        this.transitionToRoute({
-          queryParams: { page: this.model.posts.meta.totalPages },
-        }).then(() => {
-          next(() => {
-            scrollToNewForumPost();
-          });
-        });
-      } else {
-        scrollToNewForumPost();
-      }
-    },
-    goToPreviousPage() {
-      return this.advanceToPage(-1);
-    },
-    goToNextPage() {
-      return this.advanceToPage(1);
-    },
-    onSwipe(direction) {
-      return this.advanceToPage(-direction);
-    },
-  },
-});
+  }
+
+  scrollToNewForumPost() {
+    document
+      .getElementById('newForumPostCard')
+      .scrollIntoView({ behavior: 'smooth', block: 'center' });
+  }
+
+  @action
+  async newPostCreated() {
+    // we don't need to await the posts reload. A thread can have a LOT of posts, so this is worth not awaiting.
+    // Not sure if we need the posts to be reloaded at all, but I suspect that if we don't reload them,
+    // then we will get bugs when performing any subsequent model.rollbackAttributesAndPosts()
+    // Minor concern, but better safe than sorry.
+    this.model.posts.reload();
+    await this.model.queryPostsPaged();
+    // navigate to the next page if we notice that we created a post that doesn't fit on the current page
+    if (!this.currentPageIsLastPage) {
+      await this.transitionToRoute({
+        queryParams: { page: this.model.postsPaged.meta.totalPages },
+      });
+    }
+  }
+
+  @action
+  async addQuote(q) {
+    this.set('newContent', `${this.newContent}${q} \n\n`);
+
+    if (!this.currentPageIsLastPage) {
+      await this.transitionToRoute({
+        queryParams: { page: this.model.postsPaged.meta.totalPages },
+      });
+      next(() => {
+        this.scrollToNewForumPost();
+      });
+    } else {
+      this.scrollToNewForumPost();
+    }
+  }
+
+  @action
+  goToPreviousPage() {
+    return this.advanceToPage(-1);
+  }
+
+  @action
+  goToNextPage() {
+    return this.advanceToPage(1);
+  }
+
+  @action
+  onSwipe(direction) {
+    return this.advanceToPage(-direction);
+  }
+}
diff --git a/app/controllers/forum/categories/new.js b/app/controllers/forum/categories/new.js
index 3b726eb45..c145cd600 100644
--- a/app/controllers/forum/categories/new.js
+++ b/app/controllers/forum/categories/new.js
@@ -3,4 +3,8 @@ import NewController from 'amber-ui/controllers/application/new';
 export default class NewCategoryController extends NewController {
   successMessage = 'Categorie toegevoegd!';
   successTransitionTarget = 'forum.categories';
+  cancelTransitionTarget = 'forum.categories';
+  get successTransitionModel() {
+    return null;
+  }
 }
diff --git a/app/controllers/groups/edit.js b/app/controllers/groups/edit.js
index 32ec82c15..ab2967341 100644
--- a/app/controllers/groups/edit.js
+++ b/app/controllers/groups/edit.js
@@ -1,15 +1,15 @@
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 import { A } from '@ember/array';
-import Controller from '@ember/controller';
 import { GroupKinds } from 'amber-ui/constants';
 import { all } from 'rsvp';
 import { capitalize } from '@ember/string';
 import { inject as service } from '@ember/service';
+import EditController from '../application/edit';
 
-export default class EditGroupController extends Controller {
-  @service('flash-notice') flashNotice;
+export default class EditGroupController extends EditController {
   @service session;
+  successMessage = 'Groep aangepast!';
+  successTransitionTarget = 'groups.show';
 
   _groupKindToOption(groupKind) {
     return {
@@ -18,15 +18,13 @@ export default class EditGroupController extends Controller {
     };
   }
 
-  @computed('_groupKindToOption', function () {
+  get groupKindOptions() {
     return GroupKinds.map(this._groupKindToOption);
-  })
-  groupKindOptions;
+  }
 
-  @computed('store', function () {
+  get users() {
     return this.store.findAll('user');
-  })
-  users;
+  }
 
   @action
   addUser(user) {
@@ -44,52 +42,48 @@ export default class EditGroupController extends Controller {
   }
 
   @action
-  submit() {
+  async submit() {
+    // todo: take a good look at this method, and see if its can be simplified to conform more to the
+    //  EditController + model-save-utils pattern
+    // Especially the error handling has to be cleaned up heavily. It's hard to read and understand what's going on
     const membershipErrors = A();
 
     if (this.model !== undefined) {
       let failedMembershipSavings = 0;
-      this.model
-        .save()
-        .then(() => {
-          return all(
-            this.model.get('memberships').map((membership) => {
-              if (membership.get('hasDirtyAttributes')) {
-                return membership.save().catch((error) => {
-                  membershipErrors.push({ membership, error });
-                  failedMembershipSavings++;
-                });
-              }
-            })
+      try {
+        await this.model.save();
+        await all(
+          this.model.get('memberships').map((membership) => {
+            if (membership.get('hasDirtyAttributes')) {
+              return membership.save().catch((error) => {
+                membershipErrors.push({ membership, error });
+                failedMembershipSavings++;
+              });
+            }
+          })
+        );
+        if (failedMembershipSavings) {
+          const prefix = failedMembershipSavings > 1 ? 'zijn' : 'is';
+          const suffix =
+            failedMembershipSavings > 1 ? 'lidmaatschappen' : 'lidmaatschap';
+
+          const membershipErrorText = membershipErrors.reduce(
+            (errorMessage, membershipError) => {
+              const singleError = `\t ${membershipError.membership.get(
+                'user.fullName'
+              )} (${membershipError.error.errors[0].source.pointer}) \n`;
+              return errorMessage + singleError;
+            },
+            ''
           );
-        })
-        .then(() => {
-          if (failedMembershipSavings) {
-            const prefix = failedMembershipSavings > 1 ? 'zijn' : 'is';
-            const suffix =
-              failedMembershipSavings > 1 ? 'lidmaatschappen' : 'lidmaatschap';
 
-            const membershipErrorText = membershipErrors.reduce(
-              (errorMessage, membershipError) => {
-                const singleError = `\t ${membershipError.membership.get(
-                  'user.fullName'
-                )} (${membershipError.error.errors[0].source.pointer}) \n`;
-                return errorMessage + singleError;
-              },
-              ''
-            );
-            this.set(
-              'errorMessage',
-              `Er ${prefix} ${failedMembershipSavings} ${suffix} niet juist opgeslagen: \n ${membershipErrorText}`
-            );
-          } else {
-            this.flashNotice.sendSuccess('Groep aangepast!');
-            this.transitionToRoute('groups.show', this.model.id);
-          }
-        })
-        .catch((error) => {
-          this.set('errorMessage', error.message);
-        });
+          this.errorMessage = `Er ${prefix} ${failedMembershipSavings} ${suffix} niet juist opgeslagen: \n ${membershipErrorText}`;
+        } else {
+          this.modelSaveUtil.onSuccess();
+        }
+      } catch (error) {
+        this.modelSaveUtil.onError(error);
+      }
     }
   }
 
diff --git a/app/controllers/groups/new.js b/app/controllers/groups/new.js
index 08ab6442f..f0ef74eb9 100644
--- a/app/controllers/groups/new.js
+++ b/app/controllers/groups/new.js
@@ -1,3 +1,10 @@
-import EditController from './edit';
+import EditGroupController from './edit';
 
-export default class NewGroupController extends EditController {}
+export default class NewGroupController extends EditGroupController {
+  successMessage = 'Groep aangemaakt!';
+  cancelMessage = 'Groep aanmaken geannuleerd.';
+  cancelTransitionTarget = 'groups.index';
+  get cancelTransitionModel() {
+    return null;
+  }
+}
diff --git a/app/controllers/mail-aliases/destroy.js b/app/controllers/mail-aliases/destroy.js
index 942817222..38369008b 100644
--- a/app/controllers/mail-aliases/destroy.js
+++ b/app/controllers/mail-aliases/destroy.js
@@ -1,5 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'mail-aliases.index',
-});
+export default class MailAliasDestroyController extends DestroyController {
+  successTransitionTarget = 'mail-aliases.index';
+  cancelTransitionTarget = 'mail-aliases.show';
+}
diff --git a/app/controllers/mail-aliases/edit.js b/app/controllers/mail-aliases/edit.js
index 4671084a9..242a8b7b0 100644
--- a/app/controllers/mail-aliases/edit.js
+++ b/app/controllers/mail-aliases/edit.js
@@ -1,9 +1,5 @@
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { equal, reads } from '@ember/object/computed';
 import EditController from 'amber-ui/controllers/application/edit';
 import { MailAliasModerationTypes } from 'amber-ui/constants';
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { computed } from '@ember/object';
 
 export default class EditMailAliasController extends EditController {
   successTransitionTarget = 'mail-aliases.show';
@@ -15,27 +11,27 @@ export default class EditMailAliasController extends EditController {
     };
   }
 
-  @equal('model.moderationType', 'open')
-  moderationTypeOpen;
+  get moderationTypeOpen() {
+    return this.model.moderationType === 'open';
+  }
 
-  @computed('store', function () {
+  get groups() {
     return this.store.findAll('group');
-  })
-  groups;
+  }
 
-  @computed('store', function () {
+  get users() {
     return this.store.findAll('user');
-  })
-  users;
+  }
 
-  @reads('model.user.id')
-  anyUser;
+  get anyUser() {
+    return this.model.user.get('id');
+  }
 
-  @reads('model.group.id')
-  anyGroup;
+  get anyGroup() {
+    return this.model.group.get('id');
+  }
 
-  @computed('_mailAliasModerationTypes', function () {
+  get mailAliasModerationTypes() {
     return MailAliasModerationTypes.map(this._mailAliasModerationTypes);
-  })
-  mailAliasModerationTypes;
+  }
 }
diff --git a/app/controllers/mail-aliases/new.js b/app/controllers/mail-aliases/new.js
index b8d1ae8b3..7077e86b3 100644
--- a/app/controllers/mail-aliases/new.js
+++ b/app/controllers/mail-aliases/new.js
@@ -1,3 +1,10 @@
 import EditMailAliasController from './edit';
 
-export default class NewMailAliasController extends EditMailAliasController {}
+export default class NewMailAliasController extends EditMailAliasController {
+  successMessage = 'Mail-alias aangemaakt!';
+  cancelMessage = 'Mail-alias aanmaken geannuleerd.';
+  cancelTransitionTarget = 'mail-aliases.index';
+  get cancelTransitionModel() {
+    return null;
+  }
+}
diff --git a/app/controllers/mail-moderations/accept.js b/app/controllers/mail-moderations/accept.js
index 630aba196..fdb64e93b 100644
--- a/app/controllers/mail-moderations/accept.js
+++ b/app/controllers/mail-moderations/accept.js
@@ -1,7 +1,7 @@
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import { isInvalidResponse } from 'ember-fetch/errors';
-
+// todo: octane
 export default Controller.extend({
   fetch: service(),
   errorMessage: null,
diff --git a/app/controllers/mail-moderations/destroy.js b/app/controllers/mail-moderations/destroy.js
index 3c5e80e6a..1260169c8 100644
--- a/app/controllers/mail-moderations/destroy.js
+++ b/app/controllers/mail-moderations/destroy.js
@@ -1,6 +1,8 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'mail-moderations.index',
-  successMessage: 'Mail is genegeerd',
-});
+export default class MailModerationDestroyController extends DestroyController {
+  successMessage = 'Mail is genegeerd.';
+  cancelMessage = 'Wijzigingen geannuleerd.';
+  successTransitionTarget = 'mail-moderations.index';
+  cancelTransitionTarget = 'mail-moderations.show';
+}
diff --git a/app/controllers/mail-moderations/reject.js b/app/controllers/mail-moderations/reject.js
index 4156d0c5c..db1c47ca7 100644
--- a/app/controllers/mail-moderations/reject.js
+++ b/app/controllers/mail-moderations/reject.js
@@ -1,7 +1,7 @@
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import { isInvalidResponse } from 'ember-fetch/errors';
-
+// todo: octane
 export default Controller.extend({
   fetch: service(),
   errorMessage: null,
diff --git a/app/controllers/oauth/authorize.js b/app/controllers/oauth/authorize.js
index 27973b007..5213a5496 100644
--- a/app/controllers/oauth/authorize.js
+++ b/app/controllers/oauth/authorize.js
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
-
+// todo: octane
 export default Controller.extend({
   fetch: service(),
   clientName: null,
diff --git a/app/controllers/photo-albums/new.js b/app/controllers/photo-albums/new.js
index 12db4fa2e..83e86b7c3 100644
--- a/app/controllers/photo-albums/new.js
+++ b/app/controllers/photo-albums/new.js
@@ -1,6 +1,4 @@
 import NewController from 'amber-ui/controllers/application/new';
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default class NewPhotoAlbumController extends NewController {
@@ -9,31 +7,13 @@ export default class NewPhotoAlbumController extends NewController {
   @service abilities;
 
   successTransitionTarget = 'photo-albums.photo-album.edit';
+  cancelTransitionTarget = 'photo-albums.index';
 
-  @computed('session.currentUser.{group,groups}', function () {
-    const optionArray = [
-      {
-        label: '',
-        value: null,
-      },
-    ];
-    const groups = this.session.currentUser.group;
-    groups.forEach((group) => {
-      optionArray.push({
-        label: group,
-        value: group,
-      });
-    });
-    return optionArray;
-  })
-  groupOptions;
-
-  @computed('session.currentUser', 'store', function () {
+  get groups() {
     if (this.abilities.can('select all groups for photo-albums')) {
       return this.store.findAll('group');
     }
 
     return this.session.currentUser.get('groups');
-  })
-  groups;
+  }
 }
diff --git a/app/controllers/photo-albums/photo-album/destroy.js b/app/controllers/photo-albums/photo-album/destroy.js
index b9ccda41c..859f22900 100644
--- a/app/controllers/photo-albums/photo-album/destroy.js
+++ b/app/controllers/photo-albums/photo-album/destroy.js
@@ -1,5 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'photo-albums.index',
-});
+export default class PhotoAlbumDestroyController extends DestroyController {
+  successTransitionTarget = 'photo-albums.index';
+  cancelTransitionTarget = 'photo-albums.photo-album.show';
+}
diff --git a/app/controllers/photo-albums/photo-album/edit.js b/app/controllers/photo-albums/photo-album/edit.js
index aab37d424..7d256cf39 100644
--- a/app/controllers/photo-albums/photo-album/edit.js
+++ b/app/controllers/photo-albums/photo-album/edit.js
@@ -1,28 +1,28 @@
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { action, computed } from '@ember/object';
-import NewPhotoAlbumController from 'amber-ui/controllers/photo-albums/new';
 import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import NewPhotoAlbumController from '../new';
 
+// todo: it would follow the pattern more if we let the NewPhotoAlbumController extend the EditPhotoAlbumController,
+//  instead of vice versa
 export default class EditPhotoAlbumController extends NewPhotoAlbumController {
+  successMessage = "Wijzigen en/of foto's toevoegen gelukt!";
+  cancelMessage = "Wijzigen en/of foto's toevoegen geannuleerd.";
+  successTransitionTarget = 'photo-albums.photo-album.show';
+  cancelTransitionTarget = this.successTransitionTarget;
+
+  get cancelTransitionModel() {
+    return this.successTransitionModel;
+  }
+
   @service fetch;
 
+  get dropzoneHeaders() {
+    return { Authorization: this.fetch.authorizationHeader() };
+  }
+
   @action
   submit() {
-    const photoAlbum = this.model;
-    photoAlbum
-      .save()
-      .then(() => {
-        photoAlbum.photos.reload();
-        // Only pass id when force reload is required, see http://emberigniter.com/force-store-reload-data-api-backend/
-        this.transitionToRoute('photo-albums.photo-album', photoAlbum.id);
-      })
-      .catch((error) => {
-        this.set('errorMessage', error.message);
-      });
+    super.submit();
+    this.model.photos.reload();
   }
-
-  @computed(function () {
-    return { Authorization: this.fetch.authorizationHeader() };
-  })
-  dropzoneHeaders;
 }
diff --git a/app/controllers/photo-albums/photo-album/photos/destroy.js b/app/controllers/photo-albums/photo-album/photos/destroy.js
index f13def398..855425c3e 100644
--- a/app/controllers/photo-albums/photo-album/photos/destroy.js
+++ b/app/controllers/photo-albums/photo-album/photos/destroy.js
@@ -1,5 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'photo-albums.photo-album.photos.index',
-});
+export default class PhotoAlbumPhotoDestroyController extends DestroyController {
+  successTransitionTarget = 'photo-albums.photo-album.photos.index';
+  cancelTransitionTarget = 'photo-albums.photo-album.photos.show';
+}
diff --git a/app/controllers/photo-comments/destroy.js b/app/controllers/photo-comments/destroy.js
index 65cfdbad2..c88ba7919 100644
--- a/app/controllers/photo-comments/destroy.js
+++ b/app/controllers/photo-comments/destroy.js
@@ -1,15 +1,37 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
+import { action } from '@ember/object';
 
-export default DestroyController.extend({
-  successMessage: 'Fotoreactie verwijderd!',
-  actions: {
-    destroy() {
-      this.set('photoAlbum', this.model.photo.get('photoAlbum'));
-      this._super(...arguments);
-    },
-    onSuccess() {
-      this._super(...arguments);
-      this.transitionToRoute('photo-albums.photo-album.show', this.photoAlbum);
-    },
-  },
-});
+export default class PhotoCommentDestroyController extends DestroyController {
+  successMessage = 'Fotoreactie verwijderd!';
+  successTransitionTarget = 'photo-albums.photo-album.photos.show';
+  cancelTransitionTarget = 'photo-albums.photo-album.photos.show';
+
+  get successTransitionModel() {
+    return this.photo;
+  }
+
+  get cancelTransitionModel() {
+    return this.photo;
+  }
+
+  @action
+  async destroyModel() {
+    this.photo = await this.model.photo;
+    super.destroyModel();
+  }
+
+  @action
+  async cancel() {
+    this.photo = await this.model.photo;
+    super.cancel();
+  }
+
+  async transition(transitionTarget, transitionModelID) {
+    const photoAlbumModel = await this.photo.photoAlbum;
+    this.transitionToRoute(
+      transitionTarget,
+      photoAlbumModel.id,
+      transitionModelID
+    );
+  }
+}
diff --git a/app/controllers/polls/destroy.js b/app/controllers/polls/destroy.js
index b08af4956..185fc2534 100644
--- a/app/controllers/polls/destroy.js
+++ b/app/controllers/polls/destroy.js
@@ -1,5 +1,8 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'polls.index',
-});
+export default class PollDestroyController extends DestroyController {
+  successMessage = 'Poll verwijderd!';
+  cancelMessage = 'Poll verwijderen geannuleerd.';
+  successTransitionTarget = 'polls.index';
+  cancelTransitionTarget = 'polls.show';
+}
diff --git a/app/controllers/polls/edit.js b/app/controllers/polls/edit.js
index 6b6d03551..e3e8baf58 100644
--- a/app/controllers/polls/edit.js
+++ b/app/controllers/polls/edit.js
@@ -1,28 +1,21 @@
-import Controller from '@ember/controller';
+import EditController from '../application/edit';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { union } from '@ember/object/computed';
+import { union } from '../../utils/array-operations';
 
-export default class EditPollController extends Controller {
-  @service('flash-notice') flashNotice;
-  @service session;
-  @service store;
-
-  @union('model.errors', 'model.form.errors')
-  combinedErrors;
+export default class EditPollController extends EditController {
+  successMessage = 'Poll opgeslagen!';
+  successTransitionTarget = 'polls.show';
 
   @action
-  submit() {
-    const poll = this.model;
-    poll
-      .saveWithForm()
-      .then((savedPoll) => {
-        this.transitionToRoute('polls.show', savedPoll.get('id'));
-        this.flashNotice.sendSuccess('Poll opgeslagen!');
-      })
-      .catch((error) => {
-        this.set('errorMessage', error.message);
-      });
+  async submit() {
+    await this.modelSaveUtil.saveModelWithForm(this.model);
+  }
+
+  get combinedErrors() {
+    const combined = union(
+      this.model.errors.content,
+      this.model.form?.get('errors')?.content
+    );
+    return combined.length > 0 ? combined : null;
   }
 }
diff --git a/app/controllers/polls/new.js b/app/controllers/polls/new.js
index 198bc2b6d..c3ab7785f 100644
--- a/app/controllers/polls/new.js
+++ b/app/controllers/polls/new.js
@@ -1,3 +1,10 @@
 import EditPollController from './edit';
 
-export default class NewPollController extends EditPollController {}
+export default class NewPollController extends EditPollController {
+  successMessage = 'Aanmaken gelukt!';
+  cancelMessage = 'Aanmaken geannuleerd.';
+  cancelTransitionTarget = 'polls.index';
+  get cancelTransitionModel() {
+    return null;
+  }
+}
diff --git a/app/controllers/sog/name-trainer.js b/app/controllers/sog/name-trainer.js
index 11ffc4b62..5aa4f5955 100644
--- a/app/controllers/sog/name-trainer.js
+++ b/app/controllers/sog/name-trainer.js
@@ -1,7 +1,7 @@
 import Controller from '@ember/controller';
 import { computed } from '@ember/object';
 import { run } from '@ember/runloop';
-
+// todo: octane
 export default Controller.extend({
   queryParams: ['groupId', 'difficulty'],
   groupId: null,
diff --git a/app/controllers/static-pages/destroy.js b/app/controllers/static-pages/destroy.js
index 1f4b618c3..00adb245e 100644
--- a/app/controllers/static-pages/destroy.js
+++ b/app/controllers/static-pages/destroy.js
@@ -1,5 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'static-pages.index',
-});
+export default class StaticPageDestroyController extends DestroyController {
+  successTransitionTarget = 'static-pages.index';
+  cancelTransitionTarget = 'static-pages.show';
+}
diff --git a/app/controllers/static-pages/edit.js b/app/controllers/static-pages/edit.js
index 1bb6847e4..7d5633991 100644
--- a/app/controllers/static-pages/edit.js
+++ b/app/controllers/static-pages/edit.js
@@ -1,20 +1,17 @@
 import EditController from 'amber-ui/controllers/application/edit';
 import { StaticPageCategories } from 'amber-ui/constants';
 import { capitalize } from '@ember/string';
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { computed } from '@ember/object';
 
 export default class EditStaticPageController extends EditController {
   successMessage = 'Infopagina aangepast!';
   successTransitionTarget = 'static-pages.show';
 
-  @computed(function () {
+  get staticPageCategoryOptions() {
     return StaticPageCategories.map((pageCategory) => {
       return {
         value: pageCategory,
         label: capitalize(pageCategory),
       };
     });
-  })
-  staticPageCategoryOptions;
+  }
 }
diff --git a/app/controllers/static-pages/new.js b/app/controllers/static-pages/new.js
index 06e677354..297dee018 100644
--- a/app/controllers/static-pages/new.js
+++ b/app/controllers/static-pages/new.js
@@ -1,3 +1,10 @@
 import EditStaticPageController from './edit';
 
-export default class NewStaticPageController extends EditStaticPageController {}
+export default class NewStaticPageController extends EditStaticPageController {
+  successMessage = 'Infopagina aangemaakt!';
+  cancelMessage = 'Aanmaken geannuleerd.';
+  cancelTransitionTarget = 'static-pages.index';
+  get cancelTransitionModel() {
+    return null;
+  }
+}
diff --git a/app/controllers/users/activate-account.js b/app/controllers/users/activate-account.js
index 9d7ade848..544eb83da 100644
--- a/app/controllers/users/activate-account.js
+++ b/app/controllers/users/activate-account.js
@@ -4,7 +4,7 @@ import { computed } from '@ember/object';
 import { run } from '@ember/runloop';
 import { isNone } from '@ember/utils';
 import { isNotFoundResponse } from 'ember-fetch/errors';
-
+// todo: octane
 export default Controller.extend({
   fetch: service(),
 
diff --git a/app/controllers/users/batch/new.js b/app/controllers/users/batch/new.js
index b2ce97f16..d3a32db56 100644
--- a/app/controllers/users/batch/new.js
+++ b/app/controllers/users/batch/new.js
@@ -1,85 +1,95 @@
 import { inject as service } from '@ember/service';
 import EmberArray, { A } from '@ember/array';
-import Controller from '@ember/controller';
-import { computed } from '@ember/object';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
 import { isInvalidResponse } from 'ember-fetch/errors';
+import NewController from '../../application/new';
 
-export default Controller.extend({
-  flashNotice: service('flash-notice'),
-  fetch: service(),
-  successMessage: null,
-  importFile: null,
-  addToGroup: null,
-  reviewing: false,
-  newUsers: A(),
-  importErrors: A(),
-  properties: A(),
+export default class NewUserBatchController extends NewController {
+  successMessage = 'Gebruikers aanmaken gelukt!';
+  cancelMessage = 'Gebruikers aanmaken geannuleerd.';
+  cancelTransitionTarget = 'users.index';
+  successTransitionTarget = 'users.index';
+  get successTransitionModel() {
+    return null;
+  }
 
-  validMimetypes: 'text/csv',
-  validExtensions: EmberArray.apply(['csv']),
+  @service fetch;
+  @tracked importFile = null;
+  @tracked addToGroup = null;
+  @tracked reviewing = false;
+  @tracked newUsers = A();
+  @tracked importErrors = A();
+  @tracked properties = A();
 
-  groups: computed('store', function () {
+  validMimetypes = 'text/csv';
+  validExtensions = EmberArray.apply(['csv']);
+
+  get groups() {
     return this.store.findAll('group');
-  }),
+  }
+
+  @action
+  fileLoaded(file) {
+    this.newUsers.clear();
+    this.importErrors.clear();
+    this.set('importFile', file.data);
+  }
 
-  actions: {
-    fileLoaded(file) {
+  @action
+  async uploadFile() {
+    const groupId = this.addToGroup ? this.addToGroup.id : null;
+    let response = await this.fetch.post('/users/batch_import', {
+      body: { file: this.importFile, group: groupId },
+    });
+    const json = await response.json();
+
+    if (response.ok) {
       this.newUsers.clear();
       this.importErrors.clear();
-      this.set('importFile', file.data);
-    },
-    async uploadFile() {
-      const groupId = this.addToGroup ? this.addToGroup.id : null;
-      let response = await this.fetch.post('/users/batch_import', {
-        body: { file: this.importFile, group: groupId },
-      });
-      const json = await response.json();
 
-      if (response.ok) {
-        this.newUsers.clear();
-        this.importErrors.clear();
+      JSON.parse(json.users).forEach((jsonObject) => {
+        this.set('properties', Object.keys(jsonObject));
+        this.newUsers.pushObject(jsonObject);
+      });
 
-        JSON.parse(json.users).forEach((jsonObject) => {
-          this.set('properties', Object.keys(jsonObject));
-          this.newUsers.pushObject(jsonObject);
+      if (json.errors && json.errors.user) {
+        json.errors.user.forEach((jsonObject) => {
+          this.importErrors.pushObject(jsonObject);
         });
+      }
+    } else if (isInvalidResponse(response)) {
+      this.newUsers.clear();
+      this.importErrors.clear();
 
-        if (json.errors && json.errors.user) {
-          json.errors.user.forEach((jsonObject) => {
-            this.importErrors.pushObject(jsonObject);
-          });
-        }
-      } else if (isInvalidResponse(response)) {
-        this.newUsers.clear();
-        this.importErrors.clear();
-
-        if (json.errors && json.errors.header) {
-          json.errors.header.forEach((jsonObject) => {
-            this.importErrors.pushObject(jsonObject);
-          });
-        }
+      if (json.errors && json.errors.header) {
+        json.errors.header.forEach((jsonObject) => {
+          this.importErrors.pushObject(jsonObject);
+        });
       }
-    },
-    async confirmUpload() {
-      const groupId = this.addToGroup ? this.addToGroup.id : null;
+    }
+  }
 
-      const response = await this.fetch.post('/users/batch_import', {
-        /* eslint-disable camelcase */
-        body: {
-          file: this.importFile,
-          group: groupId,
-          live_run: true,
-        },
-        /* eslint-enable camelcase */
-      });
+  @action
+  async confirmUpload() {
+    const groupId = this.addToGroup ? this.addToGroup.id : null;
 
-      if (response.ok) {
-        this.flashNotice.sendSuccess('Gebruikers opgeslagen');
-        this.transitionToRoute('users.index');
-      } else {
-        this.flashNotice.sendError('Gebruikers niet opgeslagen');
-        this.transitionToRoute('users.batch.new');
-      }
-    },
-  },
-});
+    const response = await this.fetch.post('/users/batch_import', {
+      /* eslint-disable camelcase */
+      body: {
+        file: this.importFile,
+        group: groupId,
+        live_run: true,
+      },
+      /* eslint-enable camelcase */
+    });
+
+    if (response.ok) {
+      this.flashNotice.sendSuccess('Gebruikers opgeslagen');
+      this.transitionToRoute('users.index');
+    } else {
+      this.flashNotice.sendError('Gebruikers niet opgeslagen');
+      this.transitionToRoute('users.batch.new');
+    }
+  }
+}
diff --git a/app/controllers/users/destroy.js b/app/controllers/users/destroy.js
index 7500bd41a..90f64de3d 100644
--- a/app/controllers/users/destroy.js
+++ b/app/controllers/users/destroy.js
@@ -1,5 +1,6 @@
 import DestroyController from 'amber-ui/controllers/application/destroy';
 
-export default DestroyController.extend({
-  successTransitionTarget: 'users.index',
-});
+export default class UserDestroyController extends DestroyController {
+  successTransitionTarget = 'users.index';
+  cancelTransitionTarget = 'users.show';
+}
diff --git a/app/controllers/users/edit-permissions.js b/app/controllers/users/edit-permissions.js
index ede1f3267..bb04d09f3 100644
--- a/app/controllers/users/edit-permissions.js
+++ b/app/controllers/users/edit-permissions.js
@@ -1,6 +1,6 @@
 import UserEditController from 'amber-ui/controllers/users/edit';
 
-export default UserEditController.extend({
-  successMessage: 'Rechten gewijzigd!',
-  successTransitionTarget: 'users.show-permissions',
-});
+export default class EditUserPermissionsController extends UserEditController {
+  successMessage = 'Rechten gewijzigd!';
+  successTransitionTarget = 'users.show-permissions';
+}
diff --git a/app/controllers/users/edit-privacy.js b/app/controllers/users/edit-privacy.js
new file mode 100644
index 000000000..abc416fbb
--- /dev/null
+++ b/app/controllers/users/edit-privacy.js
@@ -0,0 +1,3 @@
+import EditUserController from './edit';
+
+export default class EditUserPrivacyController extends EditUserController {}
diff --git a/app/controllers/users/edit.js b/app/controllers/users/edit.js
index fc642d70f..110c0f0e3 100644
--- a/app/controllers/users/edit.js
+++ b/app/controllers/users/edit.js
@@ -1,5 +1,4 @@
-// eslint-disable-next-line ember/no-computed-properties-in-native-classes
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 import {
   DigtusSubscriptionPreferenceTypes,
   AlmanakSubscriptionPreferenceTypes,
@@ -9,37 +8,32 @@ import { inject as service } from '@ember/service';
 
 export default class EditUserController extends EditController {
   @service session;
-  @service('flash-notice') flashNotice;
 
   successMessage = 'Gegevens gewijzigd!';
   successTransitionTarget = 'users.show';
 
-  @computed('session.currentUser', function () {
+  get canEditOnlyOwnProperties() {
     return (
       !this.session.hasPermission('user.update') &&
       !this.session.hasPermission('user.create')
     );
-  })
-  canEditOnlyOwnProperties;
+  }
 
-  @computed(function () {
+  get digtusSubscriptionPreferenceTypes() {
     return Object.entries(DigtusSubscriptionPreferenceTypes).map(
       ([value, label]) => ({ value, label })
     );
-  })
-  digtusSubscriptionPreferenceTypes;
+  }
 
-  @computed(function () {
+  get almanakSubscriptionPreferenceTypes() {
     return Object.entries(AlmanakSubscriptionPreferenceTypes).map(
       ([value, label]) => ({ value, label })
     );
-  })
-  almanakSubscriptionPreferenceTypes;
+  }
 
-  @computed('session.currentUser', 'model', function () {
+  get isOwnUser() {
     return this.model === this.session.currentUser;
-  })
-  isOwnUser;
+  }
 
   @action
   fileLoaded(file) {
diff --git a/app/controllers/users/new.js b/app/controllers/users/new.js
index 39f7a5c2c..3cc800e61 100644
--- a/app/controllers/users/new.js
+++ b/app/controllers/users/new.js
@@ -2,4 +2,9 @@ import EditUserController from './edit';
 
 export default class NewUserController extends EditUserController {
   successMessage = 'Gebruiker aangemaakt!';
+  cancelMessage = 'Gebruiker aanmaken geannuleerd.';
+  cancelTransitionTarget = 'users.index';
+  get cancelTransitionModel() {
+    return null;
+  }
 }
diff --git a/app/controllers/users/resend-activation.js b/app/controllers/users/resend-activation.js
index 2a81598e6..f04410a54 100644
--- a/app/controllers/users/resend-activation.js
+++ b/app/controllers/users/resend-activation.js
@@ -1,7 +1,7 @@
 import { inject as service } from '@ember/service';
 import Controller from '@ember/controller';
 import { isNotFoundResponse } from 'ember-fetch/errors';
-
+// todo: octane
 export default Controller.extend({
   fetch: service(),
   actions: {
diff --git a/app/models/debit/collection.js b/app/models/debit/collection.js
index d979dd7ee..463eac4ed 100644
--- a/app/models/debit/collection.js
+++ b/app/models/debit/collection.js
@@ -1,4 +1,4 @@
-import Model, { belongsTo, hasMany, attr } from '@ember-data/model';
+import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 
 export default class Collection extends Model {
   @attr name;
@@ -10,4 +10,23 @@ export default class Collection extends Model {
   // Relationships
   @hasMany('debit/transaction') transactions;
   @belongsTo('user') author;
+
+  async saveWithTransactions() {
+    const response = await this.save();
+    const transactions = await response.transactions;
+    let failedTransactions = 0;
+    transactions.forEach((transaction) => {
+      if (transaction.hasDirtyAttributes) {
+        try {
+          transaction.save();
+        } catch {
+          failedTransactions++;
+        }
+      }
+    });
+    if (failedTransactions) {
+      const prefix = failedTransactions > 1 ? 'zijn' : 'is';
+      throw `Er ${prefix} ${failedTransactions} transacties niet juist opgeslagen`;
+    }
+  }
 }
diff --git a/app/models/forum/thread.js b/app/models/forum/thread.js
index 512e20eeb..0cd6a4400 100644
--- a/app/models/forum/thread.js
+++ b/app/models/forum/thread.js
@@ -1,6 +1,11 @@
 import Model, { belongsTo, hasMany, attr } from '@ember-data/model';
+import { inject as service } from '@ember/service';
+import { isNone } from '@ember/utils';
+import { tracked } from '@glimmer/tracking';
+import { assign } from '@ember/polyfills';
 
 export default class Thread extends Model {
+  @service store;
   // Properties
   @attr title;
   @attr read;
@@ -12,7 +17,28 @@ export default class Thread extends Model {
   // Relations
   @belongsTo('user') author;
   @belongsTo('forum/category') category;
-  @hasMany('forum/post') posts;
+  @hasMany('forum/post', { sort: 'created_at' }) posts;
+
+  @tracked
+  postsPaged;
+
+  pagingParams;
+
+  get firstPost() {
+    return this.posts.get('firstObject');
+  }
+
+  async queryPostsPaged(params = null) {
+    if (params) {
+      assign(params, { filter: { thread: this.id }, sort: 'created_at' });
+      // eslint-disable-next-line no-undef
+      this.pagingParams = structuredClone(params);
+    } else {
+      // eslint-disable-next-line no-undef
+      params = structuredClone(this.pagingParams);
+    }
+    this.postsPaged = await this.store.queryPaged('forum/post', params);
+  }
 
   get isOpen() {
     return this.closedAt === null;
@@ -25,4 +51,23 @@ export default class Thread extends Model {
       this.set('closedAt', new Date());
     }
   }
+
+  async saveWithFirstPost() {
+    const post = await this.firstPost;
+    if (isNone(post.message)) {
+      throw new Error('Je moet eerst een bericht invullen.');
+    } else {
+      const response = await this.save();
+      const firstPost = await response.firstPost;
+      await firstPost.save();
+      return response;
+    }
+  }
+
+  rollbackAttributesAndPosts() {
+    this.rollbackAttributes();
+    this.posts.forEach((post) => {
+      post.rollbackAttributes();
+    });
+  }
 }
diff --git a/app/routes/activities/edit.js b/app/routes/activities/edit.js
index ec8764f86..1a8845f1e 100644
--- a/app/routes/activities/edit.js
+++ b/app/routes/activities/edit.js
@@ -7,10 +7,10 @@ export default class EdityActivityRoute extends AuthenticatedRoute {
     return this.abilities.can('edit activity', model);
   }
 
-  model(params) {
-    return this.store
-      .findRecord('activity', params.id, params)
-      .then((activity) => activity.get('form').then(() => activity));
+  async model(params) {
+    const activity = await this.store.findRecord('activity', params.id, params);
+    await activity.form;
+    return activity;
   }
 
   deactivate() {
diff --git a/app/routes/article-comments/destroy.js b/app/routes/article-comments/destroy.js
index bfa7c4167..858e095ab 100644
--- a/app/routes/article-comments/destroy.js
+++ b/app/routes/article-comments/destroy.js
@@ -7,7 +7,13 @@ export default class DestroyArticleCommentRoute extends AuthenticatedRoute {
     return this.abilities.can('destroy article-comments');
   }
 
-  model(params) {
-    return this.store.findRecord('article-comment', params.id, params);
+  async model(params) {
+    const articleComment = this.store.findRecord(
+      'article-comment',
+      params.id,
+      params
+    );
+    await articleComment.article;
+    return articleComment;
   }
 }
diff --git a/app/routes/debit/collections/show.js b/app/routes/debit/collections/show.js
index bbfa3f65a..806efce3b 100644
--- a/app/routes/debit/collections/show.js
+++ b/app/routes/debit/collections/show.js
@@ -1,14 +1,12 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
-import { assign } from '@ember/polyfills';
-import { hash } from 'rsvp';
 
 export default class CollectionsIndexRoute extends AuthenticatedRoute {
   get breadCrumb() {
-    return { title: this.controller.model.collection.name };
+    return { title: this.controller.model.name };
   }
 
   get pageActions() {
-    const { collection } = this.controller.model;
+    const collection = this.controller.model;
     return [
       {
         link: 'debit.collections.edit',
@@ -38,22 +36,13 @@ export default class CollectionsIndexRoute extends AuthenticatedRoute {
     return this.abilities.can('show debit/collections');
   }
 
-  model(params) {
-    const collectionPromise = this.store.findRecord(
+  async model(params) {
+    const collection = await this.store.findRecord(
       'debit/collection',
       params.id
     );
-    assign(params, {
-      paramMapping: this.paramMapping,
-      filter: { collection: params.id },
-      sort: 'created_at',
-    });
-    delete params.id;
-    const transactionsPromise = this.store.query('debit/transaction', params);
-
-    return hash({
-      collection: collectionPromise,
-      transactions: transactionsPromise,
-    });
+    await collection.transactions;
+    // todo: simplify this to just returning collection, because transactions can be gotten from the collection, right?
+    return collection;
   }
 }
diff --git a/app/routes/forum/categories/category/threads/new.js b/app/routes/forum/categories/category/threads/new.js
index 3eb40e284..4ddd41ac6 100644
--- a/app/routes/forum/categories/category/threads/new.js
+++ b/app/routes/forum/categories/category/threads/new.js
@@ -7,17 +7,16 @@ export default class NewTopicRoute extends AuthenticatedRoute {
     return this.abilities.can('create forum/thread');
   }
 
-  model() {
+  async model() {
     const category = this.modelFor('forum.categories.category');
-    const thread = this.store.createRecord('forum/thread', { category });
-    const post = this.store.createRecord('forum/post', { thread });
-
-    return { category, thread, post };
+    const thread = await this.store.createRecord('forum/thread', { category });
+    await this.store.createRecord('forum/post', { thread });
+    // the post created above can magically be accessed via the thread model
+    return thread;
   }
 
   deactivate() {
     super.deactivate();
-    this.controller.model.thread?.rollbackAttributes();
-    this.controller.model.post?.rollbackAttributes();
+    this.controller.model.rollbackAttributesAndPosts();
   }
 }
diff --git a/app/routes/forum/categories/category/threads/thread/edit.js b/app/routes/forum/categories/category/threads/thread/edit.js
index eba09fc0f..2662be6f3 100644
--- a/app/routes/forum/categories/category/threads/thread/edit.js
+++ b/app/routes/forum/categories/category/threads/thread/edit.js
@@ -7,13 +7,15 @@ export default class EditTopicRoute extends AuthenticatedRoute {
     return this.abilities.can('edit forum/threads');
   }
 
-  model() {
-    const thread = this.modelFor('forum.categories.category.threads.thread');
-    return { thread };
+  async model() {
+    const thread = await this.modelFor(
+      'forum.categories.category.threads.thread'
+    );
+    return thread;
   }
 
   deactivate() {
     super.deactivate();
-    this.controller.model.thread?.rollbackAttributes();
+    this.controller.model.rollbackAttributesAndPosts();
   }
 }
diff --git a/app/routes/forum/categories/category/threads/thread/posts/edit.js b/app/routes/forum/categories/category/threads/thread/posts/edit.js
index 798da50f4..ca1b86c2d 100644
--- a/app/routes/forum/categories/category/threads/thread/posts/edit.js
+++ b/app/routes/forum/categories/category/threads/thread/posts/edit.js
@@ -13,6 +13,6 @@ export default class EditPostRoute extends AuthenticatedRoute {
 
   deactivate() {
     super.deactivate();
-    this.controller.model.thread?.rollbackAttributes();
+    this.controller.model.rollbackAttributes();
   }
 }
diff --git a/app/routes/forum/categories/category/threads/thread/posts/index.js b/app/routes/forum/categories/category/threads/thread/posts/index.js
index a0769cd1c..dc8ca0346 100644
--- a/app/routes/forum/categories/category/threads/thread/posts/index.js
+++ b/app/routes/forum/categories/category/threads/thread/posts/index.js
@@ -1,6 +1,5 @@
 import { AuthenticatedRoute } from 'amber-ui/routes/application/application';
 import { inject as service } from '@ember/service';
-import { assign } from '@ember/polyfills';
 import { action } from '@ember/object';
 import {
   bindKeyboardShortcuts,
@@ -12,7 +11,7 @@ export default class PostIndexRoute extends AuthenticatedRoute {
   @service fetch;
 
   get breadCrumb() {
-    return { title: this.controller.model.thread.title };
+    return { title: this.controller.model.title };
   }
 
   get pageActions() {
@@ -21,14 +20,14 @@ export default class PostIndexRoute extends AuthenticatedRoute {
         link: 'forum.categories.category.threads.thread.edit',
         title: 'Wijzigen',
         icon: 'pencil',
-        linkArgument: this.controller.model.thread,
+        linkArgument: this.controller.model,
         canAccess: this.abilities.can('edit forum/threads'),
       },
       {
         link: 'forum.categories.category.threads.thread.destroy',
         title: 'Verwijderen',
         icon: 'trash',
-        linkArgument: this.controller.model.thread,
+        linkArgument: this.controller.model,
         canAccess: this.abilities.can('destroy forum/threads'),
       },
     ];
@@ -39,19 +38,9 @@ export default class PostIndexRoute extends AuthenticatedRoute {
   }
 
   async model(params) {
-    const category = this.modelFor('forum.categories.category');
-    const thread = this.modelFor('forum.categories.category.threads.thread');
-    assign(params, {
-      filter: { thread: thread.id },
-      sort: 'created_at',
-    });
-    const postsPromise = await this.store.queryPaged('forum/post', params);
-
-    return {
-      category,
-      thread,
-      posts: postsPromise,
-    };
+    const model = this.modelFor('forum.categories.category.threads.thread');
+    await model.queryPostsPaged(params);
+    return model;
   }
 
   activate() {
diff --git a/app/routes/users/edit.js b/app/routes/users/edit.js
index c25eb5952..1037fa213 100644
--- a/app/routes/users/edit.js
+++ b/app/routes/users/edit.js
@@ -37,8 +37,8 @@ export default class EditUserRoute extends AuthenticatedRoute {
     return this.abilities.can('edit user', model);
   }
 
-  model(params) {
-    return this.store.findRecord('user', params.id, params);
+  async model(params) {
+    return await this.store.findRecord('user', params.id, params);
   }
 
   deactivate() {
diff --git a/app/templates/activities/destroy.hbs b/app/templates/activities/destroy.hbs
index 295ac26b4..a5e42fadb 100644
--- a/app/templates/activities/destroy.hbs
+++ b/app/templates/activities/destroy.hbs
@@ -20,16 +20,16 @@
         verwijderen?
       </p>
 
-      <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+      <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
         Verwijderen
       </button>
-      <LinkTo
-        @route='activities.show'
-        @model={{model.id}}
+      <button
+        {{action 'cancel'}}
+        type="button"
         class='btn btn-default'
       >
         Annuleren
-      </LinkTo>
+      </button>
       {{#if errorMessage}}
         <div class='text-danger'>{{this.errorMessage}}</div>
       {{/if}}
diff --git a/app/templates/activities/edit.hbs b/app/templates/activities/edit.hbs
index d883f2d5c..a78f03021 100644
--- a/app/templates/activities/edit.hbs
+++ b/app/templates/activities/edit.hbs
@@ -2,6 +2,7 @@
   @model={{@model}}
   @controller={{this}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @activityCategoryOptions={{this.activityCategoryOptions}}
   @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
   @groups={{this.groups}}
diff --git a/app/templates/activities/new.hbs b/app/templates/activities/new.hbs
index d883f2d5c..a78f03021 100644
--- a/app/templates/activities/new.hbs
+++ b/app/templates/activities/new.hbs
@@ -2,6 +2,7 @@
   @model={{@model}}
   @controller={{this}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @activityCategoryOptions={{this.activityCategoryOptions}}
   @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
   @groups={{this.groups}}
diff --git a/app/templates/article-comments/destroy.hbs b/app/templates/article-comments/destroy.hbs
index e42bb39a0..c125758e5 100644
--- a/app/templates/article-comments/destroy.hbs
+++ b/app/templates/article-comments/destroy.hbs
@@ -11,15 +11,15 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
-    <LinkTo
-      @route='articles.show'
-      @model={{@model.article}}
+    <button
+      {{action 'cancel'}}
+      type="button"
       class='btn btn-default'
     >
       Annuleren
-    </LinkTo>
+    </button>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/templates/articles/destroy.hbs b/app/templates/articles/destroy.hbs
index ec381b76e..c0c45121a 100644
--- a/app/templates/articles/destroy.hbs
+++ b/app/templates/articles/destroy.hbs
@@ -11,11 +11,11 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Artikel verwijderen
     </button>
-    <LinkTo @route='articles.show' @model={{model.id}} class='btn btn-default'>
+    <button {{action 'cancel'}} type="button" class='btn btn-default'>
       Annuleren
-    </LinkTo>
+    </button>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/templates/articles/edit.hbs b/app/templates/articles/edit.hbs
index f01658f23..f4cf3818c 100644
--- a/app/templates/articles/edit.hbs
+++ b/app/templates/articles/edit.hbs
@@ -5,6 +5,7 @@
 <Forms::ArticleForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
   @canPin={{this.canPin}}
   @groups={{this.groups}}
diff --git a/app/templates/articles/new.hbs b/app/templates/articles/new.hbs
index f01658f23..f4cf3818c 100644
--- a/app/templates/articles/new.hbs
+++ b/app/templates/articles/new.hbs
@@ -5,6 +5,7 @@
 <Forms::ArticleForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
   @canPin={{this.canPin}}
   @groups={{this.groups}}
diff --git a/app/templates/books/destroy.hbs b/app/templates/books/destroy.hbs
index 2d8fbb93b..b36e210a5 100644
--- a/app/templates/books/destroy.hbs
+++ b/app/templates/books/destroy.hbs
@@ -11,11 +11,11 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+    <button {{action this.destroyModel}} class='btn btn-danger' type='button'>
       Boek verwijderen
     </button>
-    <LinkTo @route='books.show' @model={{model.id}} class='btn btn-default'>
+    <button {{action this.cancel}} type="button" class='btn btn-default'>
       Annuleren
-    </LinkTo>
+    </button>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/templates/books/edit.hbs b/app/templates/books/edit.hbs
index 378cf0a66..08ad373fe 100644
--- a/app/templates/books/edit.hbs
+++ b/app/templates/books/edit.hbs
@@ -11,6 +11,7 @@
   @lookupIsbnError={{this.lookupIsbnError}}
   @errorMessage={{this.errorMessage}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @onToggleScanner={{action 'toggleScanner'}}
   @onDevicesFound={{action 'onDevicesFound'}}
   @onScanSuccess={{action 'onScanSuccess'}}
diff --git a/app/templates/books/new.hbs b/app/templates/books/new.hbs
index 378cf0a66..d5ce91132 100644
--- a/app/templates/books/new.hbs
+++ b/app/templates/books/new.hbs
@@ -11,6 +11,7 @@
   @lookupIsbnError={{this.lookupIsbnError}}
   @errorMessage={{this.errorMessage}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{this.cancel}}
   @onToggleScanner={{action 'toggleScanner'}}
   @onDevicesFound={{action 'onDevicesFound'}}
   @onScanSuccess={{action 'onScanSuccess'}}
diff --git a/app/templates/debit/collections/destroy.hbs b/app/templates/debit/collections/destroy.hbs
index 680a25658..2471a07fe 100644
--- a/app/templates/debit/collections/destroy.hbs
+++ b/app/templates/debit/collections/destroy.hbs
@@ -11,7 +11,7 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <LinkTo
diff --git a/app/templates/debit/collections/edit.hbs b/app/templates/debit/collections/edit.hbs
index a7a7ee553..f754c1e2b 100644
--- a/app/templates/debit/collections/edit.hbs
+++ b/app/templates/debit/collections/edit.hbs
@@ -21,9 +21,9 @@
         @model={{model}}
         @errorMessage={{this.errorMessage}}
       >
-        <LinkTo @route='debit.collections' class='btn btn-default'>
+        <button {{action 'cancel'}} type="button" class='btn btn-default'>
           Annuleren
-        </LinkTo>
+        </button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/templates/debit/collections/new.hbs b/app/templates/debit/collections/new.hbs
index 3afa42c59..6c0e2746e 100644
--- a/app/templates/debit/collections/new.hbs
+++ b/app/templates/debit/collections/new.hbs
@@ -36,8 +36,8 @@
         @property='importFile'
         @label='Import file'
         @loadedCallback={{action 'fileLoaded'}}
-        @validExtensions={{validExtensions}}
-        @validMimetypes={{validMimetypes}}
+        @validExtensions={{this.validExtensions}}
+        @validMimetypes={{this.validMimetypes}}
       />
       <ModelForm::TextInput
         @model={{model}}
diff --git a/app/templates/debit/collections/show.hbs b/app/templates/debit/collections/show.hbs
index 3f14b8635..fc0e54e58 100644
--- a/app/templates/debit/collections/show.hbs
+++ b/app/templates/debit/collections/show.hbs
@@ -5,13 +5,13 @@
 <div class='card'>
   <div class='card-header d-flex justify-content-between'>
     <h5>
-      {{@model.collection.name}}
+      {{@model.name}}
       -
-      {{moment-format @model.collection.date 'DD-MM-YYYY'}}
+      {{moment-format @model.date 'DD-MM-YYYY'}}
     </h5>
     <span class='text-muted'>
       Gemaakt door
-      {{@model.collection.author.fullName}}
+      {{@model.author.fullName}}
     </span>
   </div>
 
diff --git a/app/templates/debit/mandates/edit.hbs b/app/templates/debit/mandates/edit.hbs
index 198b5cba0..a3a15eb5b 100644
--- a/app/templates/debit/mandates/edit.hbs
+++ b/app/templates/debit/mandates/edit.hbs
@@ -3,6 +3,7 @@
 <Forms::MandateForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @users={{this.users}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/debit/mandates/new.hbs b/app/templates/debit/mandates/new.hbs
index 2e243460c..715f527e8 100644
--- a/app/templates/debit/mandates/new.hbs
+++ b/app/templates/debit/mandates/new.hbs
@@ -3,6 +3,7 @@
 <Forms::MandateForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @users={{this.users}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/debit/transactions/destroy.hbs b/app/templates/debit/transactions/destroy.hbs
index 1f5f90365..6628447ef 100644
--- a/app/templates/debit/transactions/destroy.hbs
+++ b/app/templates/debit/transactions/destroy.hbs
@@ -14,7 +14,7 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <LinkTo
diff --git a/app/templates/debit/transactions/edit.hbs b/app/templates/debit/transactions/edit.hbs
index 94b9d9b54..35bf3c01d 100644
--- a/app/templates/debit/transactions/edit.hbs
+++ b/app/templates/debit/transactions/edit.hbs
@@ -3,6 +3,7 @@
 <Forms::TransactionForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @users={{this.users}}
   @onSetUser={{action 'setUser'}}
   @errorMessage={{this.errorMessage}}
diff --git a/app/templates/form/responses/destroy.hbs b/app/templates/form/responses/destroy.hbs
index 2c11991e2..bcf4c25ff 100644
--- a/app/templates/form/responses/destroy.hbs
+++ b/app/templates/form/responses/destroy.hbs
@@ -15,10 +15,8 @@
   </table>
 </div>
 
-<button {{action 'destroy'}} class='btn btn-danger' type='button'>Ja</button>
-<LinkTo @route='activities.index' class='btn btn-default'>
-  Nee
-</LinkTo>
+<button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
+<button {{action 'cancel'}} class="btn btn-default" type="button">Nee</button>
 
 {{#if errorMessage}}
   <div class='text-danger'>{{this.errorMessage}}</div>
diff --git a/app/templates/forum/categories/category/destroy.hbs b/app/templates/forum/categories/category/destroy.hbs
index 0770e6427..63c238c93 100644
--- a/app/templates/forum/categories/category/destroy.hbs
+++ b/app/templates/forum/categories/category/destroy.hbs
@@ -12,15 +12,11 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
-    <LinkTo
-      @route='forum.categories.category'
-      @model={{model.id}}
-      class='btn btn-default'
-    >
+    <button {{on "click" this.cancel}} class="btn btn-default" type="button">
       Annuleren
-    </LinkTo>
+    </button>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/templates/forum/categories/category/edit.hbs b/app/templates/forum/categories/category/edit.hbs
index b79838a2e..0005c2a9f 100644
--- a/app/templates/forum/categories/category/edit.hbs
+++ b/app/templates/forum/categories/category/edit.hbs
@@ -1,5 +1,6 @@
 <Forms::CategoryForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/forum/categories/category/threads/new.hbs b/app/templates/forum/categories/category/threads/new.hbs
index 94fa22309..5a888472b 100644
--- a/app/templates/forum/categories/category/threads/new.hbs
+++ b/app/templates/forum/categories/category/threads/new.hbs
@@ -1,5 +1,6 @@
 <Forms::ThreadForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/forum/categories/category/threads/thread/destroy.hbs b/app/templates/forum/categories/category/threads/thread/destroy.hbs
index 4c38b8a48..8f4a951db 100644
--- a/app/templates/forum/categories/category/threads/thread/destroy.hbs
+++ b/app/templates/forum/categories/category/threads/thread/destroy.hbs
@@ -11,15 +11,11 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Ja
     </button>
-    <LinkTo
-      @route='forum.categories.category.threads.thread.show'
-      @model={{model.id}}
-      class='btn btn-default'
-    >
+    <button {{on "click" this.cancel}} class="btn btn-default" type="button">
       Nee
-    </LinkTo>
+    </button>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/templates/forum/categories/category/threads/thread/edit.hbs b/app/templates/forum/categories/category/threads/thread/edit.hbs
index 94fa22309..5a888472b 100644
--- a/app/templates/forum/categories/category/threads/thread/edit.hbs
+++ b/app/templates/forum/categories/category/threads/thread/edit.hbs
@@ -1,5 +1,6 @@
 <Forms::ThreadForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/forum/categories/category/threads/thread/posts/destroy.hbs b/app/templates/forum/categories/category/threads/thread/posts/destroy.hbs
index 7515d3ebf..92e43171d 100644
--- a/app/templates/forum/categories/category/threads/thread/posts/destroy.hbs
+++ b/app/templates/forum/categories/category/threads/thread/posts/destroy.hbs
@@ -18,15 +18,15 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
-    <LinkTo
-      @route='forum.categories.category.threads.thread'
-      @model={{@model.thread}}
+    <button
+      {{action 'cancel'}}
       class='btn btn-default'
+      type='button'
     >
       Annuleren
-    </LinkTo>
+    </button>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/templates/forum/categories/category/threads/thread/posts/edit.hbs b/app/templates/forum/categories/category/threads/thread/posts/edit.hbs
index 4a5a07983..07604a864 100644
--- a/app/templates/forum/categories/category/threads/thread/posts/edit.hbs
+++ b/app/templates/forum/categories/category/threads/thread/posts/edit.hbs
@@ -1 +1 @@
-<Forms::PostForm @model={{@model}} @onSubmit={{action 'submit'}} />
\ No newline at end of file
+<Forms::PostForm @model={{@model}} @onSubmit={{action 'submit'}} @onCancel={{action 'cancel'}}/>
\ No newline at end of file
diff --git a/app/templates/forum/categories/category/threads/thread/posts/index.hbs b/app/templates/forum/categories/category/threads/thread/posts/index.hbs
index 52d9e7338..b9cb9eb5f 100644
--- a/app/templates/forum/categories/category/threads/thread/posts/index.hbs
+++ b/app/templates/forum/categories/category/threads/thread/posts/index.hbs
@@ -3,11 +3,11 @@
 </EmberWormhole>
 
 <div class='row justify-content-center'>
-  <PageNumbers @info={{model.posts.meta}} @replace={{true}} />
+  <PageNumbers @info={{@model.postsPaged.meta}} @replace={{true}} />
 </div>
 
 <Swipeable @onSwipeHorizontal={{action 'onSwipe'}}>
-  {{#each @model.posts as |post|}}
+  {{#each @model.postsPaged as |post|}}
     {{#unless post.isDeleted}}
       {{forum/forum-post
         post
@@ -19,10 +19,10 @@
 </Swipeable>
 
 {{#if currentPageIsLastPage}}
-  {{#unless @model.thread.isOpen}}
+  {{#unless @model.isOpen}}
     <div class='alert alert-danger' role='alert'>
       <strong>Dit topic is gesloten!</strong>
-      {{#if (can 'create post for forum/thread' @model.thread)}}
+      {{#if (can 'create post for forum/thread' @model)}}
         Jij kunt echter nog wel reageren omdat je moderatierechten hebt.
       {{else}}
         Je kunt niet meer reageren.
@@ -30,14 +30,14 @@
     </div>
   {{/unless}}
 
-  {{#if (can 'create post for forum/thread' @model.thread)}}
+  {{#if (can 'create post for forum/thread' @model)}}
     <div class='card' id='newForumPostCard'>
       <div class='card-header'>
         <h5>Reageren</h5>
       </div>
       <div class='card-body'>
         <Forum::ForumPostNew
-          @thread={{@model.thread}}
+          @thread={{@model}}
           @content={{newContent}}
           @onSubmit={{action 'newPostCreated'}}
         />
@@ -47,5 +47,5 @@
 {{/if}}
 
 <div class='row justify-content-center'>
-  <PageNumbers @info={{@model.posts.meta}} @replace={{true}} />
+  <PageNumbers @info={{@model.postsPaged.meta}} @replace={{true}} />
 </div>
\ No newline at end of file
diff --git a/app/templates/forum/categories/new.hbs b/app/templates/forum/categories/new.hbs
index b79838a2e..0005c2a9f 100644
--- a/app/templates/forum/categories/new.hbs
+++ b/app/templates/forum/categories/new.hbs
@@ -1,5 +1,6 @@
 <Forms::CategoryForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/groups/edit.hbs b/app/templates/groups/edit.hbs
index 9644b420b..c624513ab 100644
--- a/app/templates/groups/edit.hbs
+++ b/app/templates/groups/edit.hbs
@@ -1,6 +1,7 @@
 <Forms::GroupForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @onFileLoaded={{action 'fileLoaded'}}
   @groupKindOptions={{this.groupKindOptions}}
   @errorMessage={{this.errorMessage}}
diff --git a/app/templates/groups/new.hbs b/app/templates/groups/new.hbs
index 9644b420b..c624513ab 100644
--- a/app/templates/groups/new.hbs
+++ b/app/templates/groups/new.hbs
@@ -1,6 +1,7 @@
 <Forms::GroupForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @onFileLoaded={{action 'fileLoaded'}}
   @groupKindOptions={{this.groupKindOptions}}
   @errorMessage={{this.errorMessage}}
diff --git a/app/templates/mail-aliases/destroy.hbs b/app/templates/mail-aliases/destroy.hbs
index 571e89fd7..4dee4946c 100644
--- a/app/templates/mail-aliases/destroy.hbs
+++ b/app/templates/mail-aliases/destroy.hbs
@@ -1,9 +1,7 @@
 <p>Weet je zeker dat je dit mail-alias ({{@model.email}}) wil verwijderen?</p>
 
-<button {{action 'destroy'}} class='btn btn-danger' type='button'>Ja</button>
-<LinkTo @route='mail-aliases.show' @model={{model.id}} class='btn btn-default'>
-  Nee
-</LinkTo>
+<button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
+<button {{action 'cancel'}} class='btn btn-default' type="button">Nee</button>
 
 {{#if errorMessage}}
   <div class='text-danger'>{{this.errorMessage}}</div>
diff --git a/app/templates/mail-aliases/edit.hbs b/app/templates/mail-aliases/edit.hbs
index 44333ff1c..a711abc7b 100644
--- a/app/templates/mail-aliases/edit.hbs
+++ b/app/templates/mail-aliases/edit.hbs
@@ -1,6 +1,7 @@
 <Forms::MailAliasForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @mailAliasModerationTypes={{this.mailAliasModerationTypes}}
   @moderationTypeOpen={{this.moderationTypeOpen}}
   @groups={{this.groups}}
diff --git a/app/templates/mail-aliases/new.hbs b/app/templates/mail-aliases/new.hbs
index 44333ff1c..a711abc7b 100644
--- a/app/templates/mail-aliases/new.hbs
+++ b/app/templates/mail-aliases/new.hbs
@@ -1,6 +1,7 @@
 <Forms::MailAliasForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @mailAliasModerationTypes={{this.mailAliasModerationTypes}}
   @moderationTypeOpen={{this.moderationTypeOpen}}
   @groups={{this.groups}}
diff --git a/app/templates/mail-moderations/destroy.hbs b/app/templates/mail-moderations/destroy.hbs
index cb3737db4..8dd94bbee 100644
--- a/app/templates/mail-moderations/destroy.hbs
+++ b/app/templates/mail-moderations/destroy.hbs
@@ -1,7 +1,7 @@
 <p>Weet je zeker dat je deze mail ({{@model.subject}}) wil negeren?</p>
 <p>Er wordt geen bericht gestuurd naar de afzender.</p>
 
-<button {{action 'destroy'}} class='btn btn-danger' type='button'>Ja</button>
+<button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
 <LinkTo
   @route='mail-moderations.show'
   @model={{model.id}}
diff --git a/app/templates/photo-albums/new.hbs b/app/templates/photo-albums/new.hbs
index f714ce01f..d57c60cd3 100644
--- a/app/templates/photo-albums/new.hbs
+++ b/app/templates/photo-albums/new.hbs
@@ -1,6 +1,7 @@
 <Forms::PhotoAlbumForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @groups={{this.groups}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/photo-albums/photo-album/destroy.hbs b/app/templates/photo-albums/photo-album/destroy.hbs
index 5e62b2719..72e87470d 100644
--- a/app/templates/photo-albums/photo-album/destroy.hbs
+++ b/app/templates/photo-albums/photo-album/destroy.hbs
@@ -11,15 +11,9 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
-    <LinkTo
-      @route='photo-albums.photo-album'
-      @model={{model.id}}
-      class='btn btn-default'
-    >
-      Annuleren
-    </LinkTo>
+    <button {{action 'cancel'}} class="btn btn-default" type="button">Annuleren</button>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/templates/photo-albums/photo-album/edit.hbs b/app/templates/photo-albums/photo-album/edit.hbs
index 830ac401d..e5fe92e0b 100644
--- a/app/templates/photo-albums/photo-album/edit.hbs
+++ b/app/templates/photo-albums/photo-album/edit.hbs
@@ -1,6 +1,7 @@
 <Forms::PhotoAlbumForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @groups={{this.groups}}
   @dropzoneHeaders={{this.dropzoneHeaders}}
   @errorMessage={{this.errorMessage}}
diff --git a/app/templates/photo-albums/photo-album/photos/destroy.hbs b/app/templates/photo-albums/photo-album/photos/destroy.hbs
index 23e4657a7..60a6c50f7 100644
--- a/app/templates/photo-albums/photo-album/photos/destroy.hbs
+++ b/app/templates/photo-albums/photo-album/photos/destroy.hbs
@@ -13,7 +13,7 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <LinkTo
diff --git a/app/templates/photo-comments/destroy.hbs b/app/templates/photo-comments/destroy.hbs
index fd65a2226..2b0893e08 100644
--- a/app/templates/photo-comments/destroy.hbs
+++ b/app/templates/photo-comments/destroy.hbs
@@ -1,13 +1,9 @@
 <p>Weet je zeker dat je deze comment ({{@model.content}}) wilt verwijderen?</p>
 
-<button {{action 'destroy'}} class='btn btn-danger' type='button'>Ja</button>
-<LinkTo
-  @route='photo-albums.photo-album'
-  @model={{@model.photo}}
-  class='btn btn-default'
->
+<button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
+<button {{on "click" this.cancel}} class="btn btn-default" type="button">
   Nee
-</LinkTo>
+</button>
 
 {{#if errorMessage}}
   <div class='text-danger'>{{this.errorMessage}}</div>
diff --git a/app/templates/polls/destroy.hbs b/app/templates/polls/destroy.hbs
index 8629cc180..448498c2d 100644
--- a/app/templates/polls/destroy.hbs
+++ b/app/templates/polls/destroy.hbs
@@ -11,7 +11,7 @@
     verwijderen?
   </p>
 
-  <button {{action 'destroy'}} class='btn btn-danger' type='button'>Ja</button>
+  <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
   <LinkTo @route='polls.show' @model={{model.id}} class='btn btn-default'>
     Nee
   </LinkTo>
diff --git a/app/templates/polls/edit.hbs b/app/templates/polls/edit.hbs
index 084d13564..acf44337f 100644
--- a/app/templates/polls/edit.hbs
+++ b/app/templates/polls/edit.hbs
@@ -1,6 +1,7 @@
 <Forms::PollForm
   @model={{@model.form}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @combinedErrors={{this.combinedErrors}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/polls/new.hbs b/app/templates/polls/new.hbs
index 084d13564..acf44337f 100644
--- a/app/templates/polls/new.hbs
+++ b/app/templates/polls/new.hbs
@@ -1,6 +1,7 @@
 <Forms::PollForm
   @model={{@model.form}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @combinedErrors={{this.combinedErrors}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/static-pages/destroy.hbs b/app/templates/static-pages/destroy.hbs
index 8a6494cdf..6120d52b0 100644
--- a/app/templates/static-pages/destroy.hbs
+++ b/app/templates/static-pages/destroy.hbs
@@ -1,9 +1,7 @@
 <p>Weet je zeker dat je deze informatie pagina wilt verwijderen?</p>
 
-<button {{action 'destroy'}} class='btn btn-danger' type='button'>Ja</button>
-<LinkTo @route='static-pages.show' @model={{model.id}} class='btn btn-default'>
-  Nee
-</LinkTo>
+<button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
+<button {{action 'cancel'}} class="btn btn-default" type="button">Nee</button>
 
 {{#if errorMessage}}
   <div class='text-danger'>{{this.errorMessage}}</div>
diff --git a/app/templates/static-pages/edit.hbs b/app/templates/static-pages/edit.hbs
index 00b21a964..24b20a3f1 100644
--- a/app/templates/static-pages/edit.hbs
+++ b/app/templates/static-pages/edit.hbs
@@ -1,6 +1,7 @@
 <Forms::StaticPageForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @staticPageCategoryOptions={{this.staticPageCategoryOptions}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/static-pages/new.hbs b/app/templates/static-pages/new.hbs
index 00b21a964..24b20a3f1 100644
--- a/app/templates/static-pages/new.hbs
+++ b/app/templates/static-pages/new.hbs
@@ -1,6 +1,7 @@
 <Forms::StaticPageForm
   @model={{@model}}
   @onSubmit={{action 'submit'}}
+  @onCancel={{action 'cancel'}}
   @staticPageCategoryOptions={{this.staticPageCategoryOptions}}
   @errorMessage={{this.errorMessage}}
 />
\ No newline at end of file
diff --git a/app/templates/users/destroy.hbs b/app/templates/users/destroy.hbs
index 2ef580974..b19d510b8 100644
--- a/app/templates/users/destroy.hbs
+++ b/app/templates/users/destroy.hbs
@@ -12,12 +12,10 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroy'}} class='btn btn-danger' type='button'>
+    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
-    <LinkTo @route='users.show' @model={{model.id}} class='btn btn-default'>
-      Annuleren
-    </LinkTo>
+    <button {{action 'cancel'}} class="btn btn-default" type="button">Annuleren</button>
   </div>
 </div>
 
diff --git a/app/templates/users/edit-permissions.hbs b/app/templates/users/edit-permissions.hbs
index a955781d8..b85fbdfb2 100644
--- a/app/templates/users/edit-permissions.hbs
+++ b/app/templates/users/edit-permissions.hbs
@@ -11,13 +11,13 @@
       @errorMessage={{this.errorMessage}}
       @inputLayout='vertical'
     >
-      <LinkTo
-        @route='users.show-permissions'
-        @model={{model.id}}
+      <button
+        {{action 'cancel'}}
+        type="button"
         class='btn btn-default'
       >
         Annuleren
-      </LinkTo>
+      </button>
     </ModelForm::FormActions>
   </form>
 </TabbedView>
\ No newline at end of file
diff --git a/app/templates/users/edit-privacy.hbs b/app/templates/users/edit-privacy.hbs
index 1acccc0da..686ec8c39 100644
--- a/app/templates/users/edit-privacy.hbs
+++ b/app/templates/users/edit-privacy.hbs
@@ -1,3 +1,3 @@
 <TabbedView @tabItems={{tabItems}}>
-  <Users::PrivacySettings @model={{model}} />
+  <Users::PrivacySettings @model={{model}} @onSubmit={{action 'submit'}} @onCancel={{action 'cancel'}}/>
 </TabbedView>
\ No newline at end of file
diff --git a/app/templates/users/edit.hbs b/app/templates/users/edit.hbs
index 00a613e70..70c5cd7c5 100644
--- a/app/templates/users/edit.hbs
+++ b/app/templates/users/edit.hbs
@@ -2,6 +2,7 @@
   <Forms::UserForm
     @model={{@model}}
     @onSubmit={{action 'submit'}}
+    @onCancel={{action 'cancel'}}
     @onFileLoaded={{action 'fileLoaded'}}
     @canEditOnlyOwnProperties={{this.canEditOnlyOwnProperties}}
     @almanakSubscriptionPreferenceTypes={{this.almanakSubscriptionPreferenceTypes}}
diff --git a/app/templates/users/new.hbs b/app/templates/users/new.hbs
index 236f743d4..9e7911946 100644
--- a/app/templates/users/new.hbs
+++ b/app/templates/users/new.hbs
@@ -7,6 +7,7 @@
     <Forms::UserForm
       @model={{@model}}
       @onSubmit={{action 'submit'}}
+      @onCancel={{action 'cancel'}}
       @onFileLoaded={{action 'fileLoaded'}}
       @canEditOnlyOwnProperties={{this.canEditOnlyOwnProperties}}
       @almanakSubscriptionPreferenceTypes={{this.almanakSubscriptionPreferenceTypes}}
diff --git a/app/utils/array-operations.js b/app/utils/array-operations.js
new file mode 100644
index 000000000..e3c55b362
--- /dev/null
+++ b/app/utils/array-operations.js
@@ -0,0 +1,3 @@
+export function union() {
+  return Array.from(new Set([...arguments].flat()));
+}
diff --git a/app/utils/model-save.js b/app/utils/model-save.js
index dec6bbc46..e33d1ffdc 100644
--- a/app/utils/model-save.js
+++ b/app/utils/model-save.js
@@ -1,46 +1,120 @@
 import { isNone } from '@ember/utils';
-
 export default class ModelSaveUtil {
   constructor(entity) {
     this.entity = entity;
   }
 
-  onSuccess(model) {
-    // Show notice
-    if (!isNone(this.entity.successMessage)) {
-      this.entity.flashNotice.sendSuccess(this.entity.successMessage);
+  sendSuccess() {
+    if (!isNone(this.entity?.successMessage)) {
+      this.entity.flashNotice?.sendSuccess(this.entity.successMessage);
+    }
+  }
+
+  sendCancel() {
+    if (!isNone(this.entity?.cancelMessage)) {
+      this.entity.flashNotice?.sendInfo(this.entity.cancelMessage);
     }
+  }
 
-    // Redirect
+  transition(target, model) {
+    target = target ?? 'index';
+    const transitionArgs = model ? [target, model.id] : [target];
+    if (this.entity.transition) {
+      this.entity.transition(...transitionArgs);
+    } else {
+      this.entity.transitionToRoute(...transitionArgs);
+    }
+  }
+
+  redirectSuccess() {
+    const targetModel = this.entity?.successTransitionModel;
     if (!isNone(this.entity.successTransitionTarget)) {
-      if (isNone(model)) {
-        // In destroy routes, model is undefined
-        this.entity.transitionToRoute(this.entity.successTransitionTarget);
+      this.transition(this.entity.successTransitionTarget, targetModel);
+    }
+  }
+
+  redirectCancel() {
+    const targetModel = this.entity?.cancelTransitionModel;
+    if (!isNone(this.entity.cancelTransitionTarget)) {
+      this.transition(this.entity.cancelTransitionTarget, targetModel);
+    }
+  }
+
+  onSuccess() {
+    // Show notice
+    this.sendSuccess();
+    if (this.entity?.onSuccess) {
+      this.entity.onSuccess();
+    } else {
+      // Redirect
+      this.redirectSuccess();
+    }
+  }
+
+  onCancel() {
+    this.sendCancel();
+    if (this.entity?.onCancel) {
+      this.entity.onCancel();
+    } else {
+      this.redirectCancel();
+    }
+  }
+
+  onError(error) {
+    if (this.entity?.onError) {
+      this.entity.onError(error);
+    } else {
+      if (error.errors) {
+        this.entity.errorMessage = error.errors
+          .map((err) => err.detail)
+          .join(', ');
       } else {
-        const targetModel = this.entity.successTransitionModel || model;
-        this.entity.transitionToRoute(
-          this.entity.successTransitionTarget,
-          targetModel
-        );
+        this.entity.errorMessage = String(error);
       }
     }
   }
 
-  onError(error) {
-    this.entity.errorMessage = error.errors.map((err) => err.detail).join(', ');
+  async saveModel(model) {
+    this.entity.errorMessage = null;
+    if (!isNone(model)) {
+      try {
+        const savedModel = await model.save();
+        this.onSuccess(savedModel);
+      } catch (error) {
+        this.onError(error);
+      }
+    }
   }
 
-  saveModel(model) {
+  async saveModelWithForm(model) {
+    this.entity.errorMessage = null;
+    if (!isNone(model)) {
+      try {
+        const savedModel = await model.saveWithForm();
+        this.onSuccess(savedModel);
+      } catch (error) {
+        this.onError(error);
+      }
+    }
+  }
+
+  destroyModel(model) {
     this.entity.errorMessage = null;
     if (!isNone(model)) {
       model
-        .save()
-        .then((savedModel) => {
-          this.onSuccess(savedModel);
+        .destroyRecord()
+        .then(() => {
+          this.entity.destroyed = true;
+          this.onSuccess();
         })
         .catch((error) => {
           this.onError(error);
         });
     }
   }
+
+  cancelEdit() {
+    this.entity.errorMessage = null;
+    this.onCancel();
+  }
 }