diff --git a/src/App.vue b/src/App.vue
index c4b9c2b..5725006 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,39 +4,8 @@
     <main>
       <router-view />
     </main>
-    <modal name="download" adaptive>
-      Not implemented.
-    </modal>
-    <modal name="information" adaptive>
-      <ul class="info-list">
-        <li>
-          <GithubIcon size="1x" />
-          <a href="https://github.com/owntracks/frontend">
-            owntracks/frontend
-          </a>
-          ({{ frontendVersion }})
-        </li>
-        <li>
-          <GithubIcon size="1x" />
-          <a href="https://github.com/owntracks/recorder">
-            owntracks/recorder
-          </a>
-          ({{ recorderVersion }})
-        </li>
-        <li>
-          <BookIcon size="1x" />
-          <a href="https://owntracks.org/booklet/">
-            OwnTracks Documentation
-          </a>
-        </li>
-        <li>
-          <TwitterIcon size="1x" />
-          <a href="https://twitter.com/OwnTracks">
-            OwnTracks on Twitter
-          </a>
-        </li>
-      </ul>
-    </modal>
+    <DownloadModal />
+    <InformationModal />
   </div>
 </template>
 
@@ -45,15 +14,16 @@
 </style>
 
 <script>
-import { mapActions, mapState } from "vuex";
-import { BookIcon, GithubIcon, TwitterIcon } from "vue-feather-icons";
+import { mapActions } from "vuex";
 
 import config from "@/config";
 import * as types from "@/store/mutation-types";
 import AppHeader from "@/components/AppHeader";
+import DownloadModal from "@/components/modals/Download";
+import InformationModal from "@/components/modals/Information";
 
 export default {
-  components: { BookIcon, GithubIcon, TwitterIcon, AppHeader },
+  components: { AppHeader, DownloadModal, InformationModal },
   created() {
     document.documentElement.style.setProperty(
       "--color-primary",
@@ -77,9 +47,6 @@ export default {
     // Initially update URL query params from state
     this.updateUrlQuery();
   },
-  computed: {
-    ...mapState(["frontendVersion", "recorderVersion"]),
-  },
   methods: {
     ...mapActions(["populateStateFromQuery", "loadData"]),
     /**
diff --git a/src/components/modals/Download.vue b/src/components/modals/Download.vue
new file mode 100644
index 0000000..fec6f0a
--- /dev/null
+++ b/src/components/modals/Download.vue
@@ -0,0 +1,5 @@
+<template>
+  <modal name="download" adaptive>
+    Not implemented.
+  </modal>
+</template>
diff --git a/src/components/modals/Information.vue b/src/components/modals/Information.vue
new file mode 100644
index 0000000..c2ca487
--- /dev/null
+++ b/src/components/modals/Information.vue
@@ -0,0 +1,44 @@
+<template>
+  <modal name="information" adaptive>
+    <ul class="info-list">
+      <li>
+        <GithubIcon size="1x" />
+        <a href="https://github.com/owntracks/frontend">
+          owntracks/frontend
+        </a>
+        ({{ frontendVersion }})
+      </li>
+      <li>
+        <GithubIcon size="1x" />
+        <a href="https://github.com/owntracks/recorder">
+          owntracks/recorder
+        </a>
+        ({{ recorderVersion }})
+      </li>
+      <li>
+        <BookIcon size="1x" />
+        <a href="https://owntracks.org/booklet/">
+          OwnTracks Documentation
+        </a>
+      </li>
+      <li>
+        <TwitterIcon size="1x" />
+        <a href="https://twitter.com/OwnTracks">
+          OwnTracks on Twitter
+        </a>
+      </li>
+    </ul>
+  </modal>
+</template>
+
+<script>
+import { mapState } from "vuex";
+import { BookIcon, GithubIcon, TwitterIcon } from "vue-feather-icons";
+
+export default {
+  components: { BookIcon, GithubIcon, TwitterIcon },
+  computed: {
+    ...mapState(["frontendVersion", "recorderVersion"]),
+  },
+};
+</script>