diff --git a/OpenNest/Controls/ProgramEditorControl.Designer.cs b/OpenNest/Controls/ProgramEditorControl.Designer.cs
index 9ae6d95..2ca3e05 100644
--- a/OpenNest/Controls/ProgramEditorControl.Designer.cs
+++ b/OpenNest/Controls/ProgramEditorControl.Designer.cs
@@ -30,7 +30,6 @@ namespace OpenNest.Controls
             editorPanel = new System.Windows.Forms.Panel();
             gcodeEditor = new System.Windows.Forms.TextBox();
             editorToolbar = new System.Windows.Forms.Panel();
-            applyButton = new System.Windows.Forms.Button();
             lblGcode = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)mainSplit).BeginInit();
             mainSplit.Panel1.SuspendLayout();
@@ -189,6 +188,7 @@ namespace OpenNest.Controls
             gcodeEditor.Multiline = true;
             gcodeEditor.Name = "gcodeEditor";
             gcodeEditor.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            gcodeEditor.ReadOnly = true;
             gcodeEditor.Size = new System.Drawing.Size(260, 470);
             gcodeEditor.TabIndex = 1;
             gcodeEditor.WordWrap = false;
@@ -196,7 +196,6 @@ namespace OpenNest.Controls
             // editorToolbar
             // 
             editorToolbar.BackColor = System.Drawing.Color.FromArgb(245, 245, 245);
-            editorToolbar.Controls.Add(applyButton);
             editorToolbar.Controls.Add(lblGcode);
             editorToolbar.Dock = System.Windows.Forms.DockStyle.Top;
             editorToolbar.Location = new System.Drawing.Point(0, 0);
@@ -204,18 +203,7 @@ namespace OpenNest.Controls
             editorToolbar.Padding = new System.Windows.Forms.Padding(6, 4, 6, 4);
             editorToolbar.Size = new System.Drawing.Size(260, 30);
             editorToolbar.TabIndex = 0;
-            // 
-            // applyButton
-            // 
-            applyButton.Dock = System.Windows.Forms.DockStyle.Right;
-            applyButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            applyButton.Font = new System.Drawing.Font("Segoe UI", 9F);
-            applyButton.Location = new System.Drawing.Point(184, 4);
-            applyButton.Name = "applyButton";
-            applyButton.Size = new System.Drawing.Size(70, 22);
-            applyButton.TabIndex = 1;
-            applyButton.Text = "Apply";
-            // 
+            //
             // lblGcode
             // 
             lblGcode.AutoSize = true;
@@ -263,7 +251,6 @@ namespace OpenNest.Controls
         private System.Windows.Forms.Panel editorPanel;
         private System.Windows.Forms.Panel editorToolbar;
         private System.Windows.Forms.Label lblGcode;
-        private System.Windows.Forms.Button applyButton;
         private System.Windows.Forms.TextBox gcodeEditor;
         private System.Windows.Forms.ContextMenuStrip contourMenu;
         private System.Windows.Forms.ToolStripMenuItem menuReverse;
diff --git a/OpenNest/Controls/ProgramEditorControl.cs b/OpenNest/Controls/ProgramEditorControl.cs
index 191597f..d6d037f 100644
--- a/OpenNest/Controls/ProgramEditorControl.cs
+++ b/OpenNest/Controls/ProgramEditorControl.cs
@@ -1,7 +1,6 @@
 using OpenNest.CNC;
 using OpenNest.Converters;
 using OpenNest.Geometry;
-using OpenNest.IO;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -29,7 +28,6 @@ namespace OpenNest.Controls
             menuMoveDown.Click += OnMoveDownClicked;
             menuSequence.Click += OnSequenceClicked;
             contourMenu.Opening += OnContourMenuOpening;
-            applyButton.Click += OnApplyClicked;
             preview.PaintOverlay = OnPreviewPaintOverlay;
         }
 
@@ -92,34 +90,47 @@ namespace OpenNest.Controls
 
         private void UpdateGcodeText()
         {
-            gcodeEditor.Text = Program != null ? FormatProgram(Program) : string.Empty;
+            gcodeEditor.Text = Program != null ? FormatProgram(Program, contours) : string.Empty;
         }
 
