diff --git a/platform/commonUI/dialog/bundle.json b/platform/commonUI/dialog/bundle.json
index feeb0d9e12..ae1c89cc05 100644
--- a/platform/commonUI/dialog/bundle.json
+++ b/platform/commonUI/dialog/bundle.json
@@ -15,6 +15,16 @@
         "templates": [
             {
                 "key": "overlay-dialog",
+                "templateUrl": "templates/overlay-dialog.html"
+            },
+            {
+                "key": "form-dialog",
+                "templateUrl": "templates/dialog.html"
+            }
+        ],
+        "containers": [
+            {
+                "key": "overlay",
                 "templateUrl": "templates/overlay.html"
             }
         ]
diff --git a/platform/commonUI/dialog/res/templates/dialog.html b/platform/commonUI/dialog/res/templates/dialog.html
new file mode 100644
index 0000000000..87cf45d2d6
--- /dev/null
+++ b/platform/commonUI/dialog/res/templates/dialog.html
@@ -0,0 +1,25 @@
+<div class="abs top-bar">
+    <div class="title">{{ngModel.title}}</div>
+    <div class="hint">
+        All fields marked <span class="ui-symbol req">*</span> are required.
+    </div>
+</div>
+<div class="abs form outline editor">
+    <div class='abs contents'>
+        <mct-form ng-model="ngModel.value"
+                  structure="ngModel.structure"
+                  name="createForm">
+        </mct-form>
+    </div>
+</div>
+<div class="abs bottom-bar">
+    <a class='btn lg major'
+       href=''
+       ng-class="{ disabled: !createForm.$valid }"
+       ng-click="ngModel.confirm()">
+        OK
+    </a>
+    <a class='btn lg subtle' href='' ng-click="ngModel.cancel()">
+        Cancel
+    </a>
+</div>
\ No newline at end of file
diff --git a/platform/commonUI/dialog/res/templates/overlay-dialog.html b/platform/commonUI/dialog/res/templates/overlay-dialog.html
new file mode 100644
index 0000000000..74ec58a075
--- /dev/null
+++ b/platform/commonUI/dialog/res/templates/overlay-dialog.html
@@ -0,0 +1,4 @@
+<mct-container key="overlay">
+    <mct-include key="'form-dialog'" ng-model="ngModel">
+    </mct-include>
+</mct-container>
\ No newline at end of file
diff --git a/platform/commonUI/dialog/res/templates/overlay.html b/platform/commonUI/dialog/res/templates/overlay.html
index d5e0d7de51..00636d5d90 100644
--- a/platform/commonUI/dialog/res/templates/overlay.html
+++ b/platform/commonUI/dialog/res/templates/overlay.html
@@ -3,32 +3,12 @@
     <div class="abs holder">
         <a href=""
            ng-click="ngModel.cancel()"
-           class="btn normal outline ui-symbol close">x</a>
-        <div class="abs contents">
-            <div class="abs top-bar">
-                <div class="title">{{ngModel.title}}</div>
-                <div class="hint">All fields marked <span class="ui-symbol req">*</span> are required.</div>
-            </div>
-            <div class="abs form outline editor">
-                <div class='abs contents'>
-                    <!-- mct-include key="'form'" ng-model="" -->
-                    <mct-form ng-model="ngModel.value"
-                              structure="ngModel.structure"
-                              name="createForm">
-                    </mct-form>
-                </div>
-            </div>
-            <div class="abs bottom-bar">
-                <a class='btn lg major'
-                   href=''
-                   ng-class="{ disabled: !createForm.$valid }"
-                   ng-click="ngModel.confirm()">
-                    OK
-                </a>
-                <a class='btn lg subtle' href='' ng-click="ngModel.cancel()">
-                    Cancel
-                </a>
-            </div>
+           ng-if="ngModel.cancel"
+           class="btn normal outline ui-symbol close">
+            x
+        </a>
+        <div class="abs contents" ng-transclude>
+
         </div>
     </div>
 </div>
\ No newline at end of file