diff --git a/src/components/paneSettings.vue b/src/components/paneSettings.vue
index 7a9bbfc5..f75a2fee 100644
--- a/src/components/paneSettings.vue
+++ b/src/components/paneSettings.vue
@@ -3,8 +3,8 @@
     
     <ul uk-accordion="multiple: true">
       <li>
-        <a class="uk-accordion-title" href="#">App settings</a>
-        <div class="uk-accordion-content"><appSettings/></div>
+        <a class="uk-accordion-title" href="#">Stream settings</a>
+        <div class="uk-accordion-content"><streamSettings/></div>
       </li>
 
       <li v-if="$store.getters.ready">
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import appSettings from './paneSettingsComponents/appSettings.vue'
+import streamSettings from './paneSettingsComponents/streamSettings.vue'
 import microscopeSettings from './paneSettingsComponents/microscopeSettings.vue'
 
 // Export main app
@@ -26,7 +26,7 @@ export default {
   name: 'paneSettings',
 
   components: {
-    appSettings,
+    streamSettings,
     microscopeSettings
   }
 
diff --git a/src/components/paneSettingsComponents/appSettings.vue b/src/components/paneSettingsComponents/appSettings.vue
deleted file mode 100644
index e6a3cf84..00000000
--- a/src/components/paneSettingsComponents/appSettings.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-<div id="appSettings">
-
-  <p><label><input v-model="disableStream" class="uk-checkbox" type="checkbox"> Disable stream</label></p>
-
-  <div class="uk-child-width-1-2" uk-grid>
-    <p><label v-bind:class="{'uk-disabled': !this.$store.getters.ready}"><input v-model="autoGpuPreview" class="uk-checkbox" type="checkbox"> GPU preview</label></p>
-    <p><label><input v-model="trackWindow" class="uk-checkbox" type="checkbox"> Track window</label></p>
-  </div>
-
-</div>
-</template>
-
-<script>
-
-// Export main app
-export default {
-  name: 'appSettings',
-
-  computed: {
-    disableStream: {
-      get() {
-        return this.$store.state.settings.disableStream;
-      },
-      set(value) {
-        this.$store.commit("changeSetting", ['disableStream', value]);
-      }
-    },
-    autoGpuPreview: {
-      get() {
-        return this.$store.state.settings.autoGpuPreview;
-      },
-      set(value) {
-        this.$store.commit("changeSetting", ['autoGpuPreview', value]);
-        this.$root.$emit('globalTogglePreview', value)
-      }
-    },
-    trackWindow: {
-      get() {
-        return this.$store.state.settings.trackWindow;
-      },
-      set(value) {
-        this.$store.commit("changeSetting", ['trackWindow', value]);
-        if (this.$store.state.settings.autoGpuPreview == true) {
-          this.$root.$emit('globalTogglePreview', true)
-        }
-      }
-    }
-  }
-
-}
-</script>
-
-<style lang="less">
-</style>
diff --git a/src/components/paneSettingsComponents/streamSettings.vue b/src/components/paneSettingsComponents/streamSettings.vue
new file mode 100644
index 00000000..36205037
--- /dev/null
+++ b/src/components/paneSettingsComponents/streamSettings.vue
@@ -0,0 +1,78 @@
+<template>
+<div id="appSettings">
+
+  <p><label><input v-model="localMode" class="uk-checkbox" type="checkbox"><b> Local mode</b></label></p>
+
+  <p><label v-bind:class="disableIfLocalMode"><input v-model="disableStream" class="uk-checkbox" type="checkbox"> Disable live stream</label></p>
+
+  <div class="uk-child-width-1-2" uk-grid>
+    <p><label v-bind:class="[{'uk-disabled': !this.$store.getters.ready}, disableIfLocalMode]"><input v-model="autoGpuPreview" class="uk-checkbox" type="checkbox"> GPU preview</label></p>
+    <p><label v-bind:class="[{'uk-disabled': !this.$store.getters.ready}, disableIfLocalMode]"><input v-model="trackWindow" class="uk-checkbox" type="checkbox"> Track window</label></p>
+  </div>
+
+</div>
+</template>
+
+<script>
+
+// Export main app
+export default {
+  name: 'appSettings',
+
+  data: function () {
+    return {
+			isLocalMode: false
+    }
+  },
+
+  computed: {
+    localMode: {
+      get() {
+        return this.isLocalMode
+      },
+      set(value) {
+        this.isLocalMode = value;
+        this.trackWindow = value;
+        this.disableStream = value;
+        this.autoGpuPreview = value;
+      }
+    },
+
+    disableStream: {
+      get() {
+        return this.$store.state.settings.disableStream;
+      },
+      set(value) {
+        this.$store.commit("changeSetting", ['disableStream', value]);
+      }
+    },
+
+    autoGpuPreview: {
+      get() {
+        return this.$store.state.settings.autoGpuPreview;
+      },
+      set(value) {
+        this.$store.commit("changeSetting", ['autoGpuPreview', value]);
+        this.$root.$emit('globalTogglePreview', value)
+      }
+    },
+
+    trackWindow: {
+      get() {
+        return this.$store.state.settings.trackWindow;
+      },
+      set(value) {
+        this.$store.commit("changeSetting", ['trackWindow', value]);
+      }
+    },
+    
+    disableIfLocalMode: function () {
+      return {'uk-disabled': this.localMode}
+    }
+  }
+
+}
+</script>
+
+<style lang="less">
+</style>