diff --git a/deploy.yaml b/deploy.yaml
index 17a1db7..16d8fcb 100644
--- a/deploy.yaml
+++ b/deploy.yaml
@@ -3,14 +3,17 @@ type: PageHeaderMenu
 properties:
   title: Deploy
 
+layout:
+  contentJustify: center
+
 areas:
   content:
     blocks:
       - id: content
         type: Card
         layout:
-          size: 800 # Set the size of the card so it does not fill the full screen
-          contentGutter: 16 # Make a 16px gap between all blocks in this card
+          size: 800
+          contentGutter: 5
         blocks:
           - id: title
             type: Title
@@ -18,53 +21,72 @@ areas:
               grow: 1
             properties:
               content: Deploy
+              label:
+                span: 3
           - id: macaddress
             required: true
             type: TextInput
             properties:
               title: MAC Address
               placeholder: 00:00:00:00:00:00
+              label:
+                span: 3
           - id: projectname
             type: TextInput
             properties:
               title: Project name
+              label:
+                span: 3
           - id: hostname
             required: true
             type: TextInput
             properties:
               title: Hostname
+              label:
+                span: 3
           - id: ipaddress
             required: true
             type: TextInput
             properties:
               title: IP address
               placeholder: 0.0.0.0
+              label:
+                span: 3
           - id: subnetmask
             required: true
             type: TextInput
             properties:
               title: Subnet mask
               placeholder: 255.255.255.0
+              label:
+                span: 3
           - id: gateway
             required: true
             type: TextInput
             properties:
               title: Gateway
               placeholder: 0.0.0.0
+              label:
+                span: 3
           - id: dnsserver
             type: TextInput
             properties:
               title: DNS server
               placeholder: 0.0.0.0, 0.0.0.0
+              label:
+                extra: (comma-separated list)
+                span: 3
           - id: dnssuffix
             type: TextInput
             properties:
               title: DNS suffix
               placeholder: example.org
+              label:
+                span: 3
           - id: warning
             type: Alert
             properties:
-              message: When pressing 'Start Deployment' the physical device should be booted over LAN (PXE).
+              message: After pressing 'Start Deployment' the physical device can be booted over LAN
               type: warning
           - id: reset_button
             type: Button
@@ -75,7 +97,7 @@ areas:
               icon: ClearOutlined
               block: true
               type: default
-            actions:
+            events:
               onClick:
                 - id: reset
                   type: reset()