diff --git a/src/TF2HUD.Editor/App.xaml b/src/TF2HUD.Editor/App.xaml
index a8c4296c..30cc9ca2 100644
--- a/src/TF2HUD.Editor/App.xaml
+++ b/src/TF2HUD.Editor/App.xaml
@@ -82,7 +82,7 @@
             <Setter Property="FormatString" Value="N0" />
             <Setter Property="Increment" Value="1" />
             <Setter Property="Width" Value="125" />
-            <Setter Property="AllowTextInput" Value="False" />
+            <Setter Property="AllowTextInput" Value="True" />
         </Style>
 
         <Style x:Key="CrosshairLabel" TargetType="Label">
diff --git a/src/TF2HUD.Editor/JSON/budhud.json b/src/TF2HUD.Editor/JSON/budhud.json
index 0b8a852a..649b27cd 100644
--- a/src/TF2HUD.Editor/JSON/budhud.json
+++ b/src/TF2HUD.Editor/JSON/budhud.json
@@ -14,7 +14,7 @@
     "0 1 2 3",
     "0 1 2 3",
     "4 5 6 6",
-    "4 7 7 7"
+    "7 7 8 8"
   ],
   "Links": {
     "GitHub": "https://github.com/rbjaxter/budhud",
@@ -128,6 +128,13 @@
         "Type": "Checkbox",
         "Value": "false",
         "FileName": "bh_game_hidecontracker.res"
+      },
+      {
+        "Name": "bh_speedometer",
+        "Label": "Speedometer",
+        "Type": "Checkbox",
+        "Value": "false",
+        "FileName": "bh_speedometer.res"
       }
     ],
     "Health and Ammo": [
@@ -367,28 +374,61 @@
         }
       }
     ],
-    "Crosshair (Hypnotize's Unified Crosshair Pack)": [
+    "Engineer Customizations": [
       {
-        "Name": "bh_toggle_xhair_enable",
-        "Label": "Toggle Crosshair",
+        "Name": "bh_building_display_h",
+        "Label": "Building Display\nHorizontal Pos.",
+        "Type": "IntegerUpDown",
+        "Value": "0",
+        "Minimum": "0",
+        "Maximum": "1000",
+        "Increment": "1",
+        "Width": 140,
+        "ToolTip": "Increase the number to move the display to the right.",
+        "Files": {
+          "_budhud/scripts/hudlayout.res": {
+            "bh_BuildPin": {
+              "xpos": "$value"
+            }
+          }
+        }
+      },
+      {
+        "Name": "bh_building_display_v",
+        "Label": "Building Display\nVertical Pos.",
+        "Type": "IntegerUpDown",
+        "Value": "105",
+        "Minimum": "0",
+        "Maximum": "1000",
+        "Increment": "1",
+        "Width": 140,
+        "ToolTip": "Increase the number to move the display down.",
+        "Files": {
+          "_budhud/scripts/hudlayout.res": {
+            "bh_BuildPin": {
+              "ypos": "$value"
+            }
+          }
+        }
+      },
+      {
+        "Name": "bh_metal_position",
+        "Label": "Metal Count Under XHair",
         "Type": "Checkbox",
-        "ToolTip": "Toggle crosshair feature.",
         "Value": "false",
         "Files": {
-          "#customization/_enabled/bh_crosshairs.res": {
-            "hud_crosshair_1": {
-              "visible": {
-                "true": "1",
-                "false": "0"
-              },
-              "enabled": {
-                "true": "1",
-                "false": "0"
+          "_budhud/scripts/hudlayout.res": {
+            "CHudAccountPanel": {
+              "ypos": {
+                "true": "c-3",
+                "false": "c110"
               }
             }
           }
         }
-      },
+      }
+    ],
+    "Crosshair (Hypnotize's Unified Crosshair Pack)": [
       {
         "Name": "bh_val_xhair_style",
         "Label": "Style",
@@ -451,6 +491,27 @@
             }
           }
         }
+      },
+      {
+        "Name": "bh_toggle_xhair_enable",
+        "Label": "Show Crosshair",
+        "Type": "Checkbox",
+        "ToolTip": "Toggle crosshair feature.",
+        "Value": "false",
+        "Files": {
+          "#customization/_enabled/bh_crosshairs.res": {
+            "hud_crosshair_1": {
+              "visible": {
+                "true": "1",
+                "false": "0"
+              },
+              "enabled": {
+                "true": "1",
+                "false": "0"
+              }
+            }
+          }
+        }
       }
     ]
   }