diff --git a/src/dialog-editor/components/field/field.html b/src/dialog-editor/components/field/field.html
index dfbfa904f1..abb61c2af2 100644
--- a/src/dialog-editor/components/field/field.html
+++ b/src/dialog-editor/components/field/field.html
@@ -24,17 +24,38 @@
            type="checkbox">
 
     <!-- date control -->
-    <input ng-switch-when="DialogFieldDateControl"
-           pf-datepicker options="vm.fieldData.options"
-           ng-disabled="true"
-           date="vm.fieldData.default_value">
-
+    <p class="input-group" ng-switch-when="DialogFieldDateControl">
+      <input uib-datepicker-popup="MM/dd/yyyy"
+             type="text"
+             class="form-control"
+             ng-model="vm.fieldData.default_value"
+             is-open="open"
+             close-text="{{'Close'|translate}}"/>
+      <span class="input-group-btn">
+        <button type="button"
+                class="btn btn-default"
+                ng-click="open = !open">
+          <i class="fa fa-calendar"></i>
+        </button>
+      </span>
+    </p>
     <!-- date time control -->
     <div ng-switch-when="DialogFieldDateTimeControl">
       <div class="col-sm-6 dateTimePadding">
-        <input ng-model="vm.fieldData.default_value"
-               pf-datepicker options="vm.fieldData.dateOptions"
-               date="vm.fieldData.default_value">
+        <p class="input-group">
+          <input uib-datepicker-popup="MM/dd/yyyy"
+                 type="text"
+                 class="form-control"
+                 ng-model="vm.fieldData.default_value"
+                 is-open="open"
+                 close-text="{{'Close'|translate}}"/>
+          <span class="input-group-btn">
+            <button type="button"
+                    class="btn btn-default"
+                    ng-click="open = !open">
+              <i class="fa fa-calendar"></i></button>
+          </span>
+        </p>
       </div>
       <div class="col-sm-6">
         <uib-timepicker ng-model="vm.fieldData.default_value"></uib-timepicker>
diff --git a/src/dialog-editor/components/modal-field-template/date-control.html b/src/dialog-editor/components/modal-field-template/date-control.html
new file mode 100644
index 0000000000..c2d39adad2
--- /dev/null
+++ b/src/dialog-editor/components/modal-field-template/date-control.html
@@ -0,0 +1,115 @@
+<div ng-if="vm.modalTabIsSet('options') && !vm.modalData.dynamic">
+  <form class="form-horizontal">
+    <div pf-form-group pf-label="{{'Required'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.required"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+    <div pf-form-group pf-label="{{'Default value'|translate}}">
+      <div class="dateTimePadding">
+        <p class="input-group">
+          <input uib-datepicker-popup="MM/dd/yyyy"
+                 type="text"
+                 class="form-control"
+                 ng-model="vm.modalData.default_value"
+                 is-open="open"
+                 close-text="{{'Close'|translate}}"/>
+          <span class="input-group-btn">
+            <button type="button"
+                    class="btn btn-default"
+                    ng-click="open = !open">
+              <i class="fa fa-calendar"></i>
+            </button>
+          </span>
+        </p>
+      </div>
+    </div>
+    <div pf-form-group pf-label="{{'Read only'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.read_only"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+    <div pf-form-group pf-label="{{'Visible'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.visible"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+    <div pf-form-group pf-label="{{'Show Past Dates'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.options.show_past_dates"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+    <dialog-editor-modal-field-template template="fields-to-refresh.html"
+                                        modal-data="vm.modalData">
+    </dialog-editor-modal-field-template>
+  </form>
+</div>
+<div ng-if="vm.modalTabIsSet('options') && vm.modalData.dynamic">
+  <form class="form-horizontal">
+    <div ng-show="!vm.treeOptions.show">
+      <div pf-form-group pf-label="{{'Entry Point'|translate}}">
+        <div class="input-group">
+          <input type="text" class="form-control" ng-value="vm.showFullyQualifiedName(vm.modalData.resource_action)" disabled>
+          <span class="input-group-btn">
+            <button class="btn btn-default" ng-click="vm.treeOptions.toggle();"><i class="ff ff-load-balancer"></i></button>
+          </span>
+        </div>
+      </div>
+      <div pf-form-group pf-label="{{'Show Refresh Button'|translate}}">
+        <input bs-switch
+               ng-model="vm.modalData.show_refresh_button"
+               type="checkbox"
+               switch-on-text="{{'Yes'|translate}}"
+               switch-off-text="{{'No'|translate }}"/>
+      </div>
+      <div pf-form-group pf-label="{{'Show Past Dates'|translate}}">
+        <input bs-switch
+               ng-model="vm.modalData.options.show_past_dates"
+               type="checkbox"
+               switch-on-text="{{'Yes'|translate}}"
+               switch-off-text="{{'No'|translate}}">
+      </div>
+      <dialog-editor-modal-field-template template="fields-to-refresh.html"
+                                          modal-data="vm.modalData">
+      </dialog-editor-modal-field-template>
+    </div>
+
+    <div pf-form-group pf-label="{{'Required'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.required"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+
+    <dialog-editor-tree-selector ng-if="vm.treeOptions.show"
+                                 tree-options="vm.treeOptions">
+    </dialog-editor-tree-selector>
+  </form>
+</div>
+<div ng-if="vm.modalTabIsSet('overridable') && vm.modalData.dynamic">
+  <form class="form-horizontal">
+    <div pf-form-group pf-label="{{'Read only'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.read_only"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+    <div pf-form-group pf-label="{{'Visible'|translate}}">
+      <input bs-switch
+             ng-model="vm.modalData.visible"
+             type="checkbox"
+             switch-on-text="{{'Yes'|translate}}"
+             switch-off-text="{{'No'|translate}}">
+    </div>
+  </form>
+</div>
diff --git a/src/dialog-editor/components/modal-field-template/date-time-control.html b/src/dialog-editor/components/modal-field-template/date-time-control.html
index badefb8f65..d55927a160 100644
--- a/src/dialog-editor/components/modal-field-template/date-time-control.html
+++ b/src/dialog-editor/components/modal-field-template/date-time-control.html
@@ -7,6 +7,29 @@
              switch-on-text="{{'Yes'|translate}}"
              switch-off-text="{{'No'|translate}}">
     </div>
