diff --git a/app/src/App.vue b/app/src/App.vue
index d6dc96eb99b715de647cd615f89a5ed905455234..d9bc854943cb20ce29e82758065cb25bb2bfb5d2 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -1,7 +1,10 @@
 <template>
   <div id="app">
     <navigation />
+
     <router-view />
+    <!-- <router-view v-if="this.window.width < 600" name="this.name" />
+    <router-view v-else to="/organise" /> -->
   </div>
 </template>
 
@@ -11,12 +14,30 @@ import Navigation from './components/Navigation'
 export default {
   data: function () {
     return {
+      // name: '',
+      // window: {
+      //   width: 0,
+      //   height: 0,
+      // },
       routes: routes.filter((route) => !!route.name),
     }
   },
   components: {
     navigation: Navigation,
   },
+  // mounted() {
+  //   window.addEventListener('resize', this.handleResize)
+  //   this.handleResize()
+  //   this.name = routes[1].name
+  // },
+  // destroyed() {
+  //   window.removeEventListener('resize', this.handleResize)
+  // },
+  // methods: {
+  //   handleResize() {
+  //     this.window.width = window.innerWidth
+  //   },
+  // },
 }
 </script>
 <style>
diff --git a/app/src/components/CardsLayer.vue b/app/src/components/CardsLayer.vue
index 16e4a98b406f6704e46124b6f8f240dd998390d5..2d743bb022bb8f1ca4f2fe635bccfec2c55b2f5a 100644
--- a/app/src/components/CardsLayer.vue
+++ b/app/src/components/CardsLayer.vue
@@ -99,7 +99,7 @@ export default {
     },
 
     editTrue(e) {
-      this.$emit('editTrue', e)
+      this.$emit('edit-true', e)
     },
 
     deleteFlag(e) {
diff --git a/app/src/components/OffLine.vue b/app/src/components/OffLine.vue
index f8c5b52e9491563527872fd0e36798fd1edc46f6..2ab43f55dedb832d479e010886c085bf01b7d318 100644
--- a/app/src/components/OffLine.vue
+++ b/app/src/components/OffLine.vue
@@ -39,10 +39,10 @@ export default {
   methods: {
     addDoc() {
       this.$store.dispatch('addDoc')
-      this.$emit('editMode')
+      this.$emit('edit-mode')
     },
     editTrue(e) {
-      this.$emit('editTrue', e)
+      this.$emit('edit-true', e)
       //// console.log(e)
     },
 
diff --git a/app/src/components/old/ControlsLayer.vue b/app/src/components/old/ControlsLayer.vue
index 4bdbb4cdb714dccead61e865cd953b01f9aac304..2bbe134fcf9a99e73de74b4b47af59eab01ddf10 100644
--- a/app/src/components/old/ControlsLayer.vue
+++ b/app/src/components/old/ControlsLayer.vue
@@ -54,7 +54,7 @@ export default {
     },
     listView() {
       // FIXME: add action here to toggle visiblity
-      this.$emit('listView')
+      this.$emit('list-view')
     },
     exportStorage: function () {
       // Save local indexeddb document-store to JSON file
@@ -92,7 +92,7 @@ export default {
       } else {
         // handle offline status
         // console.log('offline')
-        ref.$emit('offlineTriggered')
+        ref.$emit('offline-triggered')
       }
     },
     isReachable: function (url) {
diff --git a/app/src/components/old/OnBoard-old.vue b/app/src/components/old/OnBoard-old.vue
index 208565734055f9c0cc3e9fa93403e0e765c7f55a..ac5594d3e2316bab88cf92d0b3cf275899ceb1d6 100644
--- a/app/src/components/old/OnBoard-old.vue
+++ b/app/src/components/old/OnBoard-old.vue
@@ -106,7 +106,7 @@ export default {
     },
 
     letsGo() {
-      this.$emit('clientAdded')
+      this.$emit('client-added')
       // this.$emit('readyMode')
     },
     setFocus() {
diff --git a/app/src/experimental/uiStore.js b/app/src/experimental/uiStore.js
index 9d4a81ac61caec88a2aecf47185f27bc52913958..74f1963e5749fb896e548134dc4325d2285d8bd5 100644
--- a/app/src/experimental/uiStore.js
+++ b/app/src/experimental/uiStore.js
@@ -18,6 +18,7 @@ const store = {
       nodes: [],
     },
     mode: 'select',
+    tipshidden: false,
     scale: 1,
     translation: {
       x: 0,
diff --git a/app/src/router/index.js b/app/src/router/index.js
index 8489e75d4d6113242f2ad9b468076b7fcc823bd7..d715684b206d916237f104df50553d7f6757f227 100644
--- a/app/src/router/index.js
+++ b/app/src/router/index.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-import List from '../views/List.vue'
+import Collect from '../views/Collect.vue'
 import Organise from '../views/Organise.vue'
 import Cards from '../views/Cards.vue'
 import Discarded from '../views/Discarded.vue'
@@ -17,7 +17,7 @@ export const routes = [
   {
     path: '/',
     name: 'Collect',
-    component: List,
+    component: Collect,
   },
   {
     path: '/organise',
@@ -57,7 +57,7 @@ export const routes = [
   // dynamic segement `:microcosm` is added to the path
   {
     path: '/microcosm/:microcosm',
-    component: List,
+    component: Collect,
   },
 ]
 
diff --git a/app/src/views/List.vue b/app/src/views/Collect.vue
similarity index 99%
rename from app/src/views/List.vue
rename to app/src/views/Collect.vue
index 26d5cc04447128e42dd467b216dcc53568dcea34..daba60a5b36e092f38d1028d5ac6e6192d4b2757 100644
--- a/app/src/views/List.vue
+++ b/app/src/views/Collect.vue
@@ -77,7 +77,7 @@ import { mapState } from 'vuex'
 import { shortcutsMixin } from '@/components/mixins/shortcutsMixin.js'
 
 export default {
-  name: 'List',
+  name: 'Collect',
 
   mixins: [shortcutsMixin],
   data: function () {