diff --git a/ui/main.slint b/ui/main.slint
index 6ab3b05..18e659c 100644
--- a/ui/main.slint
+++ b/ui/main.slint
@@ -84,37 +84,133 @@ export component MainWindow inherits Window {
     }
 
     Rectangle {
-        x: 38px;
+        x: 0px;
         y: 32px + 36px + 5px;
-        width: (root.width / 2) - 38px;
-        height: root.height - 32px + 36px + 5px;
+        width: (root.width / 2);
+        height: root.height - (32px + 36px + 5px);
+    }
+
+    Rectangle {
+        x: (root.width / 2);
+        y: 5px;
+        width: (root.width / 2);
+        height: root.height - 10px;
 
         ComponentCard {
-            title: "Switches";
+            title: "Lights";
 
             Vertical {
+                alignment: start;
                 Horizontal {
-                    alignment: space_around;
-
-                    Switch {}
-
+                    alignment: end;
+                    Text {
+                        text: "Armory Light";
+                        vertical-alignment: center;
+                        horizontal-alignment: right;
+                        font-size: 18px;
+                        font-weight: 500;
+                    }
                     Switch {
-                        off_icon: FilledIcons.close;
-                        on_icon: FilledIcons.check;
+                        checked: false;
                     }
                 }
 
                 Horizontal {
-                    alignment: space_around;
-
-                    Switch {
-                        enabled: false;
+                    alignment: end;
+                    Text {
+                        text: "Bedroom Light";
+                        vertical-alignment: center;
+                        horizontal-alignment: right;
+                        font-size: 18px;
+                        font-weight: 500;
                     }
+                    Switch {
+                        checked: false;
+                    }
+                }
 
+                Horizontal {
+                    alignment: end;
+                    Text {
+                        text: "Hallway Light";
+                        vertical-alignment: center;
+                        horizontal-alignment: right;
+                        font-size: 18px;
+                        font-weight: 500;
+                    }
+                    Switch {
+                        checked: false;
+                    }
+                }
+
+                Horizontal {
+                    alignment: end;
+                    Text {
+                        text: "Kitchen Light";
+                        vertical-alignment: center;
+                        horizontal-alignment: right;
+                        font-size: 18px;
+                        font-weight: 500;
+                    }
+                    Switch {
+                        checked: false;
+                    }
+                }
+
+                Horizontal {
+                    alignment: end;
+                    Text {
+                        text: "Living Room Light";
+                        vertical-alignment: center;
+                        horizontal-alignment: right;
+                        font-size: 18px;
+                        font-weight: 700;
+                    }
+                    Switch {
+                        checked: true;
+                    }
+                }
+
+                Horizontal {
+                    alignment: end;
+                    Text {
+                        text: "Shower Light";
+                        vertical-alignment: center;
+                        horizontal-alignment: right;
+                        font-size: 18px;
+                        font-weight: 500;
+                    }
+                    Switch {
+                        checked: false;
+                    }
+                }
+
+                Horizontal {
+                    alignment: end;
+                    Text {
+                        text: "Utilities Light";
+                        vertical-alignment: center;
+                        horizontal-alignment: right;
+                        font-size: 18px;
+                        font-weight: 500;
+                    }
                     Switch {
                         enabled: false;
-                        on_icon: FilledIcons.check;
-                        off_icon: FilledIcons.close;
+                        checked: false;
+                    }
+                }
+
+                Horizontal {
+                    alignment: end;
+                    Text {
+                        text: "WC Light";
+                        vertical-alignment: center;
+                        horizontal-alignment: right;
+                        font-size: 18px;
+                        font-weight: 500;
+                    }
+                    Switch {
+                        checked: false;
                     }
                 }
             }