diff --git a/Abrechnung/form.json b/Abrechnung/form.json
index 766fcd4..771c91f 100644
--- a/Abrechnung/form.json
+++ b/Abrechnung/form.json
@@ -2,8 +2,9 @@
   "elements": [
     {
       "type": "Label",
-      "caption": "Einstellungen für Abrechnung"
+      "caption": "⚙️  Abrechnungskonfiguration"
     },
+
     {
       "type": "ExpansionPanel",
       "caption": "Benutzer (Empfänger)",
@@ -11,20 +12,22 @@
         {
           "type": "List",
           "name": "Users",
-          "caption": "Benutzer",
+          "caption": "Benutzerliste",
+          "rowCount": 5,
           "add": true,
+          "edit": true,
+          "delete": true,
+          "values": [],
           "columns": [
             { "caption": "ID", "name": "id", "width": "10%", "add": "" },
-            { "caption": "Name", "name": "name", "width": "35%", "add": "" },
-            { "caption": "E-Mail", "name": "email", "width": "35%", "add": "" },
-            { "caption": "Adresse", "name": "address", "width": "20%", "add": "" }
-          ],
-          "rowCount": 5,
-          "rowEdit": true,
-          "delete": true
+            { "caption": "Name", "name": "name", "width": "30%", "add": "" },
+            { "caption": "E-Mail", "name": "email", "width": "30%", "add": "" },
+            { "caption": "Adresse", "name": "address", "width": "30%", "add": "" }
+          ]
         }
       ]
     },
+
     {
       "type": "ExpansionPanel",
       "caption": "Zähler",
@@ -32,34 +35,46 @@
         {
           "type": "List",
           "name": "Meters",
-          "caption": "Zähler",
+          "caption": "Zählerliste",
+          "rowCount": 5,
           "add": true,
+          "edit": true,
+          "delete": true,
+          "values": [],
           "columns": [
             { "caption": "ID", "name": "id", "width": "10%", "add": "" },
             { "caption": "Name", "name": "name", "width": "25%", "add": "" },
             { "caption": "IPS-VariableID", "name": "variableid", "width": "20%", "add": 0 },
             { "caption": "Benutzer-ID", "name": "user_id", "width": "20%", "add": "" },
             { "caption": "Einheit", "name": "unit", "width": "15%", "add": "" }
-          ],
-          "rowCount": 5,
-          "rowEdit": true,
-          "delete": true
+          ]
         }
       ]
     },
+
     {
       "type": "ExpansionPanel",
       "caption": "Abrechnung (Schnellstart)",
       "items": [
         {
-          "type": "DateTime",
-          "name": "from",
-          "caption": "Von"
+          "type": "DatePicker",
+          "name": "from_date",
+          "caption": "Von (Datum)"
         },
         {
-          "type": "DateTime",
-          "name": "to",
-          "caption": "Bis"
+          "type": "TimePicker",
+          "name": "from_time",
+          "caption": "Von (Zeit)"
+        },
+        {
+          "type": "DatePicker",
+          "name": "to_date",
+          "caption": "Bis (Datum)"
+        },
+        {
+          "type": "TimePicker",
+          "name": "to_time",
+          "caption": "Bis (Zeit)"
         },
         {
           "type": "NumberSpinner",