diff --git a/deploy.yaml b/deploy.yaml
index cb45037..e8e1856 100644
--- a/deploy.yaml
+++ b/deploy.yaml
@@ -12,121 +12,153 @@ areas:
       - id: content
         type: Card
         layout:
-          size: 800
+          size: 1000
           contentGutter: 10
         blocks:
           - id: title
             type: Title
             layout:
-              grow: 1
+              span: 24
             properties:
               content: Deploy
-              label:
-                span: 5
-          - id: macaddress
-            required: true
-            type: TextInput
-            properties:
-              title: MAC Address
-              placeholder: 00:00:00:00:00:00
-              label:
-                span: 5
-            validate:
-              - status: error
-                message: Enter a valid MAC address
-                pass:
-                  _regex: ^(?!(?:00[:-]){5}00)((?:[0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2})$
-          - id: projectname
-            type: TextInput
-            properties:
-              title: Project name
-              label:
-                span: 5
-          - id: hostname
-            required: true
-            type: TextInput
-            properties:
-              title: Hostname
-              label:
-                extra: Can only contain alphanumeric characters and hyphens; must be between 1 and 15 characters long
-                extraStyle:
-                  font-size: smaller
-                  font-style: italic
-                span: 5
-            validate:
-              - status: error
-                message: Enter a valid hostname
-                pass:
-                  _regex: ^([a-zA-Z0-9]{1,15}|[a-zA-Z0-9][a-zA-Z0-9\-]{0,13}[a-zA-Z0-9])$
-          - id: ipaddress
-            required: true
-            type: TextInput
-            properties:
-              title: IP address
-              placeholder: 0.0.0.0
-              label:
-                span: 5
-            validate:
-              - status: error
-                message: Enter a valid IP address
-                pass:
-                  _regex: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
-          - id: subnetmask
-            required: true
-            type: TextInput
-            properties:
-              title: Subnet mask
-              placeholder: 255.255.255.0
-              label:
-                span: 5
-            validate:
-              - status: error
-                message: Enter a valid subnet mask
-                pass:
-                  _regex: ^(?:(255|254|252|248|240|224|192|128|0+)(?:\.(?!$)|$)){4}$
-          - id: gateway
-            required: true
-            type: TextInput
-            properties:
-              title: Gateway
-              placeholder: 0.0.0.0
-              label:
-                span: 5
-            validate:
-              - status: error
-                message: Enter a valid IP address
-                pass:
-                  _regex: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
-          - id: dnsserver
-            required: true
-            type: TextInput
-            properties:
-              title: DNS server
-              placeholder: 1.1.1.1, 1.0.0.1
-              label:
-                extra: (comma-separated list of IP addresses)
-                extraStyle:
-                  font-size: smaller
-                  font-style: italic
-                span: 5
-            validate:
-              - status: error
-                message: Enter one or more valid IP addresses, separated by a comma
-                pass:
-                  _regex: ^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?))(?:,\s*(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)))*$
-          - id: dnssuffix
-            required: true
-            type: TextInput
-            properties:
-              title: DNS suffix
-              placeholder: example.org
-              label:
-                span: 5
-            validate:
-              - status: error
-                message: Enter a valid domain name
-                pass:
-                  _regex: (?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$)
+          - id: leftcolumn
+            type: Box
+            layout:
+              span: 12
+              contentGutter: 10
+            blocks:
+              - id: macaddress
+                required: true
+                type: TextInput
+                properties:
+                  title: MAC Address
+                  placeholder: 00:00:00:00:00:00
+                validate:
+                  - status: error
+                    message: Enter a valid MAC address
+                    pass:
+                      _regex: ^(?!(?:00[:-]){5}00)((?:[0-9a-fA-F]{2}[:-]){5}[0-9a-fA-F]{2})$
+              - id: projectname
+                type: TextInput
+                properties:
+                  title: Project name
+              - id: hostname
+                required: true
+                type: TextInput
+                properties:
+                  title: Hostname
+                  label:
+                    extra: Can only contain alphanumeric characters and hyphens; must be between 1 and 15 characters long
+                    extraStyle:
+                      font-size: smaller
+                      font-style: italic
+                validate:
+                  - status: error
+                    message: Enter a valid hostname
+                    pass:
+                      _regex: ^([a-zA-Z0-9]{1,15}|[a-zA-Z0-9][a-zA-Z0-9\-]{0,13}[a-zA-Z0-9])$
+              - id: ipaddress
+                required: true
+                type: TextInput
+                properties:
+                  title: IP address
+                  placeholder: 0.0.0.0
+                validate:
+                  - status: error
+                    message: Enter a valid IP address
+                    pass:
+                      _regex: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
+              - id: subnetmask
+                required: true
+                type: TextInput
+                properties:
+                  title: Subnet mask
+                  placeholder: 255.255.255.0
+                validate:
+                  - status: error
+                    message: Enter a valid subnet mask
+                    pass:
+                      _regex: ^(?:(255|254|252|248|240|224|192|128|0+)(?:\.(?!$)|$)){4}$
+              - id: gateway
+                required: true
+                type: TextInput
+                properties:
+                  title: Gateway
+                  placeholder: 0.0.0.0
+                validate:
+                  - status: error
+                    message: Enter a valid IP address
+                    pass:
+                      _regex: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
+              - id: dnsserver
+                required: true
+                type: TextInput
+                properties:
+                  title: DNS server
+                  placeholder: 1.1.1.1, 1.0.0.1
+                  label:
+                    extra: (comma-separated list of IP addresses)
+                    extraStyle:
+                      font-size: smaller
+                      font-style: italic
+                validate:
+                  - status: error
+                    message: Enter one or more valid IP addresses, separated by a comma
+                    pass:
+                      _regex: ^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?))(?:,\s*(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.(?:25[0-5]|2[0-4]\d|[01]?\d\d?)))*$
+              - id: dnssuffix
+                required: true
+                type: TextInput
+                properties:
+                  title: DNS suffix
+                  placeholder: example.org
+                validate:
+                  - status: error
+                    message: Enter a valid domain name
+                    pass:
+                      _regex: (?=^.{4,253}$)(^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$)
+          - id: rightcolumn
+            type: Box
+            layout:
+              span: 12
+              contentGutter: 10
+            blocks:
+              - id: certificate
+                required: true
+                type: TextArea
+                properties:
+                  autoSize:
+                    maxRows: 4
+                    minRows: 4
+                  block: true
+                  title: Certificate
+                  placeholder: |
+                    -----BEGIN CERTIFICATE-----
+                    [...]
+                    -----END CERTIFICATE-----
+                  label:
+                    extra: PEM format
+                    extraStyle:
+                      font-size: smaller
+                      font-style: italic
+              - id: privatekey
+                required: true
+                type: TextArea
+                properties:
+                  autoSize:
+                    maxRows: 4
+                    minRows: 4
+                  block: true
+                  title: Private key
+                  placeholder: |
+                    -----BEGIN RSA PRIVATE KEY-----
+                    [...]
+                    -----END RSA PRIVATE KEY-----
+                  label:
+                    extra: PEM format
+                    extraStyle:
+                      font-size: smaller
+                      font-style: italic
           - id: warning
             type: Alert
             properties: