diff --git a/RobotApp.Client/Pages/Order/EdgesPanel.razor b/RobotApp.Client/Pages/Order/EdgesPanel.razor
index 5cc40ae..711fa93 100644
--- a/RobotApp.Client/Pages/Order/EdgesPanel.razor
+++ b/RobotApp.Client/Pages/Order/EdgesPanel.razor
@@ -20,7 +20,7 @@
                     <TitleContent>
                         <div class="d-flex align-center justify-space-between w-100">
 
-                            <!-- LEFT: Edge info -->
+                            <!-- LEFT: Edge information -->
                             <div class="d-flex align-center gap-3">
                                 <MudText Typo="Typo.subtitle1" Class="fw-bold">
                                     @edge.EdgeId
@@ -65,7 +65,9 @@
                                            Required="true">
                                     @foreach (var n in Order.Nodes)
                                     {
-                                        <MudSelectItem Value="@n.NodeId">@n.NodeId</MudSelectItem>
+                                        <MudSelectItem Value="@n.NodeId">
+                                            @n.NodeId
+                                        </MudSelectItem>
                                     }
                                 </MudSelect>
                             </MudItem>
@@ -95,7 +97,7 @@
                                                  Immediate="true"
                                                  Min="0"
                                                  Step="0.1"
-                                                 Label="Bán kính (0 = đường thẳng)" />
+                                                 Label="Radius (0 = straight line)" />
                             </MudItem>
 
                             <!-- Quadrant -->
@@ -105,7 +107,7 @@
                                     <MudSelect T="Quadrant"
                                                Value="@edge.Quadrant"
                                                ValueChanged="@((Quadrant v) => SetValue(() => edge.Quadrant = v))"
-                                               Label="Góc phần tư">
+                                               Label="Quadrant">
                                         <MudSelectItem Value="Quadrant.I">I</MudSelectItem>
                                         <MudSelectItem Value="Quadrant.II">II</MudSelectItem>
                                         <MudSelectItem Value="Quadrant.III">III</MudSelectItem>
@@ -122,7 +124,7 @@
                                                Variant="Variant.Outlined"
                                                StartIcon="@Icons.Material.Filled.Merge"
                                                OnClick="@(() => ApplyCurveAsync(edge))">
-                                        Apply Curve (tạo node)
+                                        Apply Curve
                                     </MudButton>
                                 </MudItem>
                             }
diff --git a/RobotApp.Client/Services/UiEdge.cs b/RobotApp.Client/Services/UiEdge.cs
index ce083ca..3c92d67 100644
--- a/RobotApp.Client/Services/UiEdge.cs
+++ b/RobotApp.Client/Services/UiEdge.cs
@@ -127,7 +127,7 @@ public class OrderMessage
 
         return new Node
         {
-            NodeId = $"NODE_C_{Guid.NewGuid():N}".Substring(0, 12),
+            NodeId = $"NODE_C{Guid.NewGuid():N}".Substring(0, 12),
             Released = true,
             NodePosition = new NodePosition
             {