diff --git a/css/app.css b/css/app.css
index da88ed4b1..981353388 100644
--- a/css/app.css
+++ b/css/app.css
@@ -670,6 +670,7 @@ div.combobox {
     display: block;
     padding: 5px;
     width: 100%;
+    box-sizing: border-box;
     color: #999;
 }
 
diff --git a/presets/forms.json b/presets/forms.json
index 48981a22c..380111531 100644
--- a/presets/forms.json
+++ b/presets/forms.json
@@ -65,6 +65,14 @@
         "key": "oneway",
         "type": "check"
     },
+    "bridge": {
+        "key": "bridge",
+        "type": "check"
+    },
+    "tunnel": {
+        "key": "tunnel",
+        "type": "check"
+    },
     "access": {
         "key": "access",
         "type": "combo"
diff --git a/presets/presets.json b/presets/presets.json
index f969b0391..451c073cb 100644
--- a/presets/presets.json
+++ b/presets/presets.json
@@ -189,7 +189,7 @@
         }
     },
     "icon": "highway-motorway",
-    "form": ["oneway", "access", "maxspeed"]
+    "form": ["oneway", "bridge", "tunnel", "access", "maxspeed"]
 },
 {
     "title": "Residential road",
@@ -201,7 +201,7 @@
         }
     },
     "icon": "highway-residential",
-    "form": ["oneway", "access", "maxspeed"]
+    "form": ["oneway", "bridge", "tunnel", "access", "maxspeed"]
 },
 {
     "title": "Primary Road",
@@ -213,7 +213,7 @@
         }
     },
     "icon": "highway-primary",
-    "form": ["oneway", "access", "maxspeed"]
+    "form": ["oneway", "bridge", "tunnel", "access", "maxspeed"]
 },
 {
     "title": "Secondary Road",
@@ -225,7 +225,7 @@
         }
     },
     "icon": "highway-secondary",
-    "form": ["oneway", "access", "maxspeed"]
+    "form": ["oneway", "bridge", "tunnel", "access", "maxspeed"]
 },
 {
     "title": "Tertiary Road",
@@ -237,7 +237,7 @@
         }
     },
     "icon": "highway-tertiary",
-    "form": ["oneway", "access", "maxspeed"]
+    "form": ["oneway", "bridge", "tunnel", "access", "maxspeed"]
 },
 {
     "title": "Service Road",
@@ -249,7 +249,7 @@
         }
     },
     "icon": "highway-service",
-    "form": ["oneway", "access", "maxspeed"]
+    "form": ["oneway", "bridge", "tunnel", "access", "maxspeed"]
 },
 {
     "title": "Rail",
@@ -273,7 +273,7 @@
         }
     },
     "icon": "highway-trunk",
-    "form": ["oneway", "access", "maxspeed"]
+    "form": ["oneway", "bridge", "tunnel", "access", "maxspeed"]
 },
 {
     "title": "Foot path",
@@ -297,7 +297,7 @@
         }
     },
     "icon": "highway-cycleway",
-    "form": ["oneway", "access", "maxspeed"]
+    "form": ["oneway", "bridge", "tunnel", "access", "maxspeed"]
 },
 {
     "name": "sport pitch",