diff --git a/Rakefile b/Rakefile
index 8c314a6fc..e66aa1033 100644
--- a/Rakefile
+++ b/Rakefile
@@ -230,7 +230,8 @@ def buildMafe(homeDir, targetDir, mode)
         "#{homeDir}/build/js/designer.js" => "#{mafeDir}/designer.min.js",
         "#{homeDir}/build/js/mafe.js" => "#{mafeDir}/mafe.min.js",
         "#{homeDir}/build/css/mafe.css" => "#{mafeDir}/mafe.min.css",
-        "#{homeDir}/img/*.*" => "#{imgTargetDir}"
+        "#{homeDir}/img/*.*" => "#{imgTargetDir}",
+        "#{targetDir}/../lib-dev/pmUI/images/*.*" => "#{imgTargetDir}"
     })
 
     puts "\nCopying lib files into: #{jsTargetDir}".bold
diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php
index 9f6cf0dc3..a6e6806be 100644
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -87,21 +87,8 @@ class pmDynaform
                         $json->$key = $this->app_data[$triggerValue];
                     }
                 }
-                //data
-                if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown")) {
-                    $json->data = array(
-                        "value" => isset($this->data[$json->name]) ? $this->data[$json->name] : "",
-                        "label" => isset($this->data[$json->name . "_label"]) ? $this->data[$json->name . "_label"] : ""
-                    );
-                }
-                if ($key === "type" && ($value === "suggets")) {
-                    $json->data = array(
-                        "value" => isset($this->data[$json->name . "_label"]) ? $this->data[$json->name . "_label"] : "",
-                        "label" => isset($this->data[$json->name]) ? $this->data[$json->name] : ""
-                    );
-                }
                 //query & options
-                if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown" || $value === "suggest")) {
+                if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown" || $value === "suggest" || $value === "checkbox" || $value === "radio")) {
                     if (!isset($json->dbConnection))
                         $json->dbConnection = "none";
                     if (!isset($json->sql))
@@ -120,9 +107,24 @@ class pmDynaform
                             );
                             array_push($json->options, $option);
                         }
-                        $json->data = isset($json->options[0]) ? $json->options[0] : $json->data;
+                        if (isset($json->options[0])) {
+                            $json->data = $json->options[0];
+                        }
                     }
                 }
+                //data
+                if ($key === "type" && ($value === "text" || $value === "textarea" || $value === "dropdown" || $value === "checkbox" || $value === "radio")) {
+                    $json->data = array(
+                        "value" => isset($this->data[$json->name]) ? $this->data[$json->name] : "",
+                        "label" => isset($this->data[$json->name . "_label"]) ? $this->data[$json->name . "_label"] : ""
+                    );
+                }
+                if ($key === "type" && ($value === "suggest")) {
+                    $json->data = array(
+                        "value" => isset($this->data[$json->name . "_label"]) ? $this->data[$json->name . "_label"] : "",
+                        "label" => isset($this->data[$json->name]) ? $this->data[$json->name] : ""
+                    );
+                }
                 //grid
                 if ($key === "type" && ($value === "grid")) {
                     if (isset($this->data[$json->name])) {
@@ -191,6 +193,7 @@ class pmDynaform
                 "var credentials = " . G::json_encode($clientToken) . ";\n" .
                 "var filePost = null;\n" .
                 "var fieldsRequired = null;\n" .
+                "var triggerDebug = null;\n" .
                 "$(window).load(function () {\n" .
                 "    var data = jsondata;\n" .
                 "    data.items[0].mode = 'view';\n" .
@@ -221,6 +224,7 @@ class pmDynaform
 
     public function printEdit($pm_run_outside_main_app, $application, $headData, $step_mode = 'EDIT')
     {
+        error_log(print_r($this->app_data, true));
         ob_clean();
         $json = G::json_decode($this->record["DYN_CONTENT"]);
         $this->jsonr($json);
@@ -242,6 +246,7 @@ class pmDynaform
                 "var credentials = " . G::json_encode($this->credentials) . ";\n" .
                 "var filePost = null;\n" .
                 "var fieldsRequired = null;\n" .
+                "var triggerDebug = " . ($this->app_data["TRIGGER_DEBUG"] === 1 ? "true" : "false") . ";\n" .
                 "</script>\n" .
                 "<script type='text/javascript' src='/jscore/cases/core/cases_Step.js'></script>\n" .
                 "<script type='text/javascript' src='/jscore/cases/core/pmDynaform.js'></script>\n" .
@@ -282,6 +287,7 @@ class pmDynaform
                 "var credentials = " . G::json_encode($this->credentials) . ";\n" .
                 "var filePost = '" . $filename . "';\n" .
                 "var fieldsRequired = " . G::json_encode($this->arrayFieldRequired) . ";\n" .
+                "var triggerDebug = null;\n" .
                 "</script>\n" .
                 "<script type='text/javascript' src='/jscore/cases/core/pmDynaform.js'></script>\n" .
                 "<div style='width:100%;padding: 0px 10px 0px 10px;margin:15px 0px 0px 0px;'>\n" .
@@ -387,7 +393,7 @@ class pmDynaform
     {
         if ($this->debugMode) {
             echo "<pre>";
-            echo G::json_encode($json);
+            echo G::json_encode(array($this->app_data, $this->data));
             echo "</pre>";
         }
     }
diff --git a/workflow/engine/js/cases/core/pmDynaform.js b/workflow/engine/js/cases/core/pmDynaform.js
index befaa4abd..bc6ddf189 100644
--- a/workflow/engine/js/cases/core/pmDynaform.js
+++ b/workflow/engine/js/cases/core/pmDynaform.js
@@ -75,4 +75,7 @@ $(window).load(function () {
         form.submit();
         return false;
     };
+    if (triggerDebug === true) {
+        showdebug();
+    }
 });
\ No newline at end of file
diff --git a/workflow/engine/methods/cases/cases_Step.php b/workflow/engine/methods/cases/cases_Step.php
index 5daf495cc..6ee2a1c8d 100755
--- a/workflow/engine/methods/cases/cases_Step.php
+++ b/workflow/engine/methods/cases/cases_Step.php
@@ -272,6 +272,7 @@ try {
             $a = new pmDynaform($_GET['UID'], $Fields['APP_DATA']);
             if ($a->isResponsive()) {
                 $a->app_data["PRO_SHOW_MESSAGE"] = $noShowTitle;
+                $a->app_data["TRIGGER_DEBUG"] = $_SESSION['TRIGGER_DEBUG']['ISSET'];
                 $a->printEdit((!isset($_SESSION["PM_RUN_OUTSIDE_MAIN_APP"])) ? "true" : "false", $_SESSION['APPLICATION'], $array, $oStep->getStepMode());
             } else {
                 $G_PUBLISH->AddContent('dynaform', 'xmlform', $_SESSION['PROCESS'] . '/' . $_GET['UID'], '', $Fields['APP_DATA'], 'cases_SaveData?UID=' . $_GET['UID'] . '&APP_UID=' . $_SESSION['APPLICATION'], '', (strtolower($oStep->getStepMode()) != 'edit' ? strtolower($oStep->getStepMode()) : ''));