diff --git a/.vscode/launch.json b/.vscode/launch.json
index ecb900b..b2a747e 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -8,13 +8,13 @@
             "type": "factoriomod",
             "request": "launch",
             "name": "Factorio Mod Debug",
-            "modsPath": "~/.factorio/mods/",
+            "modsPath": "~/.factorio/mods-debug/",
             "manageMod": true,
             "adjustMods": {
                 "debugadapter": true,
                 "flib": true,
                 "cybersyn": true,
-                "creative-mod": true,
+                "EditorExtensions": true,
             },
             "disableExtraMods": true
         },
@@ -22,7 +22,7 @@
             "type": "factoriomod",
             "request": "launch",
             "name": "Factorio Mod Debug (Modded)",
-            "modsPath": "~/.factorio/mods/",
+            "modsPath": "~/.factorio/mods-debug/",
             "manageMod": true,
             "adjustMods": {
                 "debugadapter": true,
@@ -35,7 +35,7 @@
             "type": "factoriomod",
             "request": "launch",
             "name": "Factorio Mod Debug (Settings & Data)",
-            "modsPath": "~/.factorio/mods/",
+            "modsPath": "~/.factorio/mods-debug/",
             "hookSettings": true,
             "hookData": true,
             "adjustMods": {
@@ -49,7 +49,7 @@
             "type": "factoriomod",
             "request": "launch",
             "name": "Factorio Mod Debug (Profile)",
-            "modsPath": "~/.factorio/mods/",
+            "modsPath": "~/.factorio/mods-debug/",
             "hookMode": "profile",
             "adjustMods": {
                 "debugadapter": true,
diff --git a/cybersyn/info.json b/cybersyn/info.json
index e2d9bd8..e8a647e 100644
--- a/cybersyn/info.json
+++ b/cybersyn/info.json
@@ -1,6 +1,6 @@
 {
     "name": "cybersyn",
-    "version": "1.2.8",
+    "version": "1.2.9",
     "title": "Project Cybersyn",
     "author": "Mami",
     "factorio_version": "1.1",
diff --git a/cybersyn/scripts/gui.lua b/cybersyn/scripts/gui.lua
index c68aa46..5baadea 100644
--- a/cybersyn/scripts/gui.lua
+++ b/cybersyn/scripts/gui.lua
@@ -233,10 +233,7 @@ function gui_opened(comb, player)
 							{"cybersyn-gui.wagon-manifest"},
 						}},
 						{type="switch", name="is_pr_switch", allow_none_state=true, switch_state=switch_state, left_label_caption={"cybersyn-gui.switch-provide"}, right_label_caption={"cybersyn-gui.switch-request"}, left_label_tooltip={"cybersyn-gui.switch-provide-tooltip"}, right_label_tooltip={"cybersyn-gui.switch-request-tooltip"}, handler=handle_pr_switch, tags={id=comb.unit_number}},
-						{type="flow", name="enable_slot_barring", direction="horizontal", style_mods={vertical_align="center", left_padding=6}, children={
-							{type="checkbox", name="enable_slot_barring", state=setting(bits, SETTING_ENABLE_SLOT_BARRING), handler=handle_setting, tags={id=comb.unit_number, bit=SETTING_ENABLE_SLOT_BARRING}, tooltip={"cybersyn-gui.enable-slot-barring-tooltip"}},
-							{type="label", name="enable_slot_barring_label", style_mods={left_padding=3}, caption={"cybersyn-gui.enable-slot-barring-description"}},
-						}},
+						{type="checkbox", name="enable_slot_barring", state=setting(bits, SETTING_ENABLE_SLOT_BARRING), handler=handle_setting, tags={id=comb.unit_number, bit=SETTING_ENABLE_SLOT_BARRING}, tooltip={"cybersyn-gui.enable-slot-barring-tooltip"}, caption={"cybersyn-gui.enable-slot-barring-description"}},
 					}},
 					---choose-elem-button
 					{type="line", style_mods={top_padding=10}},
