diff --git a/workflow/engine/methods/tracker/tracker_DynaDocs.php b/workflow/engine/methods/tracker/tracker_DynaDocs.php
index 5a7ab49c1..1df85a841 100755
--- a/workflow/engine/methods/tracker/tracker_DynaDocs.php
+++ b/workflow/engine/methods/tracker/tracker_DynaDocs.php
@@ -66,5 +66,44 @@ if ($noShowTitle == 0) {
 $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_DynaDocs', $oProcessMap->getCaseTrackerObjectsCriteria( $_SESSION['PROCESS'] ), array ('VIEW' => G::LoadTranslation( 'ID_VIEW' )
 ) );
 
-G::RenderPage( 'publish' );
+$bpmn = new ProcessMaker\Project\Bpmn();
+$flagIsBpmn = ($bpmn->exists($_SESSION["PROCESS"]))? true : false;
 
+if ($flagIsBpmn) {
+    $urlTrackerProcessMap = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APPLICATION"] . "&tracker_designer=1";
+
+    $_SESSION["TRACKER_JAVASCRIPT"] = "
+        <script type=\"text/javascript\">
+            var winTracker;
+
+            if ((navigator.userAgent.indexOf(\"MSIE\") != -1) || (navigator.userAgent.indexOf(\"Trident\") != -1)) {
+                var li1 = document.getElementById(\"MAP\");
+                var a1 = li1.getElementsByTagName(\"a\");
+                a1[0].onclick = function () {
+                    winTracker = window.open(\"$urlTrackerProcessMap\", \"winTracker\");
+                    li1.className = \"SelectedMenu\";
+                    li2.className = \"mainMenu\";
+                    li3.className = \"mainMenu\";
+                    li4.className = \"mainMenu\";
+                    document.getElementById(\"trackerContainer\").innerHTML = \"\";
+                    
+                    return false;
+                };
+
+                var li2 = document.getElementById(\"DYNADOC\");
+                var a2= li2.getElementsByTagName(\"a\");
+                a2[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+
+                var li3 = document.getElementById(\"HISTORY\");
+                var a3 = li3.getElementsByTagName(\"a\");
+                a3[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+
+                var li4 = document.getElementById(\"MESSAGES\");
+                var a4 = li4.getElementsByTagName(\"a\");
+                a4[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+            }
+        </script>
+    ";
+}
+
+G::RenderPage("publish");
diff --git a/workflow/engine/methods/tracker/tracker_History.php b/workflow/engine/methods/tracker/tracker_History.php
index f608d532d..6dd885292 100755
--- a/workflow/engine/methods/tracker/tracker_History.php
+++ b/workflow/engine/methods/tracker/tracker_History.php
@@ -62,5 +62,45 @@ if ($noShowTitle == 0) {
     $G_PUBLISH->AddContent( 'smarty', 'cases/cases_title', '', '', $aFields );
 }
 $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_TransferHistory', Cases::getTransferHistoryCriteria( $_SESSION['APPLICATION'] ), array () );
-G::RenderPage( 'publish' );
 
+$bpmn = new ProcessMaker\Project\Bpmn();
+$flagIsBpmn = ($bpmn->exists($_SESSION["PROCESS"]))? true : false;
+
+if ($flagIsBpmn) {
+    $urlTrackerProcessMap = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APPLICATION"] . "&tracker_designer=1";
+
+    $_SESSION["TRACKER_JAVASCRIPT"] = "
+        <script type=\"text/javascript\">
+            var winTracker;
+
+            if ((navigator.userAgent.indexOf(\"MSIE\") != -1) || (navigator.userAgent.indexOf(\"Trident\") != -1)) {
+                var li1 = document.getElementById(\"MAP\");
+                var a1 = li1.getElementsByTagName(\"a\");
+                a1[0].onclick = function () {
+                    winTracker = window.open(\"$urlTrackerProcessMap\", \"winTracker\");
+                    li1.className = \"SelectedMenu\";
+                    li2.className = \"mainMenu\";
+                    li3.className = \"mainMenu\";
+                    li4.className = \"mainMenu\";
+                    document.getElementById(\"trackerContainer\").innerHTML = \"\";
+                    
+                    return false;
+                };
+
+                var li2 = document.getElementById(\"DYNADOC\");
+                var a2= li2.getElementsByTagName(\"a\");
+                a2[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+
+                var li3 = document.getElementById(\"HISTORY\");
+                var a3 = li3.getElementsByTagName(\"a\");
+                a3[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+
+                var li4 = document.getElementById(\"MESSAGES\");
+                var a4 = li4.getElementsByTagName(\"a\");
+                a4[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+            }
+        </script>
+    ";
+}
+
+G::RenderPage("publish");
diff --git a/workflow/engine/methods/tracker/tracker_Messages.php b/workflow/engine/methods/tracker/tracker_Messages.php
index 9da5bfbd2..587437fbe 100755
--- a/workflow/engine/methods/tracker/tracker_Messages.php
+++ b/workflow/engine/methods/tracker/tracker_Messages.php
@@ -64,5 +64,45 @@ if ($noShowTitle == 0) {
 }
 $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'tracker/tracker_Messages', Cases::getHistoryMessagesTracker( $_SESSION['APPLICATION'] ), array ('VIEW' => G::LoadTranslation( 'ID_VIEW' )
 ) );
-G::RenderPage( 'publish' );
 
+$bpmn = new ProcessMaker\Project\Bpmn();
+$flagIsBpmn = ($bpmn->exists($_SESSION["PROCESS"]))? true : false;
+
+if ($flagIsBpmn) {
+    $urlTrackerProcessMap = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APPLICATION"] . "&tracker_designer=1";
+
+    $_SESSION["TRACKER_JAVASCRIPT"] = "
+        <script type=\"text/javascript\">
+            var winTracker;
+
+            if ((navigator.userAgent.indexOf(\"MSIE\") != -1) || (navigator.userAgent.indexOf(\"Trident\") != -1)) {
+                var li1 = document.getElementById(\"MAP\");
+                var a1 = li1.getElementsByTagName(\"a\");
+                a1[0].onclick = function () {
+                    winTracker = window.open(\"$urlTrackerProcessMap\", \"winTracker\");
+                    li1.className = \"SelectedMenu\";
+                    li2.className = \"mainMenu\";
+                    li3.className = \"mainMenu\";
+                    li4.className = \"mainMenu\";
+                    document.getElementById(\"trackerContainer\").innerHTML = \"\";
+                    
+                    return false;
+                };
+
+                var li2 = document.getElementById(\"DYNADOC\");
+                var a2= li2.getElementsByTagName(\"a\");
+                a2[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+
+                var li3 = document.getElementById(\"HISTORY\");
+                var a3 = li3.getElementsByTagName(\"a\");
+                a3[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+
+                var li4 = document.getElementById(\"MESSAGES\");
+                var a4 = li4.getElementsByTagName(\"a\");
+                a4[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+            }
+        </script>
+    ";
+}
+
+G::RenderPage("publish");
diff --git a/workflow/engine/methods/tracker/tracker_ViewMap.php b/workflow/engine/methods/tracker/tracker_ViewMap.php
index 013e3c772..a7a531507 100755
--- a/workflow/engine/methods/tracker/tracker_ViewMap.php
+++ b/workflow/engine/methods/tracker/tracker_ViewMap.php
@@ -59,7 +59,7 @@ while ($ds->next()) {
     $row = $ds->getRow();
     $bpmnProjects[] = $row['PRJ_UID'];
 }
-        
+
 switch (($aCaseTracker['CT_MAP_TYPE'])) {
     case 'NONE':
         //Nothing
@@ -71,11 +71,48 @@ switch (($aCaseTracker['CT_MAP_TYPE'])) {
         $aFields = $oCase->loadCase( $_SESSION['APPLICATION'] );
         if (in_array($aFields['PRO_UID'], $bpmnProjects)) {
             //bpmb
-            $_SESSION["APP_UID"] = $aFields["APP_UID"];
+            $_SESSION["APPLICATION"] = $aFields["APP_UID"];
             $G_PUBLISH = new Publisher();
             $G_PUBLISH->AddContent( 'view', 'tracker/viewMap' );
-            G::RenderPage( 'publish' );
+
+            $urlTrackerProcessMap = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APPLICATION"] . "&tracker_designer=1";
+
+            $_SESSION["TRACKER_JAVASCRIPT"] = "
+                <script type=\"text/javascript\">
+                    var winTracker;
+
+                    if ((navigator.userAgent.indexOf(\"MSIE\") != -1) || (navigator.userAgent.indexOf(\"Trident\") != -1)) {
+                        var li1 = document.getElementById(\"MAP\");
+                        var a1 = li1.getElementsByTagName(\"a\");
+                        a1[0].onclick = function () {
+                            winTracker = window.open(\"$urlTrackerProcessMap\", \"winTracker\");
+                            li1.className = \"SelectedMenu\";
+                            li2.className = \"mainMenu\";
+                            li3.className = \"mainMenu\";
+                            li4.className = \"mainMenu\";
+                            document.getElementById(\"trackerContainer\").innerHTML = \"\";
+                            
+                            return false;
+                        };
+
+                        var li2 = document.getElementById(\"DYNADOC\");
+                        var a2= li2.getElementsByTagName(\"a\");
+                        a2[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+
+                        var li3 = document.getElementById(\"HISTORY\");
+                        var a3 = li3.getElementsByTagName(\"a\");
+                        a3[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+
+                        var li4 = document.getElementById(\"MESSAGES\");
+                        var a4 = li4.getElementsByTagName(\"a\");
+                        a4[0].onclick = function () { if (winTracker) { winTracker.close(); } };
+                    }
+                </script>
+            ";
+
+            G::RenderPage("publish");
             //note: url processmap "../designer?prj_uid=$_SESSION['PROCESS']&prj_readonly=true&app_uid=$_SESSION['APP_UID']"
+
             break;
         }
         if (isset( $aFields['TITLE'] )) {
@@ -246,9 +283,8 @@ switch (($aCaseTracker['CT_MAP_TYPE'])) {
           }.extend(this);
 
           rpcRequest.make();
-          
+
         });' );
         G::RenderPage( 'publish' );
         break;
 }
-
diff --git a/workflow/engine/skinEngine/neoclassic/layout.html b/workflow/engine/skinEngine/neoclassic/layout.html
index 1f5ad976c..4bf5c4c9a 100644
--- a/workflow/engine/skinEngine/neoclassic/layout.html
+++ b/workflow/engine/skinEngine/neoclassic/layout.html
@@ -59,10 +59,16 @@
           <td>
             <table width="100%" cellspacing="0" cellpadding="0" border="0" >
               <tr>
-                <td width="100%" align="center">
+                <td {php} if (isset($_SESSION["TRACKER_JAVASCRIPT"])) { echo "id=\"trackerContainer\""; } {/php} width="100%" align="center">
                   {php}
                   global $G_TEMPLATE;
                   if ($G_TEMPLATE != '') G::LoadTemplate($G_TEMPLATE);
+                  
+                  if (isset($_SESSION["TRACKER_JAVASCRIPT"])) {
+                      echo $_SESSION["TRACKER_JAVASCRIPT"];
+
+                      unset($_SESSION["TRACKER_JAVASCRIPT"]);
+                  } 
                   {/php}
                 </td>
               </tr>
diff --git a/workflow/engine/templates/tracker/viewMap.php b/workflow/engine/templates/tracker/viewMap.php
index 845e4c5d3..d4600b2c0 100644
--- a/workflow/engine/templates/tracker/viewMap.php
+++ b/workflow/engine/templates/tracker/viewMap.php
@@ -1,44 +1,12 @@
 <?php
-$url = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APP_UID"] . "&tracker_designer=1";
+$urlTrackerProcessMap = "../designer?prj_uid=" . $_SESSION["PROCESS"] . "&prj_readonly=true&app_uid=" . $_SESSION["APPLICATION"] . "&tracker_designer=1";
 ?>
 
 <script type="text/javascript">
     var winTracker;
 
-    if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
-        var li1 = document.getElementById("MAP");
-        var a1 = li1.getElementsByTagName("a");
-        a1[0].href = "javascript:;";
-        a1[0].onclick = function () { winTracker = window.open("<?php echo $url; ?>", "winTracker"); return false; };
-
-        var li2 = document.getElementById("DYNADOC");
-        var a2= li2.getElementsByTagName("a");
-        a2[0].onclick = function ()
-        {
-            if (winTracker) {
-                winTracker.close();
-            }
-        };
-
-        var li3 = document.getElementById("HISTORY");
-        var a3 = li3.getElementsByTagName("a");
-        a3[0].onclick = function ()
-        {
-            if (winTracker) {
-                winTracker.close();
-            }
-        };
-
-        var li4 = document.getElementById("MESSAGES");
-        var a4 = li4.getElementsByTagName("a");
-        a4[0].onclick = function ()
-        {
-            if (winTracker) {
-                winTracker.close();
-            }
-        };
-    } else {
-        document.write("<iframe name=\"casesFrame\" id=\"casesFrame\" src=\"<?php echo $url; ?>\" width=\"99%\" height=\"768\" frameborder=\"0\">");
+    if (!(navigator.userAgent.indexOf("MSIE") != -1 || navigator.userAgent.indexOf("Trident") != -1)) {
+        document.write("<iframe name=\"casesFrame\" id=\"casesFrame\" src=\"<?php echo $urlTrackerProcessMap; ?>\" width=\"99%\" height=\"768\" frameborder=\"0\">");
         document.write("<p>Your browser does not support iframes.</p>");
         document.write("</iframe>");
     }