-        private static string FormatProgram(Program pgm)
+        private static string FormatProgram(Program pgm, List<ContourInfo> contours)
         {
             var sb = new System.Text.StringBuilder();
             sb.AppendLine(pgm.Mode == Mode.Absolute ? "G90" : "G91");
 
-            var lastWasRapid = false;
-            foreach (var code in pgm.Codes)
+            var codeIndex = 0;
+            var codes = pgm.Codes;
+
+            foreach (var contour in contours)
             {
-                if (code is RapidMove rapid)
+                var sub = ConvertGeometry.ToProgram(contour.Shape);
+                if (sub == null) continue;
+
+                sb.AppendLine();
+                sb.AppendLine($"; {contour.Label} ({contour.DirectionLabel})");
+
+                var lastWasRapid = false;
+                for (var i = 0; i < sub.Length && codeIndex < codes.Count; i++, codeIndex++)
                 {
-                    if (!lastWasRapid && sb.Length > 0)
-                        sb.AppendLine();
-                    sb.AppendLine($"G00 X{FormatCoord(rapid.EndPoint.X)} Y{FormatCoord(rapid.EndPoint.Y)}");
-                    lastWasRapid = true;
-                }
-                else if (code is ArcMove arc)
-                {
-                    var g = arc.Rotation == RotationType.CW ? "G02" : "G03";
-                    sb.AppendLine($"{g} X{FormatCoord(arc.EndPoint.X)} Y{FormatCoord(arc.EndPoint.Y)} I{FormatCoord(arc.CenterPoint.X)} J{FormatCoord(arc.CenterPoint.Y)}");
-                    lastWasRapid = false;
-                }
-                else if (code is LinearMove linear)
-                {
-                    sb.AppendLine($"G01 X{FormatCoord(linear.EndPoint.X)} Y{FormatCoord(linear.EndPoint.Y)}");
-                    lastWasRapid = false;
+                    var code = codes[codeIndex];
+                    if (code is RapidMove rapid)
+                    {
+                        if (!lastWasRapid)
+                            sb.AppendLine();
+                        sb.AppendLine($"G00 X{FormatCoord(rapid.EndPoint.X)} Y{FormatCoord(rapid.EndPoint.Y)}");
+                        lastWasRapid = true;
+                    }
+                    else if (code is ArcMove arc)
+                    {
+                        var g = arc.Rotation == RotationType.CW ? "G02" : "G03";
+                        sb.AppendLine($"{g} X{FormatCoord(arc.EndPoint.X)} Y{FormatCoord(arc.EndPoint.Y)} I{FormatCoord(arc.CenterPoint.X)} J{FormatCoord(arc.CenterPoint.Y)}");
+                        lastWasRapid = false;
+                    }
+                    else if (code is LinearMove linear)
+                    {
+                        sb.AppendLine($"G01 X{FormatCoord(linear.EndPoint.X)} Y{FormatCoord(linear.EndPoint.Y)}");
+                        lastWasRapid = false;
+                    }
                 }
             }
 
@@ -418,50 +429,5 @@ namespace OpenNest.Controls
             }
         }
 
-        private void OnApplyClicked(object sender, EventArgs e)
-        {
-            var text = gcodeEditor.Text;
-            if (string.IsNullOrWhiteSpace(text))
-            {
-                MessageBox.Show("G-code is empty.", "Apply", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                return;
-            }
-
-            try
-            {
-                using var stream = new System.IO.MemoryStream(System.Text.Encoding.UTF8.GetBytes(text));
-                var reader = new ProgramReader(stream);
-                var parsed = reader.Read();
-
-                if (parsed == null || parsed.Length == 0)
-                {
-                    MessageBox.Show("No valid G-code found.", "Apply", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                    return;
-                }
-
-                // Rebuild shapes from the parsed program
-                var entities = ConvertProgram.ToGeometry(parsed);
-                var shapes = ShapeBuilder.GetShapes(entities);
-
-                if (shapes.Count == 0)
-                {
-                    MessageBox.Show("No contours found in parsed G-code.", "Apply", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                    return;
-                }
-
-                contours = ContourInfo.Classify(shapes);
-                Program = parsed;
-                isDirty = true;
-
-                PopulateContourList();
-                RefreshPreview();
-                ProgramChanged?.Invoke(this, EventArgs.Empty);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show($"Error parsing G-code: {ex.Message}", "Apply",
-                    MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
     }
 }