diff --git a/smardigo/provisioning/form/current-jobs.json b/smardigo/provisioning/form/current-jobs.json
index 29fb24e..cc2ac88 100644
--- a/smardigo/provisioning/form/current-jobs.json
+++ b/smardigo/provisioning/form/current-jobs.json
@@ -4,39 +4,25 @@
   "page" : 0,
   "components" : [ {
     "label" : "Jobs",
-    "disableAddingRemovingRows" : true,
-    "disableAddingRows" : true,
-    "defaultOpen" : false,
-    "layoutFixed" : false,
-    "striped" : false,
-    "bordered" : true,
-    "enableRowGroups" : false,
-    "reorder" : false,
+    "persistent" : false,
     "mask" : false,
     "tableView" : true,
     "alwaysEnabled" : false,
-    "type" : "datagrid",
+    "type" : "list",
     "input" : true,
     "key" : "jobs",
-    "defaultValue" : [ { } ],
-    "validate" : {
-      "customMessage" : "",
-      "json" : "",
-      "minLength" : null,
-      "maxLength" : null
-    },
     "conditional" : {
       "show" : "",
       "when" : "",
       "json" : ""
     },
     "components" : [ {
-      "label" : "Job",
-      "hideLabel" : true,
-      "persistent" : false,
+      "label" : "job",
       "mask" : false,
+      "hideLabel" : true,
       "tableView" : true,
       "alwaysEnabled" : false,
+      "customClass" : "pb-0",
       "type" : "datasourcecontainer",
       "input" : true,
       "key" : "job",
@@ -54,25 +40,206 @@
         "method" : "GET",
         "values" : [ { } ]
       },
-      "components" : [ ],
+      "components" : [ {
+        "label" : "job",
+        "hideLabel" : true,
+        "customClass" : "pb-0",
+        "mask" : false,
+        "tableView" : true,
+        "alwaysEnabled" : false,
+        "type" : "container",
+        "input" : true,
+        "key" : "job",
+        "validate" : {
+          "customMessage" : "",
+          "json" : ""
+        },
+        "conditional" : {
+          "show" : "",
+          "when" : "",
+          "json" : ""
+        },
+        "components" : [ {
+          "label" : "Columns",
+          "hideLabel" : true,
+          "columns" : [ {
+            "components" : [ {
+              "label" : "Name",
+              "hideLabel" : true,
+              "labelPosition" : "left-left",
+              "allowMultipleMasks" : false,
+              "showWordCount" : false,
+              "showCharCount" : false,
+              "tableView" : true,
+              "alwaysEnabled" : false,
+              "type" : "textfield",
+              "input" : true,
+              "key" : "name",
+              "defaultValue" : "",
+              "validate" : {
+                "customMessage" : "",
+                "json" : ""
+              },
+              "conditional" : {
+                "show" : "",
+                "when" : "",
+                "json" : ""
+              },
+              "tabs" : null,
+              "properties" : { },
+              "tags" : [ ],
+              "inputFormat" : "plain",
+              "encrypted" : false,
+              "customConditional" : "",
+              "logic" : [ ],
+              "widget" : {
+                "type" : ""
+              },
+              "reorder" : false
+            } ],
+            "width" : 4,
+            "offset" : 0,
+            "push" : 0,
+            "pull" : 0,
+            "type" : "column",
+            "input" : false,
+            "hideOnChildrenHidden" : false,
+            "key" : "column",
+            "tableView" : true,
+            "label" : "Column"
+          }, {
+            "components" : [ {
+              "label" : "Name",
+              "hideLabel" : true,
+              "labelPosition" : "left-left",
+              "allowMultipleMasks" : false,
+              "showWordCount" : false,
+              "showCharCount" : false,
+              "tableView" : true,
+              "alwaysEnabled" : false,
+              "type" : "textfield",
+              "input" : true,
+              "key" : "description",
+              "defaultValue" : "",
+              "validate" : {
+                "customMessage" : "",
+                "json" : ""
+              },
+              "conditional" : {
+                "show" : "",
+                "when" : "",
+                "json" : ""
+              },
+              "tabs" : null,
+              "properties" : { },
+              "tags" : [ ],
+              "inputFormat" : "plain",
+              "encrypted" : false,
+              "customConditional" : "",
+              "logic" : [ ],
+              "widget" : {
+                "type" : ""
+              },
+              "reorder" : false
+            } ],
+            "width" : 4,
+            "offset" : 0,
+            "push" : 0,
+            "pull" : 0,
+            "type" : "column",
+            "input" : false,
+            "hideOnChildrenHidden" : false,
+            "key" : "column",
+            "tableView" : true,
+            "label" : "Column"
+          }, {
+            "width" : 4,
+            "offset" : 0,
+            "push" : 0,
+            "pull" : 0,
+            "type" : "column",
+            "input" : false,
+            "hideOnChildrenHidden" : false,
+            "key" : "column",
+            "tableView" : true,
+            "label" : "Column",
+            "components" : [ {
+              "label" : "Name",
+              "hideLabel" : true,
+              "labelPosition" : "left-left",
+              "allowMultipleMasks" : false,
+              "showWordCount" : false,
+              "showCharCount" : false,
+              "tableView" : true,
+              "alwaysEnabled" : false,
+              "type" : "textfield",
+              "input" : true,
+              "key" : "status",
+              "defaultValue" : "",
+              "validate" : {
+                "customMessage" : "",
+                "json" : ""
+              },
+              "conditional" : {
+                "show" : "",
+                "when" : "",
+                "json" : ""
+              },
+              "tabs" : null,
+              "properties" : { },
+              "tags" : [ ],
+              "inputFormat" : "plain",
+              "encrypted" : false,
+              "customConditional" : "",
+              "logic" : [ ],
+              "widget" : {
+                "type" : ""
+              },
+              "reorder" : false
+            } ]
+          } ],
+          "customClass" : "pb-0",
+          "mask" : false,
+          "tableView" : false,
+          "alwaysEnabled" : false,
+          "type" : "columns",
+          "input" : false,
+          "key" : "columns",
+          "conditional" : {
+            "show" : "",
+            "when" : "",
+            "json" : ""
+          },
+          "tabs" : null,
+          "properties" : { },
+          "tags" : [ ],
+          "customConditional" : "",
+          "logic" : [ ],
+          "reorder" : false
+        } ],
+        "tabs" : null,
+        "properties" : { },
+        "tags" : [ ],
+        "encrypted" : false,
+        "customConditional" : "",
+        "logic" : [ ],
+        "reorder" : false
+      } ],
       "tabs" : null,
       "properties" : { },
       "tags" : [ ],
-      "datapath" : "",
+      "datapath" : "0",
       "encrypted" : false,
       "customConditional" : "",
       "logic" : [ ],
-      "row" : "0-0",
       "reorder" : false
     } ],
     "tabs" : null,
-    "properties" : { },
-    "encrypted" : false,
-    "tags" : null,
     "customConditional" : "",
+    "properties" : { },
+    "tags" : [ ],
     "logic" : [ ],
-    "addAnother" : "",
-    "groupToggle" : false
+    "reorder" : false
   } ],
   "display" : "form"
 }
\ No newline at end of file
diff --git a/smardigo/provisioning/mail-template/smardigo-up-and-running.html b/smardigo/provisioning/mail-template/smardigo-up-and-running.html
index 5c3b8ff..85a81e1 100644
--- a/smardigo/provisioning/mail-template/smardigo-up-and-running.html
+++ b/smardigo/provisioning/mail-template/smardigo-up-and-running.html
@@ -48,8 +48,8 @@
            </tr>
           <tr>
             <td>ELK</td>
-            <td th:text="${ tenant.key }">some-username</td>
-            <td th:text="${ tenant.key }">some-password</td>
+            <td th:text="${ cluster.stage } + '-' + ${ tenant.key }">some-username</td>
+            <td th:text="${ cluster.stage } + '-' + ${ tenant.key }">some-password</td>
             <td th:text="'https://' + ${ cluster.stage } + '-elastic-stack-kibana-01-kibana.smardigo.digital/s/' + ${ cluster.stage } + '-' + ${ tenant.key } + '/app/home#/'">some-link</td>
            </tr>
         </table>