diff --git a/src/resources/js/app.js b/src/resources/js/app.js
index c47e60d7..6ebad4ab 100644
--- a/src/resources/js/app.js
+++ b/src/resources/js/app.js
@@ -1,83 +1,78 @@
 /**
  * First we will load all of this project's JavaScript dependencies which
  * includes Vue and other libraries. It is a great starting point when
  * building robust, powerful web applications using Vue and Laravel.
  */
 
 require('./bootstrap')
 
 window.Vue = require('vue')
 
-import router from '../vue/js/routes.js'
-
 import AppComponent from '../vue/components/App'
+import router from '../vue/js/routes.js'
+import VueToastr from '@deveodk/vue-toastr'
 
 const app = new Vue({
     el: '#app',
     components: { AppComponent },
     router,
     methods: {
         clearFormValidation: form => {
             $(form).find('.is-invalid').removeClass('is-invalid')
             $(form).find('.invalid-feedback').remove()
         }
     },
     mounted() {
         this.$root.$on('clearFormValidation', (form) => {
             this.clearFormValidation(form)
         })
     }
 })
 
-import VueToastr from '@deveodk/vue-toastr'
-// You need a specific loader for CSS files like https://github.com/webpack/css-loader
-// If you would like custom styling of the toastr the css file can be replaced
-import '@deveodk/vue-toastr/dist/@deveodk/vue-toastr.css'
-
 Vue.use(VueToastr, {
     defaultPosition: 'toast-bottom-right',
     defaultTimeout: 50000
 })
 
 // Add a response interceptor for general/validation error handler
 window.axios.interceptors.response.use(
     response => {
         // Do nothing
         return response
     },
     error => {
         var error_msg
 
         if (error.response && error.response.status == 422) {
             error_msg = "Form validation error"
 
             $.each(error.response.data.errors || {}, (idx, msg) => {
                 $('form').each((i, form) => {
                     const input_name = ($(form).data('validation-prefix') || '') + idx
                     const input = $('#' + input_name)
 
                     if (input.length) {
                         input.addClass('is-invalid')
                             .parent().append($('<div class="invalid-feedback">')
                                 .text($.type(msg) === 'string' ? msg : msg.join('<br>')))
 
                         return false
                     }
                 });
             })
 
             $('form .is-invalid').first().focus()
         }
         else if (error.response && error.response.data) {
             error_msg = error.response.data.message
         }
         else {
             error_msg = error.request ? error.request.statusText : error.message
         }
 
         app.$toastr('error', error_msg || "Server Error", 'Error')
 
         // Pass the error as-is
         return Promise.reject(error)
     }
 )
diff --git a/src/resources/sass/app.scss b/src/resources/sass/app.scss
index 6ef10d43..e61a329d 100644
--- a/src/resources/sass/app.scss
+++ b/src/resources/sass/app.scss
@@ -1,17 +1,19 @@
 // Fonts
 
 // Variables
 @import 'variables';
 
 // Bootstrap
 @import '~bootstrap/scss/bootstrap';
 
+// Toastr
+@import '~@deveodk/vue-toastr/dist/@deveodk/vue-toastr.css';
 
 #app {
     margin-top: 3em;
 }
 
 // Fixes Toastr incompatibility with Bootstrap
 .toast-container > .toast {
     opacity: 1;
 }