diff --git a/data/fields/layer_1.json b/data/fields/layer_1.json
new file mode 100644
index 00000000..c88b810f
--- /dev/null
+++ b/data/fields/layer_1.json
@@ -0,0 +1,7 @@
+{
+    "key": "layer",
+    "type": "number",
+    "label": "{layer}",
+    "placeholder": "0",
+    "default": "1"
+}
diff --git a/data/presets/building/roof.json b/data/presets/building/roof.json
index 943e8046..75a94a11 100644
--- a/data/presets/building/roof.json
+++ b/data/presets/building/roof.json
@@ -1,8 +1,23 @@
 {
     "icon": "maki-shelter",
     "fields": [
-        "{building}",
-        "layer"
+        "building",
+        "height",
+        "layer_1"
+    ],
+    "moreFields": [
+        "address",
+        "architect",
+        "building/colour",
+        "building/levels",
+        "building/levels/underground",
+        "building/material",
+        "building/prefabricated",
+        "ele",
+        "gnis/feature_id-US",
+        "not/name",
+        "operator",
+        "roof/colour"
     ],
     "geometry": [
         "area"
@@ -10,10 +25,6 @@
     "tags": {
         "building": "roof"
     },
-    "addTags": {
-        "building": "roof",
-        "layer": "1"
-    },
     "matchScore": 0.5,
     "name": "Roof"
 }
diff --git a/data/presets/power/generator/method/photovoltaic/building/roof.json b/data/presets/power/generator/method/photovoltaic/building/roof.json
index 679c9e76..6634a774 100644
--- a/data/presets/power/generator/method/photovoltaic/building/roof.json
+++ b/data/presets/power/generator/method/photovoltaic/building/roof.json
@@ -1,7 +1,8 @@
 {
     "icon": "fas-solar-panel",
     "fields": [
-        "{power/generator/method/photovoltaic}"
+        "{power/generator/method/photovoltaic}",
+        "layer_1"
     ],
     "moreFields": [
         "{power/generator}"
@@ -22,8 +23,7 @@
         "generator:method": "photovoltaic",
         "generator:type": "solar_photovoltaic_panel",
         "generator:output:electricity": "*",
-        "building": "roof",
-        "layer": "1"
+        "building": "roof"
     },
     "reference": {
         "key": "generator:method",