diff --git a/core/inventory/api_v2.py b/core/inventory/api_v2.py
index ef3ae90..0a34140 100644
--- a/core/inventory/api_v2.py
+++ b/core/inventory/api_v2.py
@@ -22,7 +22,7 @@ class ContainerViewSet(viewsets.ModelViewSet):
 
 @api_view(['GET'])
 @permission_classes([IsAuthenticated])
-#@permission_required('view_item', raise_exception=True)
+@permission_required('view_item', raise_exception=True)
 def search_items(request, event_slug, query):
     try:
         event = Event.objects.get(slug=event_slug)
diff --git a/web/src/App.vue b/web/src/App.vue
index cad130c..83a3bb2 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -1,10 +1,10 @@
 <template>
-    <div style="min-height: 100vh; display: flex; flex-direction: column;">
+    <div id="app">
         <AddItemModal v-if="addItemModalOpen && isLoggedIn" @close="closeAddItemModal()" isModal="true"/>
         <AddTicketModal v-if="addTicketModalOpen && isLoggedIn" @close="closeAddTicketModal()" isModal="true"/>
         <AddBoxModal v-if="showAddBoxModal && isLoggedIn" @close="closeAddBoxModal()" isModal="true"/>
         <Navbar v-if="isLoggedIn" @addItemClicked="openAddItemModal()" @addTicketClicked="openAddTicketModal()"/>
-        <router-view style="flex: 1 1;"/>
+        <router-view/>
     </div>
 </template>
 
diff --git a/web/src/components/AsyncLoader.vue b/web/src/components/AsyncLoader.vue
deleted file mode 100644
index 393175c..0000000
--- a/web/src/components/AsyncLoader.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-    <div class="async-wrapper" :class="{ 'loaded': loaded }">
-        <div class="deferred">
-            <slot></slot>
-        </div>
-        <div class="loader-wrapper">
-            <div class="loader-ellipsis">
-                <div></div>
-                <div></div>
-                <div></div>
-                <div></div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-
-export default {
-    name: 'AsyncLoader',
-    props: {
-        loaded: {
-            type: Boolean,
-            default: false
-        }
-    }
-};
-</script>
-
-<style>
-.async-wrapper {
-    position: relative;
-}
-
-.async-wrapper > .deferred {
-    width: 100%;
-    height: 100%;
-    display: none;
-}
-
-.async-wrapper.loaded > .deferred {
-    display: block;
-}
-
-.async-wrapper > .loader-wrapper {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-}
-
-.async-wrapper > .loader-wrapper > .loader-ellipsis {
-    color: #17a2b8;
-}
-
-.async-wrapper.loaded > .loader-wrapper > .loader-ellipsis {
-    display: none;
-}
-
-
-.async-wrapper > .loader-wrapper > .loader-ellipsis,
-.async-wrapper > .loader-wrapper > .loader-ellipsis div {
-    box-sizing: border-box;
-}
-
-.async-wrapper > .loader-wrapper > .loader-ellipsis {
-    display: inline-block;
-    position: relative;
-    width: 80px;
-    height: 80px;
-}
-
-.async-wrapper > .loader-wrapper > .loader-ellipsis div {
-    position: absolute;
-    top: 33.33333px;
-    width: 13.33333px;
-    height: 13.33333px;
-    border-radius: 50%;
-    background: currentColor;
-    animation-timing-function: cubic-bezier(0, 1, 1, 0);
-}
-
-.async-wrapper > .loader-wrapper > .loader-ellipsis div:nth-child(1) {
-    left: 8px;
-    animation: loader-ellipsis1 0.6s infinite;
-}
-
-.async-wrapper > .loader-wrapper > .loader-ellipsis div:nth-child(2) {
-    left: 8px;
-    animation: loader-ellipsis2 0.6s infinite;
-}
-
-.async-wrapper > .loader-wrapper > .loader-ellipsis div:nth-child(3) {
-    left: 32px;
-    animation: loader-ellipsis2 0.6s infinite;
-}
-
-.async-wrapper > .loader-wrapper > .loader-ellipsis div:nth-child(4) {
-    left: 56px;
-    animation: loader-ellipsis3 0.6s infinite;
-}
-
-@keyframes loader-ellipsis1 {
-    0% {
-        transform: scale(0);
-    }
-    100% {
-        transform: scale(1);
-    }
-}
-
-@keyframes loader-ellipsis3 {
-    0% {
-        transform: scale(1);
-    }
-    100% {
-        transform: scale(0);
-    }
-}
-
-@keyframes loader-ellipsis2 {
-    0% {
-        transform: translate(0, 0);
-    }
-    100% {
-        transform: translate(24px, 0);
-    }
-}
-</style>
\ No newline at end of file
diff --git a/web/src/components/Navbar.vue b/web/src/components/Navbar.vue
index 686f324..fb0736b 100644
--- a/web/src/components/Navbar.vue
+++ b/web/src/components/Navbar.vue
@@ -29,7 +29,16 @@
                 </router-link>
             </li>
         </ul>
