diff --git a/src/App.vue b/src/App.vue
index 591a031..38e04c7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,15 +1,14 @@
 <template>
-  <img alt="Vue logo" src="./assets/logo.png">
-  <HelloWorld msg="Welcome to Your Vue.js App"/>
+  <HomeScreen msg="Welcome to Your Vue.js App"/>
 </template>
 
 <script>
-import HelloWorld from './components/HelloWorld.vue'
+import HomeScreen from './components/HomeScreen.vue'
 
 export default {
   name: 'App',
   components: {
-    HelloWorld
+    HomeScreen
   }
 }
 </script>
diff --git a/src/components/HelloWorld.vue b/src/components/HomeScreen.vue
similarity index 90%
rename from src/components/HelloWorld.vue
rename to src/components/HomeScreen.vue
index a7085b6..061f45a 100644
--- a/src/components/HelloWorld.vue
+++ b/src/components/HomeScreen.vue
@@ -1,8 +1,10 @@
 <template>
     <div>
+        <h1>FarmFresh</h1>
         <div v-if="!$store.state.player">
             <input type="text" name="username" v-model="playerNameInput"><br>
-            <button @click="createNewPlayer">Erstellen</button>
+            <br>
+            <button @click="createNewPlayer">Neues Spiel</button>
             {{ response }}
         </div>
         <div v-else>
@@ -15,7 +17,7 @@
 
 <script>
 export default {
-    name: 'HelloWorld',
+    name: 'HomeScreen',
     data() {
         return {
             playerNameInput: "",
diff --git a/src/store/index.js b/src/store/index.js
index f0db6a1..b9a9c33 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -16,8 +16,9 @@ export default createStore({
                 axios.get(
                     'http://api.luna-development.net/api/player/fetch/'+existingUserUuid
                 ).then((response) => {
-                    if (response.data && response.data.uuid) {
-                        state.player = response.data;
+                    if (response.data.success) {
+                        state.player = response.data.player;
+                        state.inventory = response.data.player.inventory;
                         vuex.commit('fetchInventory');
                     } else {
                         alert('User not found');
@@ -28,15 +29,6 @@ export default createStore({
                 });
             }
         },
-        fetchInventory(state) {
-            axios.get(
-                'http://api.luna-development.net/api/inventory/fetch/'+state.player.uuid
-            ).then((response) => {
-                if (response.data.success) {
-                    state.inventory = response.data.inventory;
-                }
-            });
-        },
         createNewPlayer(state, userName) {
             axios.post('http://api.luna-development.net/api/player/create', {
                 name: userName.trim(),
@@ -44,6 +36,7 @@ export default createStore({
             }).then((response) => {
                 if (response.data.success) {
                     state.player = response.data.player;
+                    state.inventory = response.data.player.inventory;
                     localStorage.setItem('farmfresh_uuid', response.data.player.uuid);
                 }
             });