diff --git a/client/src/App.vue b/client/src/App.vue
index c813454e..773ed42f 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -37,6 +37,5 @@
 </script>
 
 <style lang="scss">
-  @import "styles/main";
-  @import "@/assets/main.scss";
+  @import "styles/main.scss";
 </style>
diff --git a/client/src/assets/_variables.scss b/client/src/assets/_variables.scss
deleted file mode 100644
index e69de29b..00000000
diff --git a/client/src/assets/main.scss b/client/src/assets/main.scss
deleted file mode 100644
index 0d760ded..00000000
--- a/client/src/assets/main.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-  CSS Guidelines: BEM
-  - https://css-tricks.com/bem-101/
-  - https://seesparkbox.com/foundry/bem_by_example
- */
-
-@import 'variables';
-@import 'typography';
-
-
-
-.container {
-  margin: 0 auto;
-  width: 100%;
-  max-width: 1440px;
-  display: grid;
-  grid-template-rows: 72px auto 50px;
-  grid-template-columns: 305px auto;
-  grid-column-gap: 80px;
-  min-height: 100vh;
-  grid-template-areas: "h h" "a m" "f f";
-
-  header {
-    grid-area: h;
-  }
-  aside {
-    grid-area: a;
-  }
-  main {
-    grid-area: m;
-  }
-  footer {
-    grid-area: f;
-    display: none;
-  }
-}
-
-
diff --git a/client/src/components/ModuleTeaser.vue b/client/src/components/ModuleTeaser.vue
index 8c49fdba..fda4a761 100644
--- a/client/src/components/ModuleTeaser.vue
+++ b/client/src/components/ModuleTeaser.vue
@@ -10,8 +10,6 @@
 </template>
 
 <style scoped lang="scss">
-  @import "@/assets/_variables.scss";
-
   .module-teaser {
     box-shadow: 0 3px 9px 0 rgba(0, 0, 0, 0.12);
     border: 1px solid #E2E2E2;
diff --git a/client/src/pages/PageDashboard.vue b/client/src/pages/PageDashboard.vue
deleted file mode 100644
index 72723cec..00000000
--- a/client/src/pages/PageDashboard.vue
+++ /dev/null
@@ -1,5 +0,0 @@
-<template>
-  <div>
-    <p>Dashboard</p>
-  </div>
-</template>
diff --git a/client/src/pages/PageNotFound.vue b/client/src/pages/p404.vue
similarity index 100%
rename from client/src/pages/PageNotFound.vue
rename to client/src/pages/p404.vue
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 23b743ed..2e3a633d 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -1,15 +1,13 @@
 import Vue from 'vue'
 import Router from 'vue-router'
-import Dashboard from '@/pages/PageDashboard'
 import index from '@/pages/index'
 import topic from '@/pages/topic'
-import NotFound from '@/pages/PageNotFound'
+import p404 from '@/pages/p404'
 
 const routerOptions = [
   {path: '/', name: 'index', component: index},
-  {path: '/dashboard', name: 'dashboard', component: Dashboard},
   {path: '/topic', name: 'topic', component: topic},
-  {path: '*', component: NotFound}
+  {path: '*', component: p404}
 ]
 
 const routes = routerOptions.map(route => {
diff --git a/client/src/store/index.js b/client/src/store/index.js
index a8255316..4384d21e 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -1,5 +1,8 @@
+import Vue from 'vue'
 import Vuex from 'vuex'
 
+Vue.use(Vuex)
+
 export default new Vuex.Store({
     modules: {},
 
diff --git a/client/src/assets/_typography.scss b/client/src/styles/_typography.scss
similarity index 100%
rename from client/src/assets/_typography.scss
rename to client/src/styles/_typography.scss
diff --git a/client/src/styles/main.scss b/client/src/styles/main.scss
index 5bd82d7e..5e72d162 100644
--- a/client/src/styles/main.scss
+++ b/client/src/styles/main.scss
@@ -1,3 +1,9 @@
+/*
+  CSS Guidelines: BEM
+  - https://css-tricks.com/bem-101/
+  - https://seesparkbox.com/foundry/bem_by_example
+ */
+@import "typography";
 @import "var";
 
 body {
@@ -12,3 +18,32 @@ ul {
 a {
   text-decoration: none;
 }
+
+//todo: move
+.container {
+  margin: 0 auto;
+  width: 100%;
+  max-width: 1440px;
+  display: grid;
+  grid-template-rows: 72px auto 50px;
+  grid-template-columns: 305px auto;
+  grid-column-gap: 80px;
+  min-height: 100vh;
+  grid-template-areas: "h h" "a m" "f f";
+
+  header {
+    grid-area: h;
+  }
+  aside {
+    grid-area: a;
+  }
+  main {
+    grid-area: m;
+  }
+  footer {
+    grid-area: f;
+    display: none;
+  }
+}
+
+