+    <div pf-form-group pf-label="{{'Default value'|translate}}">
+      <div class="dateTimePadding">
+        <p class="input-group">
+          <input uib-datepicker-popup="MM/dd/yyyy"
+                 type="text"
+                 class="form-control"
+                 ng-model="vm.modalData.default_value"
+                 is-open="open"
+                 min-date="vm.minDate"
+                 close-text="{{'Close'|translate}}"
+                 id="{{ vm.dialogField.name }}"/>
+          <span class="input-group-btn">
+            <button type="button"
+                    class="btn btn-default"
+                    ng-click="open = !open">
+              <i class="fa fa-calendar"></i></button>
+          </span>
+        </p>
+      </div>
+      <div >
+        <uib-timepicker ng-model="vm.modalData.default_value"></uib-timepicker>
+      </div>
+    </div>
     <div pf-form-group pf-label="{{'Read only'|translate}}">
       <input bs-switch
              ng-model="vm.modalData.read_only"
diff --git a/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts b/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts
index 1b11936040..520f421f33 100644
--- a/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts
+++ b/src/dialog-editor/components/modal-field-template/modalFieldTemplateComponent.ts
@@ -12,7 +12,8 @@ class ModalFieldController {
   public readonly DROPDOWN_ENTRY_DESCRIPTION: number = 1;
 
   /*@ngInject*/
-  constructor(private $scope, private $element: any) {
+  constructor(private $scope,
+              private $element: any) {
     // Rules for Drag&Drop sorting of values in a Dropdown element
     this.sortableOptionsValues = {
       axis: 'y',
diff --git a/src/dialog-editor/components/modal-field/field.html b/src/dialog-editor/components/modal-field/field.html
index 7934053d34..3060b70fba 100644
--- a/src/dialog-editor/components/modal-field/field.html
+++ b/src/dialog-editor/components/modal-field/field.html
@@ -76,7 +76,7 @@ <h4 class="modal-title" id="myModalLabel" translate>Edit Field Details</h4>
                                         modal-data="vm.modalData">
     </dialog-editor-modal-field-template>
     <dialog-editor-modal-field-template ng-switch-when="DialogFieldDateControl"
-                                        template="date-time-control.html"
+                                        template="date-control.html"
                                         show-fully-qualified-name="vm.showFullyQualifiedName"
                                         tree-options="vm.treeOptions"
                                         modal-tab-is-set="vm.modalTabIsSet"