-        <SearchBox v-if="hasPermissions" class="mt-1 my-lg-auto my-xl-auto w-100 d-inline mr-1"/>
+        <form class="form-inline mt-1 my-lg-auto my-xl-auto w-100 d-inline mr-1" v-if="hasPermissions">
+            <input
+                class="form-control w-100"
+                type="search"
+                placeholder="Search"
+                aria-label="Search"
+                @input="searchEventItems($event.target.value)"
+                disabled
+            >
+        </form>
         <div class="custom-control-inline mr-1" v-if="hasPermissions">
             <div class="btn-group btn-group-toggle mr-1" v-if="isItemView()">
                 <button :class="['btn', 'btn-info', { active: layout === 'cards' }]" @click="setLayout('cards')">
@@ -94,13 +103,9 @@
 
 <script>
 import {mapState, mapActions, mapMutations, mapGetters} from 'vuex';
-import SearchBox from "@/components/inputs/SearchBox.vue";
 
 export default {
     name: 'Navbar',
-    components: {
-        SearchBox
-    },
     data: () => ({
         views: [
             {'title': 'items', 'path': 'items'},
@@ -117,7 +122,7 @@ export default {
         ...mapGetters(['getEventSlug', 'getActiveView', "checkPermission", "hasPermissions", "layout", "route"]),
     },
     methods: {
-        ...mapActions(['changeEvent', 'changeView']),
+        ...mapActions(['changeEvent', 'changeView', 'searchEventItems']),
         ...mapMutations(['logout']),
         navigateTo(link) {
             if (this.route.path !== link)
diff --git a/web/src/components/Timeline.vue b/web/src/components/Timeline.vue
index 28a21b5..6130656 100644
--- a/web/src/components/Timeline.vue
+++ b/web/src/components/Timeline.vue
@@ -40,10 +40,10 @@
                 <div class="">
                     <textarea placeholder="add comment..." v-model="newComment" class="form-control">
                     </textarea>
-                    <AsyncButton class="btn btn-primary float-right" :task="addCommentAndClear">
+                    <button class="btn btn-primary float-right" @click="addCommentAndClear">
                         <font-awesome-icon icon="comment"/>
                         Save Comment
-                    </AsyncButton>
+                    </button>
                 </div>
             </div>
         </li>
@@ -58,10 +58,10 @@
                 <div>
                     <textarea placeholder="reply mail..." v-model="newMail" class="form-control">
                     </textarea>
-                    <AsyncButton class="btn btn-primary float-right" :task="sendMailAndClear">
+                    <button class="btn btn-primary float-right" @click="sendMailAndClear">
                         <font-awesome-icon icon="envelope"/>
                         Send Mail
-                    </AsyncButton>
+                    </button>
                 </div>
             </div>
         </li>
@@ -73,16 +73,15 @@
 import TimelineMail from "@/components/TimelineMail.vue";
 import TimelineComment from "@/components/TimelineComment.vue";
 import TimelineStateChange from "@/components/TimelineStateChange.vue";
-import {mapActions, mapGetters} from "vuex";
+import {mapGetters} from "vuex";
 import TimelineAssignment from "@/components/TimelineAssignment.vue";
 import TimelineRelatedItem from "@/components/TimelineRelatedItem.vue";
 import TimelineShippingVoucher from "@/components/TimelineShippingVoucher.vue";
-import AsyncButton from "@/components/inputs/AsyncButton.vue";
 
 export default {
     name: 'Timeline',
     components: {
-        TimelineShippingVoucher, AsyncButton,
+        TimelineShippingVoucher,
         TimelineRelatedItem, TimelineAssignment, TimelineStateChange, TimelineComment, TimelineMail
     },
     props: {
@@ -104,15 +103,12 @@ export default {
         },
     },
     methods: {
-        ...mapActions(['sendMail', 'postComment']),
-        sendMailAndClear: async function () {
-            //this.$emit('sendMail', this.newMail);
-            await this.sendMail(this.newMail);
+        sendMailAndClear: function () {
+            this.$emit('sendMail', this.newMail);
             this.newMail = "";
         },
-        addCommentAndClear: async function () {
-            //this.$emit('addComment', this.newComment);
-            await this.postComment(this.newComment);
+        addCommentAndClear: function () {
+            this.$emit('addComment', this.newComment);
             this.newComment = "";
         }
     }
diff --git a/web/src/components/inputs/AsyncButton.vue b/web/src/components/inputs/AsyncButton.vue
deleted file mode 100644
index a3c1712..0000000
--- a/web/src/components/inputs/AsyncButton.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-    <button @click.stop="handleClick" :disabled="disabled">
-        <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"
-              :class="{'d-none': !disabled}"></span>
-        <span class="ml-2" :class="{'d-none': !disabled}">In Progress...</span>
-        <span :class="{'d-none': disabled}"><slot></slot></span>
-    </button>
-</template>
-
-<script>
-
-export default {
-    name: 'AsyncButton',
-    data() {
-        return {
-            disabled: false,
-        };
-    },
-    props: {
-        task: {
-            type: Function,
-            required: true,
-        },
-    },
-    methods: {
-        async handleClick() {
-            console.log("AsyncButton.handleClick() called");
-            if (this.task && typeof this.task === 'function') {
-                this.disabled = true;
-                try {
-                    await this.task();
-                } catch (e) {
-                    console.error(e);
-                } finally {
-                    this.disabled = false;
-                }
-            }
-        },
-    }
-};
-</script>
-
-<style scoped>
-.spinner-border {
-    vertical-align: -0.125em;
-}
-</style>
\ No newline at end of file
diff --git a/web/src/components/inputs/SearchBox.vue b/web/src/components/inputs/SearchBox.vue
deleted file mode 100644
index 47c9331..0000000
--- a/web/src/components/inputs/SearchBox.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<template>
-    <form class="form-inline">
-        <input
-            class="form-control w-100"
-            type="search"
-            placeholder="Search"
-            aria-label="Search"
-            v-model="search_query"
-            @input="searchEventItems(search_query)"
-        >
-    </form>
-</template>
-
-<script>
-
-import {mapActions} from "vuex";
-
-export default {
-    name: 'SearchBox',
-    data() {
-        return {
-            search_query: ''
-        }
-    },
-    methods: {
-        ...mapActions(['searchEventItems']),
-    }
-};
-</script>
\ No newline at end of file
diff --git a/web/src/store.js b/web/src/store.js
index 2f25f8f..2dc56fe 100644
--- a/web/src/store.js
+++ b/web/src/store.js
@@ -46,7 +46,6 @@ const store = createStore({
             states: 0,
             messageTemplates: 0,
             shippingVouchers: 0,
-            userNotificationChannels: 0,
         },
         persistent_loaded: false,
         shared_loaded: false,
@@ -234,10 +233,6 @@ const store = createStore({
             state.shippingVouchers = codes;
             state.fetchedData = {...state.fetchedData, shippingVouchers: Date.now()};
         },
-        setUserNotificationChannels(state, channels) {
-            state.userNotificationChannels = channels;
-            state.fetchedData = {...state.fetchedData, userNotificationChannels: Date.now()};
-        },
     },
     actions: {
         async login({commit}, {username, password, remember}) {
@@ -515,10 +510,9 @@ const store = createStore({
         },
         async fetchUserNotificationChannels({commit, state}) {
             if (!state.user.token) return;
-            if (state.fetchedData.userNotificationChannels > Date.now() - 1000 * 60 * 60 * 24) return;
             const {data, success} = await http.get('/2/user_notification_channels/', state.user.token);
             if (data && success) {
-                commit('setUserNotificationChannels', data);
+                state.userNotificationChannels = data;
             }
         },
     },
diff --git a/web/src/views/Items.vue b/web/src/views/Items.vue
index 5abcf5d..9d127f0 100644
--- a/web/src/views/Items.vue
+++ b/web/src/views/Items.vue
@@ -1,82 +1,77 @@
 <template>
-    <AsyncLoader :loaded="loadedItems.length > 0">
-        <div class="container-fluid px-xl-5 mt-3">
-            <Modal title="Edit Item" v-if="editingItem" @close="closeEditingModal()">
-                <template #body>
-                    <EditItem
-                        :item="editingItem"
-                        badge="uid"
-                    />
-                </template>
-                <template #buttons>
-                    <button type="button" class="btn btn-secondary" @click="closeEditingModal()">Cancel</button>
-                    <button type="button" class="btn btn-success" @click="saveEditingItem()">Save Changes</button>
-                </template>
-            </Modal>
-            <Lightbox v-if="lightboxHash" :hash="lightboxHash" @close="closeLightboxModal()"/>
-            <div class="row" v-if="layout === 'table'">
-                <div class="col-xl-8 offset-xl-2">
-                    <Table
-                        :columns="['uid', 'description', 'box']"
-                        :items="loadedItems"
-                        :keyName="'uid'"
-                        @itemActivated="openLightboxModalWith($event)"
-                    >
-                        <template #actions="{ item }">
-                            <div class="btn-group">
-                                <button class="btn btn-success"
-                                        @click.stop="confirm('return Item?') && markItemReturned(item)"
-                                        title="returned">
-                                    <font-awesome-icon icon="check"/>
-                                </button>
-                                <button class="btn btn-secondary" @click.stop="openEditingModalWith(item)" title="edit">
-                                    <font-awesome-icon icon="edit"/>
-                                </button>
-                                <button class="btn btn-danger" @click.stop="confirm('delete Item?') && deleteItem(item)"
-                                        title="delete">
-                                    <font-awesome-icon icon="trash"/>
-                                </button>
-                            </div>
-                        </template>
-                    </Table>
-                </div>
-            </div>
-            <Cards
-                v-if="layout === 'cards'"
-                :columns="['uid', 'description', 'box']"
-                :items="loadedItems"
-                :keyName="'uid'"
-                v-slot="{ item }"
-                @itemActivated="openLightboxModalWith($event)"
-            >
-                <AuthenticatedImage v-if="item.file" cached
-                                    :src="`/media/2/256/${item.file}/`"
-                                    class="card-img-top img-fluid"
+    <div class="container-fluid px-xl-5 mt-3">
+        <Modal title="Edit Item" v-if="editingItem" @close="closeEditingModal()">
+            <template #body>
+                <EditItem
+                    :item="editingItem"
+                    badge="uid"
                 />
-                <div class="card-body">
-                    <h6 class="card-title">{{ item.description }}</h6>
-                    <h6 class="card-subtitle text-secondary">uid: {{ item.uid }} box: {{ item.box }}</h6>
-                    <div class="row mx-auto mt-2">
+            </template>
+            <template #buttons>
+                <button type="button" class="btn btn-secondary" @click="closeEditingModal()">Cancel</button>
+                <button type="button" class="btn btn-success" @click="saveEditingItem()">Save Changes</button>
+            </template>
+        </Modal>
+        <Lightbox v-if="lightboxHash" :hash="lightboxHash" @close="closeLightboxModal()"/>
+        <div class="row" v-if="layout === 'table'">
+            <div class="col-xl-8 offset-xl-2">
+                <Table
+                    :columns="['uid', 'description', 'box']"
+                    :items="loadedItems"
+                    :keyName="'uid'"
+                    @itemActivated="openLightboxModalWith($event)"
+                >
+                    <template #actions="{ item }">
                         <div class="btn-group">
-                            <button class="btn btn-outline-success"
+                            <button class="btn btn-success"
                                     @click.stop="confirm('return Item?') && markItemReturned(item)" title="returned">
                                 <font-awesome-icon icon="check"/>
                             </button>
-                            <button class="btn btn-outline-secondary" @click.stop="openEditingModalWith(item)"
-                                    title="edit">
+                            <button class="btn btn-secondary" @click.stop="openEditingModalWith(item)" title="edit">
                                 <font-awesome-icon icon="edit"/>
                             </button>
-                            <button class="btn btn-outline-danger"
-                                    @click.stop="confirm('delete Item?') && deleteItem(item)"
+                            <button class="btn btn-danger" @click.stop="confirm('delete Item?') && deleteItem(item)"
                                     title="delete">
                                 <font-awesome-icon icon="trash"/>
                             </button>
                         </div>
+                    </template>
+                </Table>
+            </div>
+        </div>
+        <Cards
+            v-if="layout === 'cards'"
+            :columns="['uid', 'description', 'box']"
+            :items="loadedItems"
+            :keyName="'uid'"
+            v-slot="{ item }"
+            @itemActivated="openLightboxModalWith($event)"
+        >
+            <AuthenticatedImage v-if="item.file" cached
+                                :src="`/media/2/256/${item.file}/`"
+                                class="card-img-top img-fluid"
+            />
+            <div class="card-body">
+                <h6 class="card-title">{{ item.description }}</h6>
+                <h6 class="card-subtitle text-secondary">uid: {{ item.uid }} box: {{ item.box }}</h6>
+                <div class="row mx-auto mt-2">
+                    <div class="btn-group">
+                        <button class="btn btn-outline-success"
+                                @click.stop="confirm('return Item?') && markItemReturned(item)" title="returned">
+                            <font-awesome-icon icon="check"/>
+                        </button>
+                        <button class="btn btn-outline-secondary" @click.stop="openEditingModalWith(item)" title="edit">
+                            <font-awesome-icon icon="edit"/>
+                        </button>
+                        <button class="btn btn-outline-danger" @click.stop="confirm('delete Item?') && deleteItem(item)"
+                                title="delete">
+                            <font-awesome-icon icon="trash"/>
+                        </button>
                     </div>
                 </div>
-            </Cards>
-        </div>
-    </AsyncLoader>
+            </div>
+        </Cards>
+    </div>
 </template>
 
 <script>
@@ -87,7 +82,6 @@ import EditItem from '@/components/EditItem';
 import {mapActions, mapGetters, mapState} from 'vuex';
 import Lightbox from '../components/Lightbox';
 import AuthenticatedImage from "@/components/AuthenticatedImage.vue";
-import AsyncLoader from "@/components/AsyncLoader.vue";
 
 export default {
     name: 'Items',
@@ -95,7 +89,7 @@ export default {
         lightboxHash: null,
         editingItem: null,
     }),
-    components: {AsyncLoader, AuthenticatedImage, Lightbox, Table, Cards, Modal, EditItem},
+    components: {AuthenticatedImage, Lightbox, Table, Cards, Modal, EditItem},
     computed: {
         ...mapState(['loadedItems']),
         ...mapGetters(['layout']),
diff --git a/web/src/views/Ticket.vue b/web/src/views/Ticket.vue
index 39f5a71..7ca27b1 100644
--- a/web/src/views/Ticket.vue
+++ b/web/src/views/Ticket.vue
@@ -1,73 +1,67 @@
 <template>
-    <AsyncLoader :loaded="ticket.id">
-        <div class="container-fluid px-xl-5 mt-3">
-            <div class="row">
-                <div class="col-xl-8 offset-xl-2">
-                    <div class="card bg-dark text-light mb-2" id="filters">
-                        <div class="card-header">
-                            <h3>Ticket #{{ ticket.id }} - {{ ticket.name }}</h3>
+    <div class="container-fluid px-xl-5 mt-3">
+        <div class="row">
+            <div class="col-xl-8 offset-xl-2">
+                <div class="card bg-dark text-light mb-2" id="filters">
+                    <div class="card-header">
+                        <h3>Ticket #{{ ticket.id }} - {{ ticket.name }}</h3>
+                    </div>
+                    <Timeline :timeline="ticket.timeline" @sendMail="handleMail" @addComment="handleComment"/>
+                    <div class="card-footer d-flex justify-content-between">
+                        <button class="btn btn-secondary mr-2" @click="$router.go(-1)">Back</button>
+                        <!--button class="btn btn-danger" @click="deleteItem({type: 'tickets', id: ticket.id})">
+                            <font-awesome-icon icon="trash"/>
+                            Delete
+                        </button-->
+                        <div class="btn-group">
+                            <select class="form-control" v-model="ticket.assigned_to">
+                                <option v-for="user in users" :value="user.username">{{ user.username }}</option>
+                            </select>
+                            <button class="form-control btn btn-success" @click="assigTicket(ticket)">
+                                Assign&nbsp;Ticket
+                            </button>
                         </div>
-                        <Timeline :timeline="ticket.timeline" @sendMail="handleMail" @addComment="handleComment"/>
-                        <div class="card-footer d-flex justify-content-between">
-                            <button class="btn btn-secondary mr-2" @click="$router.go(-1)">Back</button>
-                            <!--button class="btn btn-danger" @click="deleteItem({type: 'tickets', id: ticket.id})">
-                                <font-awesome-icon icon="trash"/>
-                                Delete
-                            </button-->
-                            <div class="btn-group">
-                                <select class="form-control" v-model="ticket.assigned_to">
-                                    <option v-for="user in users" :value="user.username">{{ user.username }}</option>
-                                </select>
-                                <button class="form-control btn btn-success" @click="assignTicket(ticket)">
-                                    Assign&nbsp;Ticket
-                                </button>
-                            </div>
-                            <div class="btn-group">
-                                <select class="form-control" v-model="ticket.state">
-                                    <option v-for="status in state_options" :value="status.value">{{
-                                            status.text
-                                        }}
-                                    </option>
-                                </select>
-                                <button class="form-control btn btn-success" @click="changeTicketStatus(ticket)">
-                                    Change&nbsp;Status
-                                </button>
-                            </div>
+                        <div class="btn-group">
+                            <select class="form-control" v-model="ticket.state">
+                                <option v-for="status in state_options" :value="status.value">{{ status.text }}</option>
+                            </select>
+                            <button class="form-control btn btn-success" @click="changeTicketStatus(ticket)">
+                                Change&nbsp;Status
+                            </button>
                         </div>
-                        <div class="card-footer d-flex justify-content-between">
-                            <ClipboardButton :payload="shippingEmail" class="btn btn-primary">
-                                <font-awesome-icon icon="clipboard"/>
-                                Copy&nbsp;DHL&nbsp;contact&nbsp;to&nbsp;clipboard
-                            </ClipboardButton>
-                            <div class="btn-group">
-                                <select class="form-control" v-model="shipping_voucher_type">
-                                    <option v-for="type in availableShippingVoucherTypes.filter(t=>t.count>0)"
-                                            :value="type.id">{{ type.name }}
-                                    </option>
-                                </select>
-                                <button class="form-control btn btn-success"
-                                        @click="claimShippingVoucher({ticket: ticket.id, shipping_voucher_type}).then(()=>shipping_voucher_type=null)"
-                                        :disabled="!shipping_voucher_type">
-                                    Claim&nbsp;Shipping&nbsp;Voucher
-                                </button>
-                            </div>
+                    </div>
+                    <div class="card-footer d-flex justify-content-between">
+                        <ClipboardButton :payload="shippingEmail" class="btn btn-primary">
+                            <font-awesome-icon icon="clipboard"/>
+                            Copy&nbsp;DHL&nbsp;contact&nbsp;to&nbsp;clipboard
+                        </ClipboardButton>
+                        <div class="btn-group">
+                            <select class="form-control" v-model="shipping_voucher_type">
+                                <option v-for="type in availableShippingVoucherTypes.filter(t=>t.count>0)"
+                                        :value="type.id">{{ type.name }}
+                                </option>
+                            </select>
+                            <button class="form-control btn btn-success"
+                                    @click="claimShippingVoucher({ticket: ticket.id, shipping_voucher_type}).then(()=>shipping_voucher_type=null)"
+                                    :disabled="!shipping_voucher_type">
+                                Claim&nbsp;Shipping&nbsp;Voucher
+                            </button>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
-    </AsyncLoader>
+    </div>
 </template>
 
 <script>
 import {mapActions, mapGetters, mapState} from 'vuex';
 import Timeline from "@/components/Timeline.vue";
 import ClipboardButton from "@/components/inputs/ClipboardButton.vue";
-import AsyncLoader from "@/components/AsyncLoader.vue";
 
 export default {
     name: 'Ticket',
-    components: {AsyncLoader, ClipboardButton, Timeline},
+    components: {ClipboardButton, Timeline},
     data() {
         return {
             shipping_voucher_type: null
@@ -108,7 +102,7 @@ export default {
                 state: ticket.state
             })
         },
-        assignTicket(ticket) {
+        assigTicket(ticket) {
             this.updateTicketPartial({
                 id: ticket.id,
                 assigned_to: ticket.assigned_to
diff --git a/web/src/views/Tickets.vue b/web/src/views/Tickets.vue
index f1497bb..37de2fb 100644
--- a/web/src/views/Tickets.vue
+++ b/web/src/views/Tickets.vue
@@ -1,53 +1,51 @@
 <template>
-    <AsyncLoader :loaded="tickets.length > 0">
-        <div class="container-fluid px-xl-5 mt-3">
-            <div class="row">
-                <div class="col-xl-8 offset-xl-2">
-                    <SlotTable
-                        :columns="['id', 'name', 'state', 'last_activity', 'assigned_to', 'actions', 'actions2']"
-                        :items="tickets.map(formatTicket)"
-                        :keyName="'id'"
-                        v-if="layout === 'table'"
-                    >
-                        <template v-slot:actions="{item}">
-                            <div class="btn-group">
-                                <a class="btn btn-primary" :href="'/'+ getEventSlug + '/ticket/' + item.id" title="view"
-                                   @click.prevent="gotoDetail(item)">
-                                    <font-awesome-icon icon="eye"/>
-                                    View
-                                </a>
-                            </div>
-                        </template>
-                    </SlotTable>
-                </div>
+    <div class="container-fluid px-xl-5 mt-3">
+        <div class="row">
+            <div class="col-xl-8 offset-xl-2">
+                <SlotTable
+                    :columns="['id', 'name', 'state', 'last_activity', 'assigned_to', 'actions', 'actions2']"
+                    :items="tickets.map(formatTicket)"
+                    :keyName="'id'"
+                    v-if="layout === 'table'"
+                >
+                    <template v-slot:actions="{item}">
+                        <div class="btn-group">
+                            <a class="btn btn-primary" :href="'/'+ getEventSlug + '/ticket/' + item.id" title="view"
+                               @click.prevent="gotoDetail(item)">
+                                <font-awesome-icon icon="eye"/>
+                                View
+                            </a>
+                        </div>
+                    </template>
+                </SlotTable>
             </div>
-            <CollapsableCards v-if="layout === 'tasks'" :items="tickets"
-                              :columns="['id', 'name', 'last_activity', 'assigned_to']"
-                              :keyName="'state'" :sections="['pending_new', 'pending_open','pending_shipping',
-                          'pending_physical_confirmation','pending_return','pending_postponed'].map(stateInfo)">
-                <template #section_header="{index, section, count}">
-                    {{ section.text }} <span class="badge badge-light ml-1">{{ count }}</span>
-                </template>
-                <template #section_body="{item}">
-                    <tr>
-                        <td>{{ item.id }}</td>
-                        <td>{{ item.name }}</td>
-                        <td>{{ item.last_activity }}</td>
-                        <td>{{ item.assigned_to }}</td>
-                        <td>
-                            <div class="btn-group">
-                                <a class="btn btn-primary" :href="'/'+ getEventSlug + '/ticket/' + item.id" title="view"
-                                   @click.prevent="gotoDetail(item)">
-                                    <font-awesome-icon icon="eye"/>
-                                    View
-                                </a>
-                            </div>
-                        </td>
-                    </tr>
-                </template>
-            </CollapsableCards>
         </div>
-    </AsyncLoader>
+        <CollapsableCards v-if="layout === 'tasks'" :items="tickets"
+                          :columns="['id', 'name', 'last_activity', 'assigned_to']"
+                          :keyName="'state'" :sections="['pending_new', 'pending_open','pending_shipping',
+                          'pending_physical_confirmation','pending_return','pending_postponed'].map(stateInfo)">
+            <template #section_header="{index, section, count}">
+                {{ section.text }} <span class="badge badge-light ml-1">{{ count }}</span>
+            </template>
+            <template #section_body="{item}">
+                <tr>
+                    <td>{{ item.id }}</td>
+                    <td>{{ item.name }}</td>
+                    <td>{{ item.last_activity }}</td>
+                    <td>{{ item.assigned_to }}</td>
+                    <td>
+                        <div class="btn-group">
+                            <a class="btn btn-primary" :href="'/'+ getEventSlug + '/ticket/' + item.id" title="view"
+                               @click.prevent="gotoDetail(item)">
+                                <font-awesome-icon icon="eye"/>
+                                View
+                            </a>
+                        </div>
+                    </td>
+                </tr>
+            </template>
+        </CollapsableCards>
+    </div>
 </template>
 
 <script>
@@ -58,11 +56,10 @@ import {mapActions, mapGetters, mapState} from 'vuex';
 import Lightbox from '../components/Lightbox';
 import SlotTable from "@/components/SlotTable.vue";
 import CollapsableCards from "@/components/CollapsableCards.vue";
-import AsyncLoader from "@/components/AsyncLoader.vue";
 
 export default {
     name: 'Tickets',
-    components: {AsyncLoader, Lightbox, SlotTable, Cards, Modal, EditItem, CollapsableCards},
+    components: {Lightbox, SlotTable, Cards, Modal, EditItem, CollapsableCards},
     computed: {
         ...mapState(['tickets']),
         ...mapGetters(['stateInfo', 'getEventSlug', 'layout']),
diff --git a/web/src/views/admin/Notifications.vue b/web/src/views/admin/Notifications.vue
index 71cb630..312a902 100644
--- a/web/src/views/admin/Notifications.vue
+++ b/web/src/views/admin/Notifications.vue
@@ -1,36 +1,9 @@
 <template>
-    <div>
-        <Table :items="userNotificationChannels.map(channel => ({...channel, username: channel.user.username || {}}))"
-               :columns="['id', 'username', 'channel_type', 'channel_target', 'event_filter', /*'active', 'created'*/]">
-            <template #actions="{ item }">
-                <div class="btn-group">
-                    <button class="btn btn-danger" @click.stop="">
-                        <font-awesome-icon icon="trash"/>
-                        delete
-                    </button>
-                </div>
-            </template>
-        </Table>
-        <div class="card bg-dark">
-            <div class="card-body">
-                <div class="input-group">
-                    <select class="form-control">
-                        <option value="1">user</option>
-                        <option value="2">admin</option>
-                    </select>
-                    <select class="form-control">
-                        <option value="email">Email</option>
-                        <option value="telegram">Telegram</option>
-                    </select>
-                    <input type="text" class="form-control" placeholder="channel_target">
-                    <input type="text" class="form-control" value="*">
-                    <div class="input-group-append">
-                        <button class="btn btn-primary">Add</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+    <ul>
+        <li v-for="channel in userNotificationChannels" :key="channel.id">
+            {{ channel.id }} - {{ channel.channel_type }} - {{ channel.channel_target }} - {{ channel.event_filter }} - {{ channel.active }} - {{ channel.created }} - {{ channel.user }}
+        </li>
+    </ul>
 </template>
 
 <script>