diff --git a/src/kiri/init.js b/src/kiri/init.js
index 51f77b80..577d75f1 100644
--- a/src/kiri/init.js
+++ b/src/kiri/init.js
@@ -1355,7 +1355,12 @@
                 UI.extNext = UC.newButton(undefined, undefined, {icon:'<i class="fas fa-greater-than"></i>'})
             ], {modes:FDM, expert:true, class:"ext-buttons"}),
 
-            gcode:            UC.newGroup(LANG.dv_gr_gco, $('device'), {group:"dgco", inline:true, modes:GCODE}),
+            gcode:            UC.newGroup(LANG.dv_gr_out, $('device'), {group:"dgco", inline:true, modes:CAM_LASER}),
+            gcodeSpace:       UC.newBoolean(LANG.dv_tksp_s, onBooleanClick, {title:LANG.dv_tksp_l, modes:CAM_LASER}),
+            gcodeStrip:       UC.newBoolean(LANG.dv_strc_s, onBooleanClick, {title:LANG.dv_strc_l, modes:CAM}),
+            gcodeFExt:        UC.newInput(LANG.dv_fext_s, {title:LANG.dv_fext_l, modes:CAM_LASER, size:7, text:true}),
+
+            gcodeEd:          UC.newGroup(LANG.dv_gr_gco, $('dg'), {group:"dgcp", inline:true, modes:GCODE}),
             gcodeFanTrack: UC.newRow([
                 (UI.gcodeFan = UC.newGCode(LANG.dv_fanp_s, {title:LANG.dv_fanp_l, modes:FDM, area:gcode})).button,
                 (UI.gcodeTrack = UC.newGCode(LANG.dv_prog_s, {title:LANG.dv_prog_l, modes:FDM, area:gcode})).button
@@ -1364,9 +1369,6 @@
                 (UI.gcodeLayer = UC.newGCode(LANG.dv_layr_s, {title:LANG.dv_layr_l, modes:FDM, area:gcode})).button,
                 (UI.gcodePause = UC.newGCode(LANG.dv_paus_s, {title:LANG.dv_paus_l, modes:FDM, area:gcode})).button
             ], {modes:FDM, class:"ext-buttons f-row"}),
-            gcodeSpace:       UC.newBoolean(LANG.dv_tksp_s, onBooleanClick, {title:LANG.dv_tksp_l, modes:CAM_LASER}),
-            gcodeStrip:       UC.newBoolean(LANG.dv_strc_s, onBooleanClick, {title:LANG.dv_strc_l, modes:CAM}),
-            gcodeFExt:        UC.newInput(LANG.dv_fext_s, {title:LANG.dv_fext_l, modes:CAM_LASER, size:7, text:true}),
             gcodeLaserOnOff: UC.newRow([
                 (UI.gcodeLaserOn = UC.newGCode(LANG.dv_lzon_s, {title:LANG.dv_lzon_l, modes:LASER, area:gcode})).button,
                 (UI.gcodeLaserOff = UC.newGCode(LANG.dv_lzof_s, {title:LANG.dv_lzof_l, modes:LASER, area:gcode})).button,
diff --git a/web/kiri/index.css b/web/kiri/index.css
index 41190289..e5e3fb3a 100644
--- a/web/kiri/index.css
+++ b/web/kiri/index.css
@@ -561,6 +561,9 @@ th, tr, td, label {
     bottom: -20px;
     right: 5px;
 }
+#mod-setup {
+    height: 500px;
+}
 #mod-print {
     background-color: rgba(255,255,255,0.85);
 }
diff --git a/web/kiri/index.html b/web/kiri/index.html
index 1e35d315..ddede3e9 100644
--- a/web/kiri/index.html
+++ b/web/kiri/index.html
@@ -245,14 +245,15 @@
                         <button id="mode-cam" class="dev-type"><label>CNC</label></button>
                         <button id="mode-laser" class="dev-type"><label>LASER</label></button>
                     </div>
-                    <div class="f-row mh0">
+                    <div class="f-row mh0 grow">
                         <div id="devices" class="t-33 f-col"><select id="device-list" size="15" class="grow"></select></div>
                         <div class="t-pad"></div>
                         <div id="device" class="f-col t-body t-inset overy"></div>
                         <div class="t-pad"></div>
                         <div id="gcode-edit" class="t-body t-inset f-col">
-                            <div class="set-header f-col">gcode editor</div>
-                            <div id="dev-gcode" class="grow"></div>
+                            <div id="dg" class="f-col t-body t-inset"></div>
+                            <hr width="80%">
+                            <div id="dev-gcode" class="grow overy"></div>
                         </div>
                     </div>
                     <div id="device-action" class="f-row">
diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js
index 2cfee627..f5ae04f7 100644
--- a/web/kiri/lang/en.js
+++ b/web/kiri/lang/en.js
@@ -10,6 +10,7 @@ kiri.lang['en-us'] = {
     // DEVICE dialog groups
     dv_gr_dev:      "device",
     dv_gr_ext:      "extruder",
+    dv_gr_out:      "output",
     dv_gr_gco:      "gcode",
 
     // DEVICE dialog (_s = label, _l = hover help)