diff --git a/workflow/engine/templates/strategicDashboard/formDashboard.js b/workflow/engine/templates/strategicDashboard/formDashboard.js
index 46df67957..b98ddf517 100644
--- a/workflow/engine/templates/strategicDashboard/formDashboard.js
+++ b/workflow/engine/templates/strategicDashboard/formDashboard.js
@@ -503,7 +503,7 @@ Ext.onReady( function() {
         enableTabScroll : true,
         //anchor          : '98%',
         width           : '100%',
-        height          : 260,
+        height          : 160,
         defaults        : {
             autoScroll  :true
         },
@@ -733,7 +733,7 @@ var addTab = function (flag) {
         width       : "100%",
         items   : [
             new Ext.Panel({
-                height      : 230,
+                height      : 130,
                 width       : "100%",
                 border      : true,
                 bodyStyle   : 'padding:10px',
@@ -1156,12 +1156,12 @@ var saveAllIndicators = function (DAS_UID) {
 
             data[field] = value.trim();
         }
-        saveDashboardIndicator(data);
+        saveDashboardIndicator(data, fieldsTab[0].id);
     }
     window.location = 'dashboardList';
 };
 
-var saveDashboardIndicator = function (options) {
+var saveDashboardIndicator = function (options, id) {
     var data = {};
     data["DAS_UID"] = options['DAS_UID'];
     data["DAS_IND_TYPE"] = options['DAS_IND_TYPE'];
@@ -1184,7 +1184,7 @@ var saveDashboardIndicator = function (options) {
             },
             data: JSON.stringify(data),
             success: function (response) {
-                var jsonResp = Ext.util.JSON.decode(response.responseText);
+                Ext.getCmp(id).setValue(response);
             },
             failure: function (response) {
                 var jsonResp = Ext.util.JSON.decode(response.responseText);
diff --git a/workflow/engine/templates/strategicDashboard/load.php b/workflow/engine/templates/strategicDashboard/load.php
index 695f2c37f..04958ff1c 100644
--- a/workflow/engine/templates/strategicDashboard/load.php
+++ b/workflow/engine/templates/strategicDashboard/load.php
@@ -31,21 +31,41 @@
         var oClientWinSize = getClientWindowSize();
 
         var autoResizeScreen = function () {
+            var dashboardFrame;
+            var containerList1, containerList2;
 
-            dashboardFrame    = document.getElementById('dashboardFrame');
-            if (dashboardFrame) {
-                height = getClientWindowSize().height-90;
-                if (typeof dashboardFrame.style != 'undefined') {
-                    dashboardFrame.style.height = height;
-                }
-                if (typeof dashboardFrame.contentWindow.document != 'undefined') {
-                    dashboardFrame = dashboardFrame.contentWindow.document.getElementById('dashboardFrame');
-                    if (dashboardFrame && typeof dashboardFrame.style != 'undefined') {
-                        dashboardFrame.style.height = height-5;
-                    }
+            dashboardFrame = document.getElementById('dashboardFrame');
+
+            containerList1 = document.getElementById("pm_header");
+            if (document.getElementById("mainMenuBG") &&
+                document.getElementById("mainMenuBG").parentNode &&
+                document.getElementById("mainMenuBG").parentNode.parentNode &&
+                document.getElementById("mainMenuBG").parentNode.parentNode.parentNode &&
+                document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode
+            ){
+                containerList2 = document.getElementById("mainMenuBG").parentNode.parentNode.parentNode.parentNode;
+            }
+            if (containerList1 === containerList2) {
+                height = oClientWinSize.height - containerList1.clientHeight;
+                dashboardFrame.style.height = height;
+                if (dashboardFrame.height ) {
+                    dashboardFrame.height = height;
                 }
             } else {
-                setTimeout('autoResizeScreen()', 2000);
+                if (dashboardFrame) {
+                    height = getClientWindowSize().height-90;
+                    if (typeof dashboardFrame.style != 'undefined') {
+                        dashboardFrame.style.height = height;
+                    }
+                    if (typeof dashboardFrame.contentWindow.document != 'undefined') {
+                        dashboardFrame = dashboardFrame.contentWindow.document.getElementById('dashboardFrame');
+                        if (dashboardFrame && typeof dashboardFrame.style != 'undefined') {
+                            dashboardFrame.style.height = height-5;
+                        }
+                    }
+                } else {
+                    setTimeout('autoResizeScreen()', 2000);
+                }
             }
         }
     </script>