diff --git a/components/pages/events/index.vue b/components/pages/events/index.vue
index fca6b8a..b88dbe8 100644
--- a/components/pages/events/index.vue
+++ b/components/pages/events/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div :key="isAuthenticated">
-    <v-container fluid grid-list-md class="app-fade-in" :key="range">
-      <v-layout row wrap v-if="!isAuthenticated">
+  <div :key='isAuthenticated'>
+    <v-container :key='range' fluid grid-list-md class='app-fade-in'>
+      <v-layout v-if='!isAuthenticated' row wrap>
         <v-flex xs12>
           <p><b v-text="$t('events.login')" /></p>
         </v-flex>
@@ -9,25 +9,25 @@
       <v-layout row wrap>
         <v-flex xs12>
           <v-text-field
-            v-model="origin"
+            v-model='origin'
             :label="$t('origins.origin')"
             :placeholder="$t('origins.geolocation')"
           >
-            <v-tooltip top slot="append-outer">
-              <template v-slot:activator="{ on }">
-                <v-icon v-on="on" v-on:click="fetchAddress()"
-                  >mdi-crosshairs-gps
+            <v-tooltip slot='append-outer' top>
+              <template #activator='{ on }'>
+                <v-icon v-on='on' @click='fetchAddress()'
+                >mdi-crosshairs-gps
                 </v-icon>
               </template>
               <span v-text="$t('origins.fetchAddress')" />
             </v-tooltip>
-            <v-tooltip top slot="prepend" v-if="isAuthenticated">
-              <template v-slot:activator="{ on }">
+            <v-tooltip v-if='isAuthenticated' slot='prepend' top>
+              <template #activator='{ on }'>
                 <v-icon
-                  v-on="on"
-                  :disabled="!origin"
-                  v-on:click="saveOrigin(origin)"
-                  >mdi-bookmark-plus-outline
+                  :disabled='!origin'
+                  v-on='on'
+                  @click='saveOrigin(origin)'
+                >mdi-bookmark-plus-outline
                 </v-icon>
               </template>
               <span v-text="$t('origins.save')" />
@@ -38,38 +38,34 @@
       <v-layout row wrap>
         <v-flex>
           <v-btn-toggle
-            v-if="$vuetify.breakpoint.smAndUp"
-            v-model="range"
+            v-if='$vuetify.breakpoint.smAndUp'
+            v-model='range'
             mandatory
           >
-            <v-btn
-              text
-              v-for="r in ranges"
-              :key="r.value"
-              :value="r.value"
-              v-text="$t(`events.range.${r.value}`)"
-            />
+            <v-btn v-for='r in ranges' :key='r.value' text :value='r.value'>
+              <span v-text='$t(`events.range.${r.value}`)'
+              /></v-btn>
           </v-btn-toggle>
           <v-select
+            v-if='$vuetify.breakpoint.xsOnly'
+            v-model='range'
             outline
-            v-if="$vuetify.breakpoint.xsOnly"
-            v-model="range"
-            :items="ranges"
-            item-text="name"
-            item-value="value"
+            :items='ranges'
+            item-text='name'
+            item-value='value'
           />
         </v-flex>
       </v-layout>
       <list
-        :events="events || []"
-        :has-user="isAuthenticated"
-        :toggleIgnore="toggleIgnore"
+        :events='events || []'
+        :has-user='isAuthenticated'
+        :toggle-ignore='toggleIgnore'
       />
     </v-container>
     <v-snackbar
-      v-model="snackbar.active"
-      :color="snackbar.color"
-      :timeout="5000"
+      v-model='snackbar.active'
+      :color='snackbar.color'
+      :timeout='5000'
     >
       {{ snackbar.text }}
     </v-snackbar>
@@ -80,7 +76,7 @@
 import { useMutations, useRouter } from '@u3u/vue-hooks'
 import { computed, ref, watch } from '@vue/composition-api'
 import { useMutation, useQuery, useResult } from '@vue/apollo-composable'
