diff --git a/Heizung_x_Stufig/form.json b/Heizung_x_Stufig/form.json
index 0d6157c..1a1c317 100644
--- a/Heizung_x_Stufig/form.json
+++ b/Heizung_x_Stufig/form.json
@@ -1,121 +1,73 @@
 {
     "elements": [
         {
-            "type": "Label",
-            "caption": "Konfiguration der nötigen Schaltkontakte und Nennleistungen"
-        },
-        {
-            "type":"Select",
-            "name":"Boilertemperatur_glätten",
-            "caption":"Boilertemperatur glätten",
-            "options":[
-               {
-                  "caption":"Ja",
-                  "value":true
-               },
-               {
-                  "caption":"Nein",
-                  "value":false
-               }
-            ]
-         },
-         {
-            "type": "NumberSpinner",
-            "name": "ZeitKonstante",
-            "caption": "Zeit Konstante",
-            "suffix": ""
-        },        
-        {
-            "type": "NumberSpinner",
-            "name": "Interval",
-            "caption": "Intervall Neuberechnung der Werte Erst für spätere Versionen, aktuell auf 5 lassen!",
-            "suffix": "Sekunden"
-        },
-        {
-            "type": "NumberSpinner",
-            "name": "IdleCounterMax",
-            "caption": "Zyklen zwischen zwei Leistungsänderungen (Multipliziert sich mit Interval)",
-            "suffix": ""
-        },
-        {
-            "type":"List",
-            "name":"LeistungsStufen",
-            "caption":"Anzahl Stufen mit den dazugehörigen Leistungen",
-            "add":true,
-            "delete":true,
-            "columns":[
+            "type": "ExpansionPanel",
+            "caption": "Heizung Einstellungen",
+            "items": [
                 {
-                    "caption":"Stufe(n)",
-                    "name":"Stufe",
-                    "width":"200px",
-                    "add":"Stufe",
-                    "edit":{
-                    "type":"NumberSpinner"
-                    }
+                    "name": "LeistungsStufen",
+                    "type": "List",
+                    "caption": "Leistungsstufen",
+                    "rowCount": 5,
+                    "add": true,
+                    "delete": true,
+                    "sort": {
+                        "column": "Leistung",
+                        "direction": "ascending"
+                    },
+                    "columns": [
+                        {
+                            "label": "Leistung (W)",
+                            "name": "Leistung",
+                            "width": "150px",
+                            "add": 0,
+                            "edit": {
+                                "type": "NumberSpinner"
+                            }
+                        },
+                        {
+                            "label": "Schaltkontakt",
+                            "name": "Schaltkontakt_Stufe",
+                            "width": "250px",
+                            "add": 0,
+                            "edit": {
+                                "type": "SelectVariable"
+                            }
+                        }
+                    ]
                 },
                 {
-                    "caption":"Leistung in W",
-                    "name":"Leistung",
-                    "width":"300px",
-                    "add":0,
-                    "edit":{
-                    "type":"NumberSpinner"
-                    }
+                    "type": "NumberSpinner",
+                    "name": "Interval",
+                    "caption": "Rechenintervall (Sekunden)"
                 },
                 {
-                    "caption":"Schaltkontakt",
-                    "name":"Schaltkontakt_Stufe",
-                    "width":"400px",
-                    "add":0,
-                    "edit":{
-                    "type":"SelectVariable"
-                    }
+                    "type": "NumberSpinner",
+                    "name": "ZeitKonstante",
+                    "caption": "PT1 Zeitkonstante"
+                },
+                {
+                    "type": "SelectVariable",
+                    "name": "Heizungsfuehler_PT1",
+                    "caption": "Heizungsfühler"
+                },
+                {
+                    "type": "CheckBox",
+                    "name": "Heizungstemperatur_glätten",
+                    "caption": "Heizungstemperatur glätten"
+                },
+                {
+                    "type": "ValidationTextBox",
+                    "name": "Hysterese",
+                    "caption": "Hysterese (z.B. 0.1)"
+                },
+                {
+                    "type": "NumberSpinner",
+                    "name": "IdleCounterMax",
+                    "caption": "Idle Counter Max"
                 }
-
             ]
-        },
-        {
-            "type": "NumberSpinner",
-            "name": "Boilervolumen",
-            "caption": "Boilervolumen",
-            "suffix": "Liter"
-        },
-        {
-            "type": "SelectVariable",
-            "name": "Boilerfuehler_PT1",
-            "caption": "Variable für Boilerfühler PT1",
-            "test": true
-        }, 
-        {
-            "type": "List",
-            "name": "Zeitplan",
-            "caption": "Zeitplan für Solltemperaturen",
-            "columns": [
-                {
-                    "caption": "Uhrzeit",
-                    "name": "Uhrzeit",
-                    "width": "150px",
-                    "add": "00:00",
-                    "edit": {
-                        "type": "ValidationTextBox"
-                    }
-                },
-                {
-                    "caption": "Solltemperatur",
-                    "name": "Solltemperatur",
-                    "width": "150px",
-                    "add": 0,
-                    "edit": {
-                        "type": "NumberSpinner"
-                    }
-                }
-            ],
-            "add": true,
-            "delete": true,
-            "sort": {
-                "column": "Uhrzeit",
-                "direction": "ascending"
-            }
         }
-    ]
+    ],
+    "actions": []
 }
\ No newline at end of file