diff --git a/Abrechnung/form.json b/Abrechnung/form.json
index 0c8fb62..913c831 100644
--- a/Abrechnung/form.json
+++ b/Abrechnung/form.json
@@ -6,60 +6,44 @@
     },
     {
       "type": "ExpansionPanel",
-      "caption": "Stammdaten",
+      "caption": "Benutzer (Empfänger)",
       "items": [
         {
-          "type": "Row",
-          "items": [
-            {
-              "type": "Column",
-              "items": [
-                {
-                  "type": "List",
-                  "name": "Users",
-                  "caption": "Benutzer (Empfänger)",
-                  "add": true,
-                  "columns": [
-                    { "caption": "ID", "name": "id", "width": "10%" },
-                    { "caption": "Name", "name": "name", "width": "35%" },
-                    { "caption": "E-Mail", "name": "email", "width": "35%" },
-                    { "caption": "Adresse", "name": "address", "width": "20%" }
-                  ],
-                  "rowProperties": [
-                    { "label": "Name", "name": "name", "type": "TextBox" },
-                    { "label": "E-Mail", "name": "email", "type": "TextBox" },
-                    { "label": "Adresse", "name": "address", "type": "TextBox" },
-                    { "label": "Benutzer-ID (frei)", "name": "id", "type": "ValidationTextBox" }
-                  ]
-                }
-              ]
-            },
-            {
-              "type": "Column",
-              "items": [
-                {
-                  "type": "List",
-                  "name": "Meters",
-                  "caption": "Zähler",
-                  "add": true,
-                  "columns": [
-                    { "caption": "ID", "name": "id", "width": "10%" },
-                    { "caption": "Name", "name": "name", "width": "30%" },
-                    { "caption": "IPS-VariableID", "name": "variableid", "width": "30%" },
-                    { "caption": "Benutzer-ID", "name": "user_id", "width": "15%" },
-                    { "caption": "Einheit", "name": "unit", "width": "15%" }
-                  ],
-                  "rowProperties": [
-                    { "label": "Name", "name": "name", "type": "TextBox" },
-                    { "label": "IPS-VariableID (Zählerstand)", "name": "variableid", "type": "ValidationTextBox" },
-                    { "label": "Zugehöriger Benutzer-ID", "name": "user_id", "type": "ValidationTextBox" },
-                    { "label": "Einheit (z.B. kWh)", "name": "unit", "type": "TextBox" },
-                    { "label": "Zähler-ID (frei)", "name": "id", "type": "ValidationTextBox" }
-                  ]
-                }
-              ]
-            }
-          ]
+          "type": "List",
+          "name": "Users",
+          "caption": "Benutzer",
+          "add": true,
+          "columns": [
+            { "caption": "ID", "name": "id", "width": "10%" },
+            { "caption": "Name", "name": "name", "width": "35%" },
+            { "caption": "E-Mail", "name": "email", "width": "35%" },
+            { "caption": "Adresse", "name": "address", "width": "20%" }
+          ],
+          "rowCount": 5,
+          "rowEdit": true,
+          "delete": true
+        }
+      ]
+    },
+    {
+      "type": "ExpansionPanel",
+      "caption": "Zähler",
+      "items": [
+        {
+          "type": "List",
+          "name": "Meters",
+          "caption": "Zähler",
+          "add": true,
+          "columns": [
+            { "caption": "ID", "name": "id", "width": "10%" },
+            { "caption": "Name", "name": "name", "width": "25%" },
+            { "caption": "IPS-VariableID", "name": "variableid", "width": "20%" },
+            { "caption": "Benutzer-ID", "name": "user_id", "width": "20%" },
+            { "caption": "Einheit", "name": "unit", "width": "15%" }
+          ],
+          "rowCount": 5,
+          "rowEdit": true,
+          "delete": true
         }
       ]
     },
@@ -68,50 +52,40 @@
       "caption": "Abrechnung (Schnellstart)",
       "items": [
         {
-          "type": "Row",
-          "items": [
-            {
-              "type": "Column",
-              "items": [
-                {
-                  "type": "DateTimePicker",
-                  "name": "from",
-                  "caption": "Von",
-                  "format": "yyyy-MM-dd HH:mm"
-                },
-                {
-                  "type": "DateTimePicker",
-                  "name": "to",
-                  "caption": "Bis",
-                  "format": "yyyy-MM-dd HH:mm"
-                },
-                {
-                  "type": "NumberSpinner",
-                  "name": "work_price",
-                  "caption": "Arbeitspreis (pro Einheit)",
-                  "digits": 4,
-                  "minimum": 0
-                },
-                {
-                  "type": "NumberSpinner",
-                  "name": "fixed_fee",
-                  "caption": "Fixbetrag pro Benutzer (optional)",
-                  "digits": 2,
-                  "minimum": 0
-                },
-                {
-                  "type": "Button",
-                  "caption": "Abrechnung erzeugen (PDF)",
-                  "onClick": "GenerateInvoices"
-                },
-                {
-                  "type": "Label",
-                  "name": "result",
-                  "caption": ""
-                }
-              ]
-            }
-          ]
+          "type": "DateTimePicker",
+          "name": "from",
+          "caption": "Von",
+          "format": "yyyy-MM-dd HH:mm"
+        },
+        {
+          "type": "DateTimePicker",
+          "name": "to",
+          "caption": "Bis",
+          "format": "yyyy-MM-dd HH:mm"
+        },
+        {
+          "type": "NumberSpinner",
+          "name": "work_price",
+          "caption": "Arbeitspreis (pro Einheit)",
+          "digits": 4,
+          "minimum": 0
+        },
+        {
+          "type": "NumberSpinner",
+          "name": "fixed_fee",
+          "caption": "Fixbetrag pro Benutzer (optional)",
+          "digits": 2,
+          "minimum": 0
+        },
+        {
+          "type": "Button",
+          "caption": "Abrechnung erzeugen (PDF)",
+          "onClick": "GenerateInvoices"
+        },
+        {
+          "type": "Label",
+          "name": "result",
+          "caption": ""
         }
       ]
     }