diff --git a/src/components/SwisstopoInfo.vue b/src/components/SwisstopoInfo.vue
index d1ddb13..662c303 100644
--- a/src/components/SwisstopoInfo.vue
+++ b/src/components/SwisstopoInfo.vue
@@ -1,15 +1,15 @@
 <template>
-  <b-modal :active.sync="active" :on-cancel="cancelInfo">
+  <b-modal :active.sync="active" :on-cancel="cancelInfo" :can-cancel="false">
     <div class="box content">
       <div class="has-text-centered">
         <span class="fp ch flag"></span>
       </div>
       <h3>swisstopo-Karte jetzt verfügbar</h3>
       <p>Auf SOTLAS kann man nun auch die moderne swisstopo Vektor-Karte nutzen. Einfach den Kartentyp umstellen, fertig!</p>
-      <div class="has-text-centered">
+      <div class="has-text-centered is-hidden-mobile">
         <img class="swisstopo-info" src="../assets/swisstopo-info.png" />
       </div>
-      <div class="is-hidden-mobile">
+      <div>
         <h5>Weitere Funktionen:</h5>
         <ul>
           <li>Skitourenrouten</li>
@@ -18,8 +18,13 @@
           <li>Wildschutzgebiete</li>
         </ul>
       </div>
-      <div class="has-text-centered">
-        <b-button type="is-info" size="is-medium" @click="cancelInfo">OK, cool!</b-button>
+      <div class="action-buttons">
+        <div class="has-text-centered">
+          <b-button type="is-info" size="is-medium" @click="switchMap">Jetzt umstellen</b-button>
+        </div>
+        <div class="has-text-centered">
+          <b-button size="is-medium" @click="cancelInfo">OK, cool!</b-button>
+        </div>
       </div>
     </div>
   </b-modal>
@@ -45,6 +50,10 @@ export default {
     cancelInfo () {
       this.active = false
       localStorage.setItem('swisstopoInfoShown', true)
+    },
+    switchMap () {
+      this.cancelInfo()
+      this.$store.commit('setMapType', 'swisstopo')
     }
   },
   data () {
@@ -61,10 +70,14 @@ export default {
   max-height: calc(100vh - 80px);
 }
 .button {
-  margin-top: 1rem;
-  min-width: 20rem;
+  margin: 0.4rem 0.5rem 0.4rem 0.5rem;
+  width: 100%;
+  max-width: 20rem;
   text-align: center;
 }
+.action-buttons {
+  margin-top: 0.75rem;
+}
 .flag {
   font-size: 3rem;
 }
diff --git a/src/mixins/mapstyle.js b/src/mixins/mapstyle.js
index 397950a..01c15e9 100644
--- a/src/mixins/mapstyle.js
+++ b/src/mixins/mapstyle.js
@@ -29,7 +29,7 @@ export default {
         return null
       }
 
-      let style = require('../assets/' + this.$store.state.mapType + '.json')
+      let style = require('../assets/' + this.mapType + '.json')
       style = JSON.parse(JSON.stringify(style))
 
       // Show/hide layers according to map options for initial render to save time
@@ -52,7 +52,7 @@ export default {
       style.glyphs = style.glyphs.replace('{mapServer}', this.mapServer)
 
       // Patch units
-      if (this.$store.state.altitudeUnits === 'ft' && this.$store.state.mapType === 'openmaptiles') {
+      if (this.$store.state.altitudeUnits === 'ft' && this.mapType === 'openmaptiles') {
         style.layers.forEach(layer => {
           if (layer.id === 'contour_label') {
             layer.layout['text-field'] = ['to-string', ['round', ['*', ['get', 'height'], 3.28084]]]
@@ -65,6 +65,13 @@ export default {
       }
 
       return style
+    },
+    mapType () {
+      let mapType = this.$store.state.mapType
+      if (!this.mapTypes[mapType]) {
+        mapType = 'openmaptiles'
+      }
+      return mapType
     }
   },
   methods: {
diff --git a/src/store.js b/src/store.js
index 3c01828..6a9b47b 100644
--- a/src/store.js
+++ b/src/store.js
@@ -21,7 +21,7 @@ if (altitudeUnits !== 'ft' && altitudeUnits !== 'm') {
 }
 
 let mapType = localStorage.getItem('mapType')
-if (mapType !== 'openmaptiles' && mapType !== 'swisstopo' && mapType !== 'swisstopo_raster') {
+if (!mapType) {
   mapType = 'openmaptiles'
 }