diff --git a/config.schema.json b/config.schema.json
index 004a61b..b3ce108 100644
--- a/config.schema.json
+++ b/config.schema.json
@@ -34,13 +34,13 @@
         "required": true
       },
       "prefix": {
-        "title": "Prefix robot name",
+        "title": "Prefix with Robot Name",
         "description": "Display the name of the robot in front of every service.",
         "type": "boolean",
         "default": false
       },
       "backgroundUpdate": {
-        "title": "Background update",
+        "title": "Background Update Interval",
         "description": "Interval for background updates while the robot is not cleaning (in minutes). During cleaning, the robot will automatically update at a faster rate.",
         "type": "integer",
         "minimum": 1,
@@ -48,36 +48,74 @@
       },
       "services": {
         "type": "array",
-        "title": "Services",
+        "title": "Enabled Services",
         "description": "The services to be made available for Homekit",
+        "uniqueItems": true,
         "items": {
+          "title": "hihi",
           "type": "string",
           "enum": [
-            "Clean house",
-            "Clean spot",
-            "Go to dock",
-            "Find me",
+            "clean",
+            "cleanThe",
+            "cleanSpot",
+            "goToDock",
+            "dockState",
+            "binFull",
+            "eco",
+            "noGoLines",
+            "extraCare",
+            "schedule",
+            "findMe",
+            "battery"
+          ],
+          "enumNames": [
+            "Clean",
+            "Clean the",
+            "Clean Spot",
+            "Go to Dock",
+            "Docked State",
+            "Bin Full",
+            "Eco Mode",
+            "NoGo Lines",
+            "Extra Care",
             "Schedule",
-            "Eco",
-            "Nogo lines",
-            "Extra care",
-            "Docked sensor",
-            "Bin full sensor"
+            "Find me",
+            "Battery"
           ]
         },
         "default": [
-          "Clean house",
-          "Clean spot",
-          "Go to dock",
-          "Find me",
-          "Schedule",
-          "Eco",
-          "Nogo lines",
-          "Extra care",
-          "Docked sensor",
-          "Bin full sensor"
+          "clean",
+          "cleanThe",
+          "goToDock",
+          "dockState",
+          "binFull",
+          "eco",
+          "noGoLines",
+          "extraCare",
+          "schedule",
+          "findMe",
+          "cleanSpot",
+          "battery"
         ]
       }
     }
-  }
+  },
+  "layout" : [
+    "language",
+    "token",
+    "prefix",
+    "backgroundUpdate",
+    {
+      "type": "fieldset",
+      "title": "Displayed Services",
+      "description": "<i>Services to be displayed in Homekit</i>",
+      "expandable": true,
+      "items": [
+        {
+          "key": "services",
+          "notitle": false
+        }
+      ]
+    }
+  ]
 }