diff --git a/frontend/src/components/Header.vue b/frontend/src/components/Header.vue
index 945f903..fff480f 100644
--- a/frontend/src/components/Header.vue
+++ b/frontend/src/components/Header.vue
@@ -1,12 +1,12 @@
 <template>
-  <v-flex mb-4>
-    <h1 class="display-2 font-weight-bold mb-3">
-      Hello World!
-    </h1>
-    <p class="subheading font-weight-regular">
-      App under development, please don't submit any valuable data!
-    </p>
-  </v-flex>
+  <v-toolbar app>
+    <v-toolbar-title class="headline text-uppercase">
+      <span>Yavook</span>
+      <span class="font-weight-light">!FFTCG</span>
+    </v-toolbar-title>
+    <v-spacer></v-spacer>
+    <slot />
+  </v-toolbar>
 </template>
 
 <script>
diff --git a/frontend/src/components/forms/FormDialog.vue b/frontend/src/components/forms/FormDialog.vue
index c5e5897..6397d24 100644
--- a/frontend/src/components/forms/FormDialog.vue
+++ b/frontend/src/components/forms/FormDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <v-dialog v-model="dialog">
-    <v-btn slot="activator">
+    <v-btn flat slot="activator">
       {{ buttonText }}
     </v-btn>
 
diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index 3ecfe5a..1c6288a 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -1,10 +1,16 @@
 <template>
-  <v-container>
-    <Header />
+  <v-content>
+    <v-container>
+      <Header>
+        <LoginForm />
+        <RegisterForm />
+      </Header>
 
-    <LoginForm />
-    <RegisterForm />
-  </v-container>
+      <p class="subheading font-weight-regular">
+        App under development, please don't submit any valuable data!
+      </p>
+    </v-container>
+  </v-content>
 </template>
 
 <script>
diff --git a/frontend/src/views/UserCP.vue b/frontend/src/views/UserCP.vue
index 66bf983..aab58db 100644
--- a/frontend/src/views/UserCP.vue
+++ b/frontend/src/views/UserCP.vue
@@ -1,15 +1,17 @@
 <template>
-  <v-container>
-    <Header />
+  <v-content>
+    <v-container>
+      <Header>
+        <v-btn flat @click.native="logout">Logout</v-btn>
+      </Header>
 
-    <template v-if="user">
-      <p>user logged in: {{ user.login }}</p>
+      <template v-if="user">
+        <p>user logged in: {{ user.login }}</p>
 
-      <DeckList />
-
-      <v-btn @click.native="logout">Logout</v-btn>
-    </template>
-  </v-container>
+        <DeckList />
+      </template>
+    </v-container>
+  </v-content>
 </template>
 
 <script>
@@ -27,6 +29,8 @@ export default {
     DeckList
   },
 
+  data: () => ({}),
+
   methods: {
     goHome() {
       Cookies.remove('session')