@@ -244,29 +241,14 @@ function gui_opened(comb, player)
 					{type="flow", name="bottom", direction="horizontal", style_mods={vertical_align="top"}, children={
 						{type="choose-elem-button", name="network", style="slot_button_in_shallow_frame", elem_type="signal", tooltip={"cybersyn-gui.network-tooltip"}, signal=signal, style_mods={bottom_margin=1, right_margin=6, top_margin=2}, handler=handle_network, tags={id=comb.unit_number}},
 						{type="flow", name="depot", direction="vertical", style_mods={horizontal_align="left"}, children={
-							{type="flow", name="use_any_depot", direction="horizontal", style_mods={vertical_align="center"}, children={
-								{type="checkbox", name="use_same_depot", state=setting_flip(bits, SETTING_USE_ANY_DEPOT), handler=handle_setting_flip, tags={id=comb.unit_number, bit=SETTING_USE_ANY_DEPOT}, tooltip={"cybersyn-gui.use-same-depot-tooltip"}},
-								{type="label", name="use_same_depot_label", style_mods={left_padding=3}, caption={"cybersyn-gui.use-same-depot-description"}},
-							}},
-							{type="flow", name="depot_bypass", direction="horizontal", style_mods={vertical_align="center"}, children={
-								{type="checkbox", name="depot_bypass", state=setting_flip(bits, SETTING_DISABLE_DEPOT_BYPASS), handler=handle_setting_flip, tags={id=comb.unit_number, bit=SETTING_DISABLE_DEPOT_BYPASS}, tooltip={"cybersyn-gui.depot-bypass-tooltip"}},
-								{type="label", name="depot_bypass_label", style_mods={left_padding=3}, caption={"cybersyn-gui.depot-bypass-description"}},
-							}},
+							{type="checkbox", name="use_same_depot", state=setting_flip(bits, SETTING_USE_ANY_DEPOT), handler=handle_setting_flip, tags={id=comb.unit_number, bit=SETTING_USE_ANY_DEPOT}, tooltip={"cybersyn-gui.use-same-depot-tooltip"}, caption={"cybersyn-gui.use-same-depot-description"}},
+							{type="checkbox", name="depot_bypass", state=setting_flip(bits, SETTING_DISABLE_DEPOT_BYPASS), handler=handle_setting_flip, tags={id=comb.unit_number, bit=SETTING_DISABLE_DEPOT_BYPASS}, tooltip={"cybersyn-gui.depot-bypass-tooltip"}, caption={"cybersyn-gui.depot-bypass-description"}},
 						}},
 						{type="flow", name="first", direction="vertical", style_mods={horizontal_align="left", right_margin=8}, children={
-							{type="flow", name="allow_list", direction="horizontal", style_mods={vertical_align="center"}, children={
-								{type="checkbox", name="allow_list", state=setting_flip(bits, SETTING_DISABLE_ALLOW_LIST), handler=handle_setting_flip, tags={id=comb.unit_number, bit=SETTING_DISABLE_ALLOW_LIST}, tooltip={"cybersyn-gui.allow-list-tooltip"}},
-								{type="label", name="allow_list_label", style_mods={left_padding=3}, caption={"cybersyn-gui.allow-list-description"}},
-							}},
-							{type="flow", name="is_stack", direction="horizontal", style_mods={vertical_align="center"}, children={
-								{type="checkbox", name="is_stack", state=setting(bits, SETTING_IS_STACK), handler=handle_setting, tags={id=comb.unit_number, bit=SETTING_IS_STACK}, tooltip={"cybersyn-gui.is-stack-tooltip"}},
-								{type="label", name="is_stack_label", style_mods={left_padding=3}, caption={"cybersyn-gui.is-stack-description"}},
-							}},
-						}},
-						{type="flow", name="enable_inactive", direction="horizontal", style_mods={vertical_align="center"}, children={
-							{type="checkbox", name="enable_inactive", state=setting(bits, SETTING_ENABLE_INACTIVE), handler=handle_setting, tags={id=comb.unit_number, bit=SETTING_ENABLE_INACTIVE}, tooltip={"cybersyn-gui.enable-inactive-tooltip"}},
-							{type="label", name="enable_inactive_label", style_mods={left_padding=3}, caption={"cybersyn-gui.enable-inactive-description"}},
+							{type="checkbox", name="allow_list", state=setting_flip(bits, SETTING_DISABLE_ALLOW_LIST), handler=handle_setting_flip, tags={id=comb.unit_number, bit=SETTING_DISABLE_ALLOW_LIST}, tooltip={"cybersyn-gui.allow-list-tooltip"}, caption={"cybersyn-gui.allow-list-description"}},
+							{type="checkbox", name="is_stack", state=setting(bits, SETTING_IS_STACK), handler=handle_setting, tags={id=comb.unit_number, bit=SETTING_IS_STACK}, tooltip={"cybersyn-gui.is-stack-tooltip"}, caption={"cybersyn-gui.is-stack-description"}},
 						}},
+						{type="checkbox", name="enable_inactive", state=setting(bits, SETTING_ENABLE_INACTIVE), handler=handle_setting, tags={id=comb.unit_number, bit=SETTING_ENABLE_INACTIVE}, tooltip={"cybersyn-gui.enable-inactive-tooltip"}, caption={"cybersyn-gui.enable-inactive-description"}},
 					}}
 				}}
 			}}