diff --git a/public/components/NewGameDialog.vue.js b/public/components/NewGameDialog.vue.js
new file mode 100644
index 0000000..3eb6040
--- /dev/null
+++ b/public/components/NewGameDialog.vue.js
@@ -0,0 +1,94 @@
+"use strict"
+
+import GameCommon from './../../common/GameCommon.js'
+import Upload from './../components/Upload.vue.js'
+import ImageTeaser from './../components/ImageTeaser.vue.js'
+
+export default {
+  name: 'NewGameDialog',
+  components: {
+    Upload,
+    ImageTeaser,
+  },
+  template: `
+  <div>
+    <h1>New game</h1>
+    <table>
+      <tr>
+        <td><label>Pieces: </label></td>
+        <td><input type="text" v-model="tiles" /></td>
+      </tr>
+      <tr>
+        <td><label>Scoring: </label></td>
+        <td>
+          <label><input type="radio" v-model="scoreMode" value="1" /> Any (Score when pieces are connected to each other or on final location)</label>
+          <br />
+          <label><input type="radio" v-model="scoreMode" value="0" /> Final (Score when pieces are put to their final location)</label>
+        </td>
+      </tr>
+      <tr>
+        <td><label>Image: </label></td>
+        <td>
+          <span v-if="image">
+            <img :src="image.url" style="width: 150px;" />
+            or
+            <upload @uploaded="mediaImgUploaded($event)" accept="image/*" label="Upload an image" />
+          </span>
+          <span v-else>
+            <upload @uploaded="mediaImgUploaded($event)" accept="image/*" label="Upload an image" />
+            (or select from below)
+          </span>
+        </td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          <button class="btn" :disabled="!canStartNewGame" :class="" @click="onNewGameClick">Start new game</button>
+        </td>
+      </tr>
+    </table>
+
+    <h1>Image lib</h1>
+    <div>
+      <image-teaser v-for="i in images" :image="i" @click="image = i" />
+    </div>
+  </div>`,
+  props: {
+    images: Array,
+  },
+  emits: {
+    newGame: null,
+  },
+  data() {
+    return {
+      tiles: 1000,
+      image: '',
+      scoreMode: GameCommon.SCORE_MODE_ANY,
+    }
+  },
+  methods: {
+    mediaImgUploaded(j) {
+      this.image = j.image
+    },
+    canStartNewGame () {
+      if (!this.tilesInt || !this.image || ![0, 1].includes(this.scoreModeInt)) {
+        return false
+      }
+      return true
+    },
+    onNewGameClick() {
+      this.$emit('newGame', {
+        tiles: this.tilesInt,
+        image: this.image,
+        scoreMode: this.scoreModeInt,
+      })
+    },
+  },
+  computed: {
+    scoreModeInt () {
+      return parseInt(this.scoreMode, 10)
+    },
+    tilesInt () {
+      return parseInt(this.tiles, 10)
+    },
+  },
+}
diff --git a/public/views/Index.vue.js b/public/views/Index.vue.js
index ba73afb..3999d93 100644
--- a/public/views/Index.vue.js
+++ b/public/views/Index.vue.js
@@ -1,64 +1,28 @@
 "use strict"
 
-import GameCommon from './../../common/GameCommon.js'
 import Time from './../../common/Time.js'
-import Upload from './../components/Upload.vue.js'
 import GameTeaser from './../components/GameTeaser.vue.js'
-import ImageTeaser from './../components/ImageTeaser.vue.js'
+import NewGameDialog from './../components/NewGameDialog.vue.js'
 
 export default {
   components: {
-    Upload,
     GameTeaser,
-    ImageTeaser,
+    NewGameDialog,
   },
   template: `
 <div id="app">
+  <span class="btn" @click="showNewGameDialog = !showNewGameDialog">New game</span>
+  <new-game-dialog
+    v-if="showNewGameDialog"
+    :images="images"
+    @newGame="onNewGame"
+    />
+
   <h1>Running games</h1>
   <div class="game-teaser-wrap" v-for="g in gamesRunning">
     <game-teaser :game="g" />
   </div>
 
-  <h1>New game</h1>
-  <table>
-    <tr>
-      <td><label>Pieces: </label></td>
-      <td><input type="text" v-model="tiles" /></td>
-    </tr>
-    <tr>
-      <td><label>Scoring: </label></td>
-      <td>
-        <label><input type="radio" v-model="scoreMode" value="1" /> Any (Score when pieces are connected to each other or on final location)</label>
-        <br />
-        <label><input type="radio" v-model="scoreMode" value="0" /> Final (Score when pieces are put to their final location)</label>
-      </td>
-    </tr>
-    <tr>
-      <td><label>Image: </label></td>
-      <td>
-        <span v-if="image">
-          <img :src="image.url" style="width: 150px;" />
-          or
-          <upload @uploaded="mediaImgUploaded($event)" accept="image/*" label="Upload an image" />
-        </span>
-        <span v-else>
-          <upload @uploaded="mediaImgUploaded($event)" accept="image/*" label="Upload an image" />
-          (or select from below)
-        </span>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="2">
-        <button class="btn" :disabled="!canStartNewGame" :class="" @click="onNewGameClick">Start new game</button>
-      </td>
-    </tr>
-  </table>
-
-  <h1>Image lib</h1>
-  <div>
-    <image-teaser v-for="i in images" :image="i" @click="image = i" />
-  </div>
-
   <h1>Finished games</h1>
   <div class="game-teaser-wrap" v-for="g in gamesFinished">
     <game-teaser :game="g" />
@@ -66,9 +30,7 @@ export default {
 </div>`,
   data() {
     return {
-      tiles: 1000,
-      image: '',
-      scoreMode: GameCommon.SCORE_MODE_ANY,
+      showNewGameDialog: false,
 
       gamesRunning: [],
       gamesFinished: [],
@@ -82,20 +44,6 @@ export default {
     this.gamesFinished = json.gamesFinished
     this.images = json.images
   },
-  computed: {
-    scoreModeInt () {
-      return parseInt(this.scoreMode, 10)
-    },
-    tilesInt () {
-      return parseInt(this.tiles, 10)
-    },
-    canStartNewGame () {
-      if (!this.tilesInt || !this.image || ![0, 1].includes(this.scoreModeInt)) {
-        return false
-      }
-      return true
-    },
-  },
   methods: {
     time(start, end) {
       const icon = end ? '🏁' : '⏳'
@@ -104,21 +52,14 @@ export default {
       const timeDiffStr = Time.timeDiffStr(from, to)
       return `${icon} ${timeDiffStr}`
     },
-    mediaImgUploaded(j) {
-      this.image = j.image
-    },
-    async onNewGameClick() {
+    async onNewGame(gameSettings) {
       const res = await fetch('/newgame', {
         method: 'post',
         headers: {
           'Accept': 'application/json',
           'Content-Type': 'application/json'
         },
-        body: JSON.stringify({
-          tiles: this.tilesInt,
-          image: this.image,
-          scoreMode: this.scoreModeInt,
-        }),
+        body: JSON.stringify(gameSettings),
       })
       if (res.status === 200) {
         const game = await res.json()