-import { useAuth } from '../../../plugins/auth'
+import { useAuth } from '~/plugins/auth'
 
 import List from './List'
 import {
@@ -92,8 +88,8 @@ import {
   toggleIgnoreDanceHall,
   toggleIgnoreMunicipality,
   toggleIgnoreState
-} from '../../../utils/graph-client'
-import { useTranslation } from '../../../plugins/i18n'
+} from '~/utils/graph-client'
+import { useTranslation } from '~/plugins/i18n'
 
 export default {
   name: 'EventsPage',
@@ -122,7 +118,6 @@ export default {
       range,
       (r) => {
         enabled.value = true
-        console.log('isAuthenticated', isAuthenticated.value)
         refetch({
           range: r,
           includeOrigins: isAuthenticated.value || false
diff --git a/components/pages/filters/List/index.vue b/components/pages/filters/List/index.vue
index 639103b..c47b35f 100644
--- a/components/pages/filters/List/index.vue
+++ b/components/pages/filters/List/index.vue
@@ -6,15 +6,15 @@
       </v-card-title>
       <v-list>
         <v-list-item v-for="item in model" :key="item">
-          <v-list-item-action v-on:click="toggleIgnore(type, item)">
+          <v-list-item-action @click="toggleIgnore(type, item)">
             <v-tooltip top slot="prepend">
-              <template v-slot:activator="{ on }">
+              <template #activator="{ on }">
                 <v-icon v-on="on">mdi-delete-outline</v-icon>
               </template>
               <span v-text="$t('filters.remove')" />
             </v-tooltip>
           </v-list-item-action>
-          <v-list-item-title v-html="item" />
+          <v-list-item-titl><span v-html="item" /></v-list-item-titl>
         </v-list-item>
       </v-list>
     </v-card>
diff --git a/layouts/default.vue b/layouts/default.vue
index f8b0513..2c94145 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -15,7 +15,7 @@
           <v-list-item @click="locale = 'sv'">
             <v-list-item-title>På Svenska 🇸🇪</v-list-item-title>
           </v-list-item>
-          <v-list-item link v-if="!user" @click="doLogin">
+          <v-list-item v-if="!user" link @click="doLogin">
             <v-list-item-title>{{ $t('app.login') }}</v-list-item-title>
           </v-list-item>
           <v-list-item v-if="isAuthenticated && user">
@@ -23,7 +23,7 @@
               <v-img :src="user.picture" :alt="user.name" />
             </v-list-item-avatar>
             <v-list-item-content>
-              <v-list-item-title v-html="user.name" />
+              <v-list-item-title><span v-html="user.name" /></v-list-item-title>
             </v-list-item-content>
           </v-list-item>
           <v-list-item link to="/">
@@ -32,19 +32,19 @@
             </v-list-item-action>
             <v-list-item-title>{{ $t('app.links.events') }}</v-list-item-title>
           </v-list-item>
-          <v-list-item link to="/origins/" v-if="isAuthenticated">
+          <v-list-item v-if="isAuthenticated" link to="/origins/">
             <v-list-item-action>
               <v-icon>mdi-home</v-icon>
             </v-list-item-action>
             <v-list-item-title>{{ $t('app.links.origins') }}</v-list-item-title>
           </v-list-item>
-          <v-list-item link to="/filters/" v-if="isAuthenticated">
+          <v-list-item v-if="isAuthenticated" link to="/filters/">
             <v-list-item-action>
               <v-icon>mdi-magnify</v-icon>
             </v-list-item-action>
             <v-list-item-title>{{ $t('app.links.filters') }}</v-list-item-title>
           </v-list-item>
-          <v-list-item link v-if="isAuthenticated">
+          <v-list-item v-if="isAuthenticated" link>
             <v-list-item-action>
               <v-icon>exit_to_app</v-icon>
             </v-list-item-action>
@@ -55,8 +55,8 @@
         </v-list>
       </v-navigation-drawer>
       <v-app-bar app scroll-off-screen>
-        <v-app-bar-nav-icon v-on:click="nav = !nav" />
-        <v-toolbar-title v-html="title" />
+        <v-app-bar-nav-icon @click="nav = !nav" />
+        <v-toolbar-title><span v-html="title" /></v-toolbar-title>
         <v-spacer />
         <v-toolbar-items>
           <v-list-item v-if="isAuthenticated && user">
@@ -64,13 +64,13 @@
               <v-img :src="user.picture" :alt="user.name" />
             </v-list-item-avatar>
             <v-list-item-content>
-              <v-list-item-title v-html="user.name" />
+              <v-list-item-title><span v-html="user.name" /></v-list-item-title>
             </v-list-item-content>
           </v-list-item>
         </v-toolbar-items>
       </v-app-bar>
       <v-main>
-        <v-container fluid v-if="!loading">
+        <v-container v-if="!loading" fluid>
           <nuxt />
         </v-container>
       </v-main>