diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js
old mode 100755
new mode 100644
diff --git a/gulliver/js/maborak/core/maborak.loader.js b/gulliver/js/maborak/core/maborak.loader.js
old mode 100755
new mode 100644
diff --git a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin_src.js b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin_src.js
index 932696556..30b1c4d7b 100755
--- a/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin_src.js
+++ b/gulliver/js/tinymce/jscripts/tiny_mce/plugins/pmVariablePicker/editor_plugin_src.js
@@ -5,9 +5,8 @@
 (function(){
     var strPluginURL;
     tinymce.create('tinymce.plugins.pmVariablePickerPlugin', {
-    	
     	init: function(ed, url) 
-        {
+        {   
             strPluginURL = url;                                         // store the URL for future use..
             ed.addCommand('mcepmVariablePicker', function() {
                 pmVariablePicker();              
@@ -33,22 +32,31 @@
 // in the latter case, win and type will be set.. In the rist case, we will just update the main editor window
 // with the path of the uploaded file
 function pmVariablePicker(field_name, url, type, win) {    
-	var strPluginPath  = tinyMCE.activeEditor.plugins.pmVariablePicker.getPluginURL();                               // get the path to the uploader plugin    
+    
+    var uloc=String(location);
+    //alert(uloc);
+    var new_text = uloc.split('/');
+    var loc='/'+new_text[3]+'/'+new_text[4]+'/'+new_text[5]+'/controls/varsAjax?displayOption=tinyMCE&sSymbol=@@';
+    
+    var strPluginPath  = tinyMCE.activeEditor.plugins.pmVariablePicker.getPluginURL();                               // get the path to the uploader plugin    
     var strUploaderURL = strPluginPath + "/uploader.php";                                                           // generate the path to the uploader script    
     var strUploadPath  = tinyMCE.activeEditor.getParam('plugin_pmVariablePicker_upload_path');                       // get the relative upload path
     var strSubstitutePath = tinyMCE.activeEditor.getParam('plugin_pmVariablePicker_upload_substitute_path');        // get the path we'll substitute for the for the upload path (i.e. fully qualified)
-
+    
     if (strUploaderURL.indexOf("?") < 0){                                                                            // if we were called without any GET params
         strUploaderURL = strUploaderURL + "?type=" + type + "&d=" + strUploadPath + "&subs=" + strSubstitutePath;   // add our own params 
     } else {
         strUploaderURL = strUploaderURL + "&type=" + type + "&d=" + strUploadPath + "&subs=" + strSubstitutePath;
     }
+    //tinyMCE.activeEditor.anyVariable='path/to/ProcessMaker' 
     tinyMCE.activeEditor.windowManager.open({                                                                       // open the plugin popup
-        file 		: '/sysworkflow/en/classic/controls/varsAjax?displayOption=tinyMCE&sSymbol=@@',
-    	title           : 'Upload Variable',
-        width           : '400px',
-        height          : '350px',
+        //file 		: '/sysworkflow/en/classic/controls/varsAjax?displayOption=tinyMCE&sSymbol=@@',
+        file            : loc,
+        title           : 'Upload Variable',
+        width           : '600px',
+        height          : '330px',
         resizable       : "yes",
+        scrollbars      : "no",
         overflow        : false,
         inline          : 1,        // This parameter only has an effect if you use the inlinepopups plugin!
         close_previous  : "no"
@@ -56,7 +64,7 @@ function pmVariablePicker(field_name, url, type, win) {
         window : win,
         input : field_name
     });
-  
+
     return false;
 }
 // This function will get called when the uploader is done uploading the file and ready to update
@@ -67,10 +75,10 @@ function closePluginPopup(){
 }
 
 function updateEditorContent(serializedHTML){
-	tinyMCE.activeEditor.execCommand('mceInsertContent', false, serializedHTML);
+    tinyMCE.activeEditor.execCommand('mceInsertContent', false, serializedHTML);
 }
 
 function insertFormVar(fieldName,serializedHTML){
-	tinyMCE.activeEditor.execCommand('mceInsertContent', false, serializedHTML);
-        closePluginPopup();
+    tinyMCE.activeEditor.execCommand('mceInsertContent', false, serializedHTML);
+    closePluginPopup();
 }
\ No newline at end of file
diff --git a/workflow/engine/methods/controls/varsAjax.php b/workflow/engine/methods/controls/varsAjax.php
index 33a25cf20..e048623c5 100755
--- a/workflow/engine/methods/controls/varsAjax.php
+++ b/workflow/engine/methods/controls/varsAjax.php
@@ -21,10 +21,13 @@
  * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
  * Coral Gables, FL, 33134, USA, or email info@colosa.com.
  */
+$_SERVER["QUERY_STRING"] = isset($_SERVER["QUERY_STRING"])?$_SERVER["QUERY_STRING"]:'';
+$_POST["sProcess"] = isset($_POST["sProcess"])?$_POST["sProcess"]:'';
+$_POST["sFieldName"] = isset($_POST["sFieldName"])?$_POST["sFieldName"]:'';
+$_POST['sSymbol']= isset($_POST["sSymbol"])?$_POST["sSymbol"]:'';
+
 $html = '<form action="uploader.php?'.$_SERVER["QUERY_STRING"].'&q=upload" onLoad="onLoad()" method="post" enctype="multipart/form-data" onsubmit="">';
-
 $html .= '<div id="d_variables">';
-
 $html .= '<table width="90%" align="center">';
 
 $html .= '<tr style="display:none; visibility:hidden;">';
diff --git a/workflow/engine/methods/triggers/triggers_CreateWizard.php b/workflow/engine/methods/triggers/triggers_CreateWizard.php
index b9c474b0b..56731f127 100755
--- a/workflow/engine/methods/triggers/triggers_CreateWizard.php
+++ b/workflow/engine/methods/triggers/triggers_CreateWizard.php
@@ -43,7 +43,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:550,h:675},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/methods/triggers/triggers_EditWizard.php b/workflow/engine/methods/triggers/triggers_EditWizard.php
index 5df3e57fc..db948069c 100755
--- a/workflow/engine/methods/triggers/triggers_EditWizard.php
+++ b/workflow/engine/methods/triggers/triggers_EditWizard.php
@@ -48,7 +48,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:550,h:675},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/dynaforms/dynaforms_AssignVariables.xml b/workflow/engine/xmlform/dynaforms/dynaforms_AssignVariables.xml
index 594710133..e87b8a078 100755
--- a/workflow/engine/xmlform/dynaforms/dynaforms_AssignVariables.xml
+++ b/workflow/engine/xmlform/dynaforms/dynaforms_AssignVariables.xml
@@ -75,7 +75,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:400,h:600},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/inputdocs/inputdocs_Edit.xml b/workflow/engine/xmlform/inputdocs/inputdocs_Edit.xml
index 52c893df0..a3ac665bf 100755
--- a/workflow/engine/xmlform/inputdocs/inputdocs_Edit.xml
+++ b/workflow/engine/xmlform/inputdocs/inputdocs_Edit.xml
@@ -38,9 +38,9 @@
   <en>Tags</en>
 </INP_DOC_TAGS>
 
-<BTN_CANCEL type="button" onclick="cancel();">
-  <en>Cancel</en>
-</BTN_CANCEL>
+<BTN_CANCEL type="button" onclick="cancel();">
+  <en>Cancel</en>
+</BTN_CANCEL>
 
 <ACCEPT type="button" onclick="inputdocsSave( this.form );">
   <en>Save</en>
@@ -48,74 +48,74 @@
 
 <JS type="javascript"><![CDATA[
 
-
-
-leimnud.event.add(getField('INP_DOC_FORM_NEEDED'), 'change', function() {
-  if (getField('INP_DOC_FORM_NEEDED').value == 'VIRTUAL') {
-    hideRow('INP_DOC_ORIGINAL');
-  }
-  else {
-    showRow('INP_DOC_ORIGINAL');
-  }
-});
-if (getField('INP_DOC_FORM_NEEDED').value == 'VIRTUAL') {
-  hideRow('INP_DOC_ORIGINAL');
-}
-
-var _oVarsPanel_;
-var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) {
-	_oVarsPanel_ = new leimnud.module.panel();
-	_oVarsPanel_.options = {
-    limit    : true,
-    size     : {w:400,h:410},
-    position : {x:0,y:0,center:true},
-    title    : '',
-    theme    : 'processmaker',
-    statusBar: false,
-    control  : {drag:false,resize:true,close:true},
-    fx       : {opacity:true,rolled:false,modal:true}
-  };
-  _oVarsPanel_.make();
-  _oVarsPanel_.events = {
-    remove:function() {
-      delete _oVarsPanel_;
-    }.extend(this)
-  };
-  _oVarsPanel_.loader.show();
-  oRPC = new leimnud.module.rpc.xmlhttp({
-    url   : sAjaxServer,
-    method: 'POST',
-    args  : 'sFieldName=' + sFieldName + '&sProcess=' + sProcess + '&sSymbol=' + sSymbol + '&sType=2'
-  });
-  oRPC.callback = function(oRPC) {
-    _oVarsPanel_.loader.hide();
-    var scs = oRPC.xmlhttp.responseText.extractScript();
-    _oVarsPanel_.addContent(oRPC.xmlhttp.responseText);
-    scs.evalScript();
-  }.extend(this);
-  oRPC.make();
-};
-
-var insertFormVar = function(sFieldName, sValue) {
-	oAux = document.getElementById(sFieldName);
-	if (oAux.setSelectionRange) {
-		var rangeStart = oAux.selectionStart;
-    var rangeEnd   = oAux.selectionEnd;
-    var tempStr1   = oAux.value.substring(0,rangeStart);
-    var tempStr2   = oAux.value.substring(rangeEnd);
-    oAux.value     = tempStr1 + sValue + tempStr2;
-	}
-	else {
-	  if (document.selection) {
-	    oAux.focus();
-      document.selection.createRange().text = sValue;
-	  }
-	}
-	_oVarsPanel_.remove();
-};
-
-function cancel(){
-    currentPopupWindow.remove();
+
+
+leimnud.event.add(getField('INP_DOC_FORM_NEEDED'), 'change', function() {
+  if (getField('INP_DOC_FORM_NEEDED').value == 'VIRTUAL') {
+    hideRow('INP_DOC_ORIGINAL');
+  }
+  else {
+    showRow('INP_DOC_ORIGINAL');
+  }
+});
+if (getField('INP_DOC_FORM_NEEDED').value == 'VIRTUAL') {
+  hideRow('INP_DOC_ORIGINAL');
+}
+
+var _oVarsPanel_;
+var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) {
+	_oVarsPanel_ = new leimnud.module.panel();
+	_oVarsPanel_.options = {
+    limit    : true,
+    size     : {w:600,h:420},
+    position : {x:0,y:0,center:true},
+    title    : '',
+    theme    : 'processmaker',
+    statusBar: false,
+    control  : {drag:false,resize:true,close:true},
+    fx       : {opacity:true,rolled:false,modal:true}
+  };
+  _oVarsPanel_.make();
+  _oVarsPanel_.events = {
+    remove:function() {
+      delete _oVarsPanel_;
+    }.extend(this)
+  };
+  _oVarsPanel_.loader.show();
+  oRPC = new leimnud.module.rpc.xmlhttp({
+    url   : sAjaxServer,
+    method: 'POST',
+    args  : 'sFieldName=' + sFieldName + '&sProcess=' + sProcess + '&sSymbol=' + sSymbol + '&sType=2'
+  });
+  oRPC.callback = function(oRPC) {
+    _oVarsPanel_.loader.hide();
+    var scs = oRPC.xmlhttp.responseText.extractScript();
+    _oVarsPanel_.addContent(oRPC.xmlhttp.responseText);
+    scs.evalScript();
+  }.extend(this);
+  oRPC.make();
+};
+
+var insertFormVar = function(sFieldName, sValue) {
+	oAux = document.getElementById(sFieldName);
+	if (oAux.setSelectionRange) {
+		var rangeStart = oAux.selectionStart;
+    var rangeEnd   = oAux.selectionEnd;
+    var tempStr1   = oAux.value.substring(0,rangeStart);
+    var tempStr2   = oAux.value.substring(rangeEnd);
+    oAux.value     = tempStr1 + sValue + tempStr2;
+	}
+	else {
+	  if (document.selection) {
+	    oAux.focus();
+      document.selection.createRange().text = sValue;
+	  }
+	}
+	_oVarsPanel_.remove();
+};
+
+function cancel(){
+    currentPopupWindow.remove();
 }
 ]]></JS>
 
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_New.xml b/workflow/engine/xmlform/outputdocs/outputdocs_New.xml
index 4fe549ad5..f00df950b 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_New.xml
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_New.xml
@@ -57,7 +57,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:400,h:600},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
index 076e91688..055be1be2 100755
--- a/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
+++ b/workflow/engine/xmlform/outputdocs/outputdocs_Properties.xml
@@ -119,7 +119,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
   _oVarsPanel_ = new leimnud.module.panel();
   _oVarsPanel_.options = {
     limit    : true,
-    size     : {w:400,h:410},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/patterns/patterns_Evaluate.xml b/workflow/engine/xmlform/patterns/patterns_Evaluate.xml
index 40ac11ba3..9e2900d5d 100755
--- a/workflow/engine/xmlform/patterns/patterns_Evaluate.xml
+++ b/workflow/engine/xmlform/patterns/patterns_Evaluate.xml
@@ -35,7 +35,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:350,h:400},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/patterns/patterns_ParallelByEvaluation.xml b/workflow/engine/xmlform/patterns/patterns_ParallelByEvaluation.xml
index b01e8cc88..444fda8f9 100755
--- a/workflow/engine/xmlform/patterns/patterns_ParallelByEvaluation.xml
+++ b/workflow/engine/xmlform/patterns/patterns_ParallelByEvaluation.xml
@@ -36,11 +36,8 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
 		limit : true,
-		size : {
-			w : 350,
-			h : 400
-		},
-		position : {
+		size     : {w:600,h:420},
+                position : {
 			x : 0,
 			y : 0,
 			center : true
diff --git a/workflow/engine/xmlform/processes/processes_subProcess.xml b/workflow/engine/xmlform/processes/processes_subProcess.xml
index f65bf93b9..5b4e9d0a6 100755
--- a/workflow/engine/xmlform/processes/processes_subProcess.xml
+++ b/workflow/engine/xmlform/processes/processes_subProcess.xml
@@ -40,134 +40,134 @@
   <en>Variables In</en>
 </SUBTITLE2>
 <grid2 type="grid" xmlgrid="processes/processes_subProcess_In" addrow="1" deleterow="1" mode="edit"/>
-
-<BTN_CANCEL type="button" onclick="cancel();">
-  <en>Cancel</en>
-</BTN_CANCEL>
+
+<BTN_CANCEL type="button" onclick="cancel();">
+  <en>Cancel</en>
+</BTN_CANCEL>
 
 <SAVE type="button" onclick="processes_subProcessSave(this.form);">
   <en>Save</en>
 </SAVE>
 
 <JS type="javascript"><![CDATA[
-
-if(getField('SP_SYNCHRONOUS').value!=1){
-hideRowById('SUBTITLE2')
-hideRowById('grid2');
-}
-leimnud.event.add(getField('SP_SYNCHRONOUS'), 'change', function() {
-  if (getField('SP_SYNCHRONOUS').value==1)
-	  { showRowById('grid1');
-	    showRowById('grid2');
-	    showRowById('SUBTITLE1');
-  	  showRowById('SUBTITLE2');
-	  }
-  else
-  	{ //hideRowById(grid1);
-  	  hideRowById('grid2');
-  	  //hideRowById(SUBTITLE1);
-  	  hideRowById('SUBTITLE2');
-  	}
- });
-
-var processes_subProcessSave = function(oForm) {
- //var a = getField('TASKS');
-  var a = getField('SPROCESS_NAME');
- ans = ajax_post('../processes/processes_checkProperties', oForm, 'POST');
- if(ans==1){
-  msgBox("@G::LoadTranslation(ID_ASSIGN_RULES)", "alert");
- return false;
- }
- ajax_post(oForm.action, oForm, 'POST');
-  //Pm.data.db.task[getField('INDEX').value].object.elements.label.innerHTML = a.options[a.selectedIndex].text;
-  Pm.data.db.task[getField('INDEX').value].object.elements.label.innerHTML = a.value;
-  Pm.tmp.subProcessPanel.remove();
-};
-
-//var dynaformOnload = function(){
-  /*var grid1 = getField('grid1');
-  var grid2 = getField('grid2');
-  var SUBTITLE1 = getField('SUBTITLE1');
-  var SUBTITLE2 = getField('SUBTITLE2');
-
-  if(getField('SP_SYNCHRONOUS').value==1)
-  	{ showRowById('grid1');
-  	  showRowById('grid2');
-  	  showRowById('SUBTITLE1');
-  	  showRowById('SUBTITLE2');
-  	}
-  else
-  	{
-  	  hideRowById('SUBTITLE2');
-  	  hideRowById(grid2);
-
-
-  	}*/
-//};
-
-
-
-var _oVarsPanel_;
-var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) {
-   if (sProcess == '') {
-     var sAux = getField('PROCESSES').options[getField('TASKS').selectedIndex].value;
-     var aAux = sAux.split('_');
-     sProcess = aAux[0];
-   }
-	_oVarsPanel_ = new leimnud.module.panel();
-	_oVarsPanel_.options = {
-    limit    : true,
-    size     : {w:400,h:600},
-    position : {x:0,y:0,center:true},
-    title    : '',
-    theme    : 'processmaker',
-    statusBar: false,
-    control  : {drag:false,resize:true,close:true},
-    fx       : {opacity:true,rolled:false,modal:true}
-  };
-  _oVarsPanel_.make();
-  _oVarsPanel_.events = {
-    remove:function() {
-      delete _oVarsPanel_;
-    }.extend(this)
-  };
-  _oVarsPanel_.loader.show();
-  oRPC = new leimnud.module.rpc.xmlhttp({
-    url   : sAjaxServer,
-    method: 'POST',
-    args  : 'sFieldName=' + sFieldName + '&sProcess=' + sProcess + '&sSymbol=' + sSymbol + '&sNoShowLeyend=1&bIncMulSelFields=1'
-  });
-  oRPC.callback = function(oRPC) {
-    _oVarsPanel_.loader.hide();
-    var scs = oRPC.xmlhttp.responseText.extractScript();
-    _oVarsPanel_.addContent(oRPC.xmlhttp.responseText);
-    scs.evalScript();
-  }.extend(this);
-  oRPC.make();
-};
-
-var insertFormVar = function(sFieldName, sValue) {
-	oAux = document.getElementById(sFieldName);
-	if (oAux.setSelectionRange) {
-	  oAux.value     = '';
-		var rangeStart = oAux.selectionStart;
-    var rangeEnd   = oAux.selectionEnd;
-    var tempStr1   = oAux.value.substring(0,rangeStart);
-    var tempStr2   = oAux.value.substring(rangeEnd);
-    oAux.value     = tempStr1 + sValue + tempStr2;
-	}
-	else {
-	  if (document.selection) {
-	    oAux.focus();
-      document.selection.createRange().text = sValue;
-	  }
-	}
-	_oVarsPanel_.remove();
-};
-
-function cancel(){
-    Pm.tmp.subProcessPanel.remove();
-}
+
+if(getField('SP_SYNCHRONOUS').value!=1){
+hideRowById('SUBTITLE2')
+hideRowById('grid2');
+}
+leimnud.event.add(getField('SP_SYNCHRONOUS'), 'change', function() {
+  if (getField('SP_SYNCHRONOUS').value==1)
+	  { showRowById('grid1');
+	    showRowById('grid2');
+	    showRowById('SUBTITLE1');
+  	  showRowById('SUBTITLE2');
+	  }
+  else
+  	{ //hideRowById(grid1);
+  	  hideRowById('grid2');
+  	  //hideRowById(SUBTITLE1);
+  	  hideRowById('SUBTITLE2');
+  	}
+ });
+
+var processes_subProcessSave = function(oForm) {
+ //var a = getField('TASKS');
+  var a = getField('SPROCESS_NAME');
+ ans = ajax_post('../processes/processes_checkProperties', oForm, 'POST');
+ if(ans==1){
+  msgBox("@G::LoadTranslation(ID_ASSIGN_RULES)", "alert");
+ return false;
+ }
+ ajax_post(oForm.action, oForm, 'POST');
+  //Pm.data.db.task[getField('INDEX').value].object.elements.label.innerHTML = a.options[a.selectedIndex].text;
+  Pm.data.db.task[getField('INDEX').value].object.elements.label.innerHTML = a.value;
+  Pm.tmp.subProcessPanel.remove();
+};
+
+//var dynaformOnload = function(){
+  /*var grid1 = getField('grid1');
+  var grid2 = getField('grid2');
+  var SUBTITLE1 = getField('SUBTITLE1');
+  var SUBTITLE2 = getField('SUBTITLE2');
+
+  if(getField('SP_SYNCHRONOUS').value==1)
+  	{ showRowById('grid1');
+  	  showRowById('grid2');
+  	  showRowById('SUBTITLE1');
+  	  showRowById('SUBTITLE2');
+  	}
+  else
+  	{
+  	  hideRowById('SUBTITLE2');
+  	  hideRowById(grid2);
+
+
+  	}*/
+//};
+
+
+
+var _oVarsPanel_;
+var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) {
+   if (sProcess == '') {
+     var sAux = getField('PROCESSES').options[getField('TASKS').selectedIndex].value;
+     var aAux = sAux.split('_');
+     sProcess = aAux[0];
+   }
+	_oVarsPanel_ = new leimnud.module.panel();
+	_oVarsPanel_.options = {
+    limit    : true,
+    size     : {w:600,h:420},
+    position : {x:0,y:0,center:true},
+    title    : '',
+    theme    : 'processmaker',
+    statusBar: false,
+    control  : {drag:false,resize:true,close:true},
+    fx       : {opacity:true,rolled:false,modal:true}
+  };
+  _oVarsPanel_.make();
+  _oVarsPanel_.events = {
+    remove:function() {
+      delete _oVarsPanel_;
+    }.extend(this)
+  };
+  _oVarsPanel_.loader.show();
+  oRPC = new leimnud.module.rpc.xmlhttp({
+    url   : sAjaxServer,
+    method: 'POST',
+    args  : 'sFieldName=' + sFieldName + '&sProcess=' + sProcess + '&sSymbol=' + sSymbol + '&sNoShowLeyend=1&bIncMulSelFields=1'
+  });
+  oRPC.callback = function(oRPC) {
+    _oVarsPanel_.loader.hide();
+    var scs = oRPC.xmlhttp.responseText.extractScript();
+    _oVarsPanel_.addContent(oRPC.xmlhttp.responseText);
+    scs.evalScript();
+  }.extend(this);
+  oRPC.make();
+};
+
+var insertFormVar = function(sFieldName, sValue) {
+	oAux = document.getElementById(sFieldName);
+	if (oAux.setSelectionRange) {
+	  oAux.value     = '';
+		var rangeStart = oAux.selectionStart;
+    var rangeEnd   = oAux.selectionEnd;
+    var tempStr1   = oAux.value.substring(0,rangeStart);
+    var tempStr2   = oAux.value.substring(rangeEnd);
+    oAux.value     = tempStr1 + sValue + tempStr2;
+	}
+	else {
+	  if (document.selection) {
+	    oAux.focus();
+      document.selection.createRange().text = sValue;
+	  }
+	}
+	_oVarsPanel_.remove();
+};
+
+function cancel(){
+    Pm.tmp.subProcessPanel.remove();
+}
 
 ]]></JS>
 </dynaForm>
\ No newline at end of file
diff --git a/workflow/engine/xmlform/steps/conditions_Edit.xml b/workflow/engine/xmlform/steps/conditions_Edit.xml
index 3f81ca5bb..0f84b7b96 100755
--- a/workflow/engine/xmlform/steps/conditions_Edit.xml
+++ b/workflow/engine/xmlform/steps/conditions_Edit.xml
@@ -22,7 +22,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:350,h:400},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/steps/triggersCondition_Edit.xml b/workflow/engine/xmlform/steps/triggersCondition_Edit.xml
index 3957225ea..091d373a5 100755
--- a/workflow/engine/xmlform/steps/triggersCondition_Edit.xml
+++ b/workflow/engine/xmlform/steps/triggersCondition_Edit.xml
@@ -28,7 +28,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:350,h:400},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/steps/triggers_Assign.xml b/workflow/engine/xmlform/steps/triggers_Assign.xml
index aea123525..7c6388994 100755
--- a/workflow/engine/xmlform/steps/triggers_Assign.xml
+++ b/workflow/engine/xmlform/steps/triggers_Assign.xml
@@ -37,7 +37,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:400,h:600},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml b/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
index b1420c8f6..6cf3c071c 100755
--- a/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
+++ b/workflow/engine/xmlform/tasks/tasks_AssignmentRules.xml
@@ -245,7 +245,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:400,h:600},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/tasks/tasks_Definition.xml b/workflow/engine/xmlform/tasks/tasks_Definition.xml
index 621ddda84..ca5fb95e0 100755
--- a/workflow/engine/xmlform/tasks/tasks_Definition.xml
+++ b/workflow/engine/xmlform/tasks/tasks_Definition.xml
@@ -69,7 +69,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:400,h:600},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/tasks/tasks_Labels.xml b/workflow/engine/xmlform/tasks/tasks_Labels.xml
index a98d472ed..b37c975d0 100755
--- a/workflow/engine/xmlform/tasks/tasks_Labels.xml
+++ b/workflow/engine/xmlform/tasks/tasks_Labels.xml
@@ -39,7 +39,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:400,h:600},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/tasks/tasks_Notifications.xml b/workflow/engine/xmlform/tasks/tasks_Notifications.xml
index 311d9a2e9..264f1221e 100755
--- a/workflow/engine/xmlform/tasks/tasks_Notifications.xml
+++ b/workflow/engine/xmlform/tasks/tasks_Notifications.xml
@@ -155,7 +155,7 @@
   	_oVarsPanel_ = new leimnud.module.panel();
   	_oVarsPanel_.options = {
       limit    : true,
-      size     : {w:400,h:600},
+      size     : {w:600,h:420},
       position : {x:0,y:0,center:true},
       title    : '',
       theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/triggers/triggersCustom.xml b/workflow/engine/xmlform/triggers/triggersCustom.xml
index 0adb94c8a..6899c2911 100755
--- a/workflow/engine/xmlform/triggers/triggersCustom.xml
+++ b/workflow/engine/xmlform/triggers/triggersCustom.xml
@@ -36,8 +36,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    //size     : {w:550,h:645},
-    size     : {w:600,h:340},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/triggers/triggersNarrowEdit.xml b/workflow/engine/xmlform/triggers/triggersNarrowEdit.xml
index c6454e56c..30534920f 100755
--- a/workflow/engine/xmlform/triggers/triggersNarrowEdit.xml
+++ b/workflow/engine/xmlform/triggers/triggersNarrowEdit.xml
@@ -17,72 +17,71 @@
 <TRI_WEBBOT type="textareapm" rows="18" cols="80" showVars="1" process="@#PRO_UID">
   <en/>
 </TRI_WEBBOT>
-
-<BTN_CANCEL type="button" onclick="cancel();">
-  <en>Cancel</en>
-</BTN_CANCEL>
+
+<BTN_CANCEL type="button" onclick="cancel();">
+  <en>Cancel</en>
+</BTN_CANCEL>
 
 <SAVE type="button" onclick="eventsTriggerSave(this.form);">
   <en>Save</en>
 </SAVE>
 <JS type="JavaScript"><![CDATA[
-
-var _oVarsPanel_;
-var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) {
-	_oVarsPanel_ = new leimnud.module.panel();
-	_oVarsPanel_.options = {
-    limit    : true,
-    //size     : {w:550,h:645},
-    size     : {w:600,h:340},
-    position : {x:0,y:0,center:true},
-    title    : '',
-    theme    : 'processmaker',
-    statusBar: false,
-    control  : {drag:false,resize:true,close:true},
-    fx       : {opacity:true,rolled:false,modal:true}
-  };
-  _oVarsPanel_.make();
-  _oVarsPanel_.events = {
-    remove:function() {
-      delete _oVarsPanel_;
-    }.extend(this)
-  };
-  _oVarsPanel_.loader.show();
-  oRPC = new leimnud.module.rpc.xmlhttp({
-    url   : sAjaxServer,
-    method: 'POST',
-    args  : 'sFieldName=' + sFieldName + '&sProcess=' + sProcess + '&sSymbol=' + sSymbol
-  });
-  oRPC.callback = function(oRPC) {
-    _oVarsPanel_.loader.hide();
-    var scs = oRPC.xmlhttp.responseText.extractScript();
-    _oVarsPanel_.addContent(oRPC.xmlhttp.responseText);
-    scs.evalScript();
-  }.extend(this);
-  oRPC.make();
-};
-
-var insertFormVar = function(sFieldName, sValue) {
-	oAux = document.getElementById(sFieldName);
-	if (oAux.setSelectionRange) {
-		var rangeStart = oAux.selectionStart;
-    var rangeEnd   = oAux.selectionEnd;
-    var tempStr1   = oAux.value.substring(0,rangeStart);
-    var tempStr2   = oAux.value.substring(rangeEnd);
-    oAux.value     = tempStr1 + sValue + tempStr2;
-	}
-	else {
-	  if (document.selection) {
-	    oAux.focus();
-      document.selection.createRange().text = sValue;
-	  }
-	}
-	_oVarsPanel_.remove();
-};
-
-function cancel(){
-    currentPopupWindow.remove();
-}
+
+var _oVarsPanel_;
+var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol) {
+	_oVarsPanel_ = new leimnud.module.panel();
+	_oVarsPanel_.options = {
+    limit    : true,
+    size     : {w:600,h:420},
+    position : {x:0,y:0,center:true},
+    title    : '',
+    theme    : 'processmaker',
+    statusBar: false,
+    control  : {drag:false,resize:true,close:true},
+    fx       : {opacity:true,rolled:false,modal:true}
+  };
+  _oVarsPanel_.make();
+  _oVarsPanel_.events = {
+    remove:function() {
+      delete _oVarsPanel_;
+    }.extend(this)
+  };
+  _oVarsPanel_.loader.show();
+  oRPC = new leimnud.module.rpc.xmlhttp({
+    url   : sAjaxServer,
+    method: 'POST',
+    args  : 'sFieldName=' + sFieldName + '&sProcess=' + sProcess + '&sSymbol=' + sSymbol
+  });
+  oRPC.callback = function(oRPC) {
+    _oVarsPanel_.loader.hide();
+    var scs = oRPC.xmlhttp.responseText.extractScript();
+    _oVarsPanel_.addContent(oRPC.xmlhttp.responseText);
+    scs.evalScript();
+  }.extend(this);
+  oRPC.make();
+};
+
+var insertFormVar = function(sFieldName, sValue) {
+	oAux = document.getElementById(sFieldName);
+	if (oAux.setSelectionRange) {
+		var rangeStart = oAux.selectionStart;
+    var rangeEnd   = oAux.selectionEnd;
+    var tempStr1   = oAux.value.substring(0,rangeStart);
+    var tempStr2   = oAux.value.substring(rangeEnd);
+    oAux.value     = tempStr1 + sValue + tempStr2;
+	}
+	else {
+	  if (document.selection) {
+	    oAux.focus();
+      document.selection.createRange().text = sValue;
+	  }
+	}
+	_oVarsPanel_.remove();
+};
+
+function cancel(){
+    currentPopupWindow.remove();
+}
 
 ]]></JS>
 </dynaForm>
\ No newline at end of file
diff --git a/workflow/engine/xmlform/triggers/triggersProperties.xml b/workflow/engine/xmlform/triggers/triggersProperties.xml
index 352e925b4..a7b1b45ed 100755
--- a/workflow/engine/xmlform/triggers/triggersProperties.xml
+++ b/workflow/engine/xmlform/triggers/triggersProperties.xml
@@ -26,8 +26,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    //size     : {w:550,h:645},
-    size     : {w:600,h:340},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',
diff --git a/workflow/engine/xmlform/triggers/triggers_Edit.xml b/workflow/engine/xmlform/triggers/triggers_Edit.xml
index 609cbce87..82cb4418b 100755
--- a/workflow/engine/xmlform/triggers/triggers_Edit.xml
+++ b/workflow/engine/xmlform/triggers/triggers_Edit.xml
@@ -24,7 +24,7 @@ var showDynaformsFormVars = function(sFieldName, sAjaxServer, sProcess, sSymbol)
 	_oVarsPanel_ = new leimnud.module.panel();
 	_oVarsPanel_.options = {
     limit    : true,
-    size     : {w:600,h:440},
+    size     : {w:600,h:420},
     position : {x:0,y:0,center:true},
     title    : '',
     theme    : 'processmaker',