diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js
index 1268e503c..8b2891bd1 100755
--- a/gulliver/js/form/core/form.js
+++ b/gulliver/js/form/core/form.js
@@ -1126,7 +1126,10 @@ function G_Text( form, element, name)
     switch(pressKey){
       case 8: case 46:  //BACKSPACE OR DELETE
       case 35: case 36: //HOME OR END
-      case 37: case 38: case 39: case 40: // ARROW KEYS
+      case 37: case 38: case 39: case 40: // ARROW KEYS        
+        if (me.validate == 'NodeName' && ((pressKey == 8) || (pressKey == 46))) {
+          return true;
+        }
         me.applyMask(pressKey);
         if ((pressKey == 8 || pressKey == 46) && (me.validate != 'Login' && me.validate != 'NodeName')) me.sendOnChange();
         me.checkBrowser();
@@ -1192,7 +1195,7 @@ function G_Text( form, element, name)
 
     me.checkBrowser();
 //    if ((me.browser.name == 'Firefox') && (keyCode == 8 || keyCode == 46)){
-    if ((me.browser.name == 'Firefox') && (keyCode == 8 )){
+    if ((me.browser.name == 'Firefox') && (keyCode == 8 ) && (me.validate != 'NodeName')){
       if (me.browser.name == 'Chrome' || me.browser.name == 'Safari'){
         event.returnValue = false;
       }
@@ -1258,12 +1261,16 @@ function G_Text( form, element, name)
               break;
             }
           }
-          var k=new leimnud.module.validator({
-            valid :['Login'],
-            key   : (window.event)? window.event : event,
-            lang  :(typeof(me.language)!=='undefined')? me.language:"en"
-          });
-          keyValid = k.result();
+          if ((keyCode == 8) && (me.validate == 'NodeName')) {
+            keyValid = true;
+          } else {
+            var k=new leimnud.module.validator({
+              valid :['Login'],
+              key   : (window.event)? window.event : event,
+              lang  :(typeof(me.language)!=='undefined')? me.language:"en"
+            });
+            keyValid = k.result();
+          }          
           break;
         default:
           var k = new leimnud.module.validator({
@@ -2435,12 +2442,14 @@ function contractSubtitle( subTitle ){
   }
 }
 function expandSubtitle( subTitle ){
-  subTitle=getRow(subTitle);
-  var c=subTitle.cells[0].className;
-  var a=subTitle.rowIndex;
-  var t=subTitle.parentNode;
-  for(var i=a+1,m=t.rows.length;i<m;i++){
-    if (t.rows[i].cells.length==1) break;
+  subTitle = getRow(subTitle);
+  var c = subTitle.cells[0].className;
+  var a = subTitle.rowIndex;
+  var t = subTitle.parentNode;
+  for (var i=a+1,m=t.rows.length; i<m; i++) {
+    if (t.rows[i].cells.length==1) {
+      break;
+    }
     t.rows[i].style.display='';
     var aAux = getControlsInTheRow(t.rows[i]);
     for (var j = 0; j < aAux.length; j++) {
@@ -2448,8 +2457,8 @@ function expandSubtitle( subTitle ){
     }
   }
 }
-function contractExpandSubtitle(subTitle){
-  subTitle=getRow(subTitle);
+function contractExpandSubtitle(subTitleName){
+  subTitle=getRow(subTitleName);
   var c=subTitle.cells[0].className;
   var a=subTitle.rowIndex;
   var t=subTitle.parentNode;
@@ -2460,8 +2469,8 @@ function contractExpandSubtitle(subTitle){
       contracted=true;
     }
   }
-  if (contracted) expandSubtitle(subTitle);
-  else contractSubtitle(subTitle);
+  if (contracted) expandSubtitle(subTitleName);
+  else contractSubtitle(subTitleName);
 }
 
 var getControlsInTheRow = function(oRow) {
diff --git a/workflow/engine/classes/class.xmlfield_InputPM.php b/workflow/engine/classes/class.xmlfield_InputPM.php
index aff372876..1d4b22ddf 100755
--- a/workflow/engine/classes/class.xmlfield_InputPM.php
+++ b/workflow/engine/classes/class.xmlfield_InputPM.php
@@ -361,7 +361,7 @@ class XmlForm_Field_hours extends XmlForm_Field_SimpleText
   * @parameter boolean $bSystemVars
   * @return array
   */
-  function getDynaformsVars($sProcessUID, $bSystemVars = true, $bIncMulSelFields = false)
+  function getDynaformsVars($sProcessUID, $bSystemVars = true, $bIncMulSelFields = 0)
   {
     $aFields = array();
     $aFieldsNames = array();
@@ -375,7 +375,7 @@ class XmlForm_Field_hours extends XmlForm_Field_SimpleText
     }
     $aInvalidTypes = array('title', 'subtitle', 'link', 'file', 'button', 'reset', 'submit', 'javascript');
     $aMultipleSelectionFields = array('listbox', 'checkgroup', 'grid');
-    if (!$bIncMulSelFields) {
+    if ($bIncMulSelFields != 0) {
       $aInvalidTypes = array_merge($aInvalidTypes, $aMultipleSelectionFields);
     }
     require_once 'classes/model/Dynaform.php';
@@ -395,7 +395,7 @@ class XmlForm_Field_hours extends XmlForm_Field_SimpleText
               if (!in_array($k, $aFieldsNames)) {
                 $aFields[] = array('sName' => $k,
                                    'sType' => $v->type,
-                                   'sLabel'=> $v->label
+                                   'sLabel'=> ($v->type != 'grid' ? $v->label : '[ ' . G::LoadTranslation('ID_GRID') . ' ]')
                                   );
                 $aFieldsNames[] = $k;
               }
diff --git a/workflow/engine/js/controls/varsAjax.js b/workflow/engine/js/controls/varsAjax.js
index 3b0c53414..9e88fae0d 100755
--- a/workflow/engine/js/controls/varsAjax.js
+++ b/workflow/engine/js/controls/varsAjax.js
@@ -19,7 +19,7 @@ var changeVariables = function(varType,proUid,field,symbol,target) {
       url   : '../controls/varsAjaxByType',
       async : true,
       method: 'POST',
-      args  : "type="+varType+"&sProcess="+proUid+"&sFieldName="+field+"&sSymbol="+symbol+"&bIncMulSelFields=1"
+      args  : "type="+varType+"&sProcess="+proUid+"&sFieldName="+field+"&sSymbol="+symbol+"&bIncMulSelFields=0"
     });
 
     oRPC.callback = function(rpc){
diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php
index 9bbe5f89e..a0966450e 100755
--- a/workflow/engine/methods/appFolder/appFolderAjax.php
+++ b/workflow/engine/methods/appFolder/appFolderAjax.php
@@ -99,13 +99,26 @@ function expandNode(){
 
     $rootFolder = "/";
     
-    if($_POST ['node']=="") $_POST ['node'] ="/";
-    if($_POST ['node']=="root") $_POST ['node'] ="/";
+    if ($_POST ['node']=="") {
+      $_POST ['node'] ="/";
+    }
+
+    if ($_POST ['node']=="root") {
+      $_POST ['node'] ="/";
+    }
     
-    if(!(isset($_POST['sendWhat']))) $_POST['sendWhat']="both";
+    if (!(isset($_POST['sendWhat']))) {
+      $_POST['sendWhat']="both";
+    }
+
+    if (isset($_POST['renderTree'])) {
+      $limit = 1000000;
+    }
+
     $totalItems=0;
     $totalFolders=0;
     $totalDocuments=0;
+    
     if(($_POST['sendWhat']=="dirs")||($_POST['sendWhat']=="both")){
         $folderListObj = $oPMFolder->getFolderList ( $_POST ['node'] != 'root' ? $_POST ['node'] == 'NA' ? "" : $_POST ['node'] : $rootFolder, $limit, $start );
         //G::pr($folderListObj);
diff --git a/workflow/engine/methods/controls/varsAjax.php b/workflow/engine/methods/controls/varsAjax.php
index 59021fae3..1e5f251d0 100755
--- a/workflow/engine/methods/controls/varsAjax.php
+++ b/workflow/engine/methods/controls/varsAjax.php
@@ -23,7 +23,7 @@
  *
  */
 G::LoadClass('xmlfield_InputPM');
-$aFields = getDynaformsVars($_POST['sProcess'], true, isset($_POST['bIncMulSelFields']) ? (boolean)$_POST['bIncMulSelFields'] : false);
+$aFields = getDynaformsVars($_POST['sProcess'], true, isset($_POST['bIncMulSelFields']) ? $_POST['bIncMulSelFields'] : 0);
 
 $sHTML = '<select name="_Var_Form_" id="_Var_Form_" size="' . count($aFields) . '" style="width:100%;' . (! isset($_POST['sNoShowLeyend']) ? 'height:50%;' : '') . '" ondblclick="insertFormVar(\'' . $_POST['sFieldName'] . '\', this.value);">';
 foreach ( $aFields as $aField ) {
diff --git a/workflow/engine/methods/controls/varsAjaxByType.php b/workflow/engine/methods/controls/varsAjaxByType.php
index f31590e7e..c3065b93b 100755
--- a/workflow/engine/methods/controls/varsAjaxByType.php
+++ b/workflow/engine/methods/controls/varsAjaxByType.php
@@ -35,7 +35,7 @@
  */
 
 G::LoadClass('xmlfield_InputPM');
-$aFields = getDynaformsVars($_POST['sProcess'], true, isset($_POST['bIncMulSelFields']) ? (boolean)$_POST['bIncMulSelFields'] : false);
+$aFields = getDynaformsVars($_POST['sProcess'], true, isset($_POST['bIncMulSelFields']) ? $_POST['bIncMulSelFields'] : 0);
 $aType = $_POST['type'];
 
 $aRows[0] = Array (
diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index 193c8ff79..7bdd57d2a 100755
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -23,153 +23,185 @@
  *
  */
 
+$aFields = array();
 
-  if (! isset ( $_GET ['u'] )) {
-    $aFields ['URL'] = '';
-  }
-  else {
-    $aFields ['URL'] = urldecode ( $_GET ['u'] );
-  }
-  if (! isset ( $_SESSION ['G_MESSAGE'] )) {
-    $_SESSION ['G_MESSAGE'] = '';
-  }
-  if (! isset ( $_SESSION ['G_MESSAGE_TYPE'] )) {
-    $_SESSION ['G_MESSAGE_TYPE'] = '';
-  }
+if (!isset($_GET['u'])) {
+    $aFields['URL'] = '';
+} else {
+    $aFields['URL'] = urldecode($_GET['u']);
+}
 
-  $msg = $_SESSION ['G_MESSAGE'];
-  $msgType = $_SESSION ['G_MESSAGE_TYPE'];
+if (!isset($_SESSION['G_MESSAGE'])) {
+    $_SESSION['G_MESSAGE'] = '';
+}
 
-  if (! isset ( $_SESSION ['FAILED_LOGINS'] )) {
-    $_SESSION ['FAILED_LOGINS'] = 0;
-  }
-  $sFailedLogins = $_SESSION ['FAILED_LOGINS'];
+if (!isset($_SESSION['G_MESSAGE_TYPE'])) {
+    $_SESSION['G_MESSAGE_TYPE'] = '';
+}
 
-  require_once 'classes/model/LoginLog.php';
+$msg = $_SESSION['G_MESSAGE'];
+$msgType = $_SESSION['G_MESSAGE_TYPE'];
 
-  $aFields ['LOGIN_VERIFY_MSG'] = G::loadTranslation ( 'LOGIN_VERIFY_MSG' );
+if (!isset($_SESSION['FAILED_LOGINS'])) {
+    $_SESSION['FAILED_LOGINS'] = 0;
+}
+
+$sFailedLogins = $_SESSION['FAILED_LOGINS'];
+
+require_once 'classes/model/LoginLog.php';
+
+$aFields['LOGIN_VERIFY_MSG'] = G::loadTranslation('LOGIN_VERIFY_MSG');
+
+if (isset ($_SESSION['USER_LOGGED'])) {
+    //close the session, if the current session_id was used in PM.
+    $oCriteria = new Criteria('workflow');
+
+    $oCriteria->add(LoginLogPeer::LOG_SID, session_id());
+    $oCriteria->add(LoginLogPeer::USR_UID, isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : '-');
+    $oCriteria->add(LoginLogPeer::LOG_STATUS, 'ACTIVE');
+    $oCriteria->add(LoginLogPeer::LOG_END_DATE, null, Criteria::ISNULL);
+
+    $oDataset = LoginLogPeer::doSelectRS($oCriteria);
+
+    $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+    $oDataset->next();
+
+    $aRow = $oDataset->getRow();
 
-  if ( isset ($_SESSION ['USER_LOGGED']) ) {
-  //close the session, if the current session_id was used in PM.
-    $oCriteria = new Criteria ( 'workflow' );
-    $oCriteria->add ( LoginLogPeer::LOG_SID, session_id () );
-    $oCriteria->add ( LoginLogPeer::USR_UID, isset ( $_SESSION ['USER_LOGGED'] ) ? $_SESSION ['USER_LOGGED'] : '-' );
-    $oCriteria->add ( LoginLogPeer::LOG_STATUS, 'ACTIVE' );
-    $oCriteria->add ( LoginLogPeer::LOG_END_DATE, NULL, Criteria::ISNULL );
-    $oDataset = LoginLogPeer::doSelectRS ( $oCriteria );
-    $oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
-    $oDataset->next ();
-    $aRow = $oDataset->getRow ();
     if ($aRow) {
-      if ($aRow ['LOG_STATUS'] != 'CLOSED' && $aRow ['LOG_END_DATE'] == NULL) {
-        $weblog = new LoginLog ( );
-        $aLog ['LOG_UID'] = $aRow ['LOG_UID'];
-        $aLog ['LOG_STATUS'] = 'CLOSED';
-        $aLog ['LOG_IP'] = $aRow ['LOG_IP'];
-        $aLog ['LOG_SID'] = session_id ();
-        $aLog ['LOG_INIT_DATE'] = $aRow ['LOG_INIT_DATE'];
-        $aLog ['LOG_END_DATE'] = date ( 'Y-m-d H:i:s' );
-        $aLog ['LOG_CLIENT_HOSTNAME'] = $aRow ['LOG_CLIENT_HOSTNAME'];
-        $aLog ['USR_UID'] = $aRow ['USR_UID'];
-        $weblog->update ( $aLog );
-      }
+        if ($aRow['LOG_STATUS'] != 'CLOSED' && $aRow['LOG_END_DATE'] == null) {
+            $weblog = new LoginLog();
+
+            $aLog['LOG_UID'] = $aRow['LOG_UID'];
+            $aLog['LOG_STATUS'] = 'CLOSED';
+            $aLog['LOG_IP'] = $aRow['LOG_IP'];
+            $aLog['LOG_SID'] = session_id();
+            $aLog['LOG_INIT_DATE'] = $aRow['LOG_INIT_DATE'];
+            $aLog['LOG_END_DATE'] = date('Y-m-d H:i:s');
+            $aLog['LOG_CLIENT_HOSTNAME'] = $aRow['LOG_CLIENT_HOSTNAME'];
+            $aLog['USR_UID'] = $aRow['USR_UID'];
+
+            $weblog->update($aLog);
+        }
     }
-  }
-  else {
+} else {
     // Execute SSO trigger
     $pluginRegistry =& PMPluginRegistry::getSingleton();
     if (defined('PM_SINGLE_SIGN_ON')) {
-      if ($pluginRegistry->existsTrigger(PM_SINGLE_SIGN_ON)) {
-        if ($pluginRegistry->executeTriggers(PM_SINGLE_SIGN_ON, null)) {
-          // Start new session
-          @session_destroy();
-          session_start();
-          session_regenerate_id();
-          // Authenticate
-          require_once 'authentication.php';
-          die();
+        if ($pluginRegistry->existsTrigger(PM_SINGLE_SIGN_ON)) {
+            if ($pluginRegistry->executeTriggers(PM_SINGLE_SIGN_ON, null)) {
+                // Start new session
+                @session_destroy();
+                session_start();
+                session_regenerate_id();
+
+                // Authenticate
+                require_once 'authentication.php';
+
+                die();
+            }
         }
-      }
     }
-  }
-  //end log
+}
+//end log
 
-  //start new session
-  @session_destroy ();
-  session_start ();
-  session_regenerate_id ();
+//start new session
+@session_destroy();
+session_start();
+session_regenerate_id();
 
-  if (strlen ( $msg ) > 0) {
-    $_SESSION ['G_MESSAGE'] = $msg;
-  }
-  if (strlen ( $msgType ) > 0) {
-    $_SESSION ['G_MESSAGE_TYPE'] = $msgType;
-  }
-  $_SESSION ['FAILED_LOGINS'] = $sFailedLogins;
+if (strlen($msg) > 0) {
+    $_SESSION['G_MESSAGE'] = $msg;
+}
+if (strlen($msgType) > 0) {
+    $_SESSION['G_MESSAGE_TYPE'] = $msgType;
+}
 
-  //translation
-  $Translations = G::getModel("Translation");
-  $translationsTable = $Translations->getTranslationEnvironments();
+$_SESSION['FAILED_LOGINS'] = $sFailedLogins;
 
-  $availableLangArray = array ();
-  $availableLangArray [] = array ('LANG_ID' => 'char', 'LANG_NAME' => 'char' );
-  foreach ( $translationsTable as $locale ) {
+//translation
+$Translations = G::getModel("Translation");
+$translationsTable = $Translations->getTranslationEnvironments();
+
+$availableLangArray = array ();
+$availableLangArray [] = array ('LANG_ID' => 'char', 'LANG_NAME' => 'char' );
+foreach ($translationsTable as $locale) {
     $row['LANG_ID'] = $locale['LOCALE'];
-    if( $locale['COUNTRY'] != '.' )
-      $row['LANG_NAME'] = $locale['LANGUAGE'] . ' (' . (ucwords(strtolower($locale['COUNTRY']))) . ')';
-    else
-      $row['LANG_NAME'] = $locale['LANGUAGE'];
+
+    if ($locale['COUNTRY'] != '.') {
+        $row['LANG_NAME'] = $locale['LANGUAGE'] . ' (' . (ucwords(strtolower($locale['COUNTRY']))) . ')';
+    } else {
+        $row['LANG_NAME'] = $locale['LANGUAGE'];
+    }
 
     $availableLangArray [] = $row;
-  }
-  global $_DBArray;
-  $_DBArray ['langOptions'] = $availableLangArray;
+}
 
-  $G_PUBLISH = new Publisher ( );
-  $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php' );
-  G::LoadClass ( 'serverConfiguration' );
+global $_DBArray;
+$_DBArray ['langOptions'] = $availableLangArray;
 
-  //get the serverconf singleton, and check if we can send the heartbeat
-  $oServerConf = & serverConf::getSingleton ();
+G::LoadClass('configuration');
 
-  $sflag = $oServerConf->getHeartbeatProperty('HB_OPTION','HEART_BEAT_CONF');
-  $sflag = (trim($sflag)!='')?$sflag:'1';
+$oConf = new Configurations();
+$oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
+$aFields['USER_LANG'] = isset($oConf->aConfig['login_defaultLanguage'])
+                        ? $oConf->aConfig['login_defaultLanguage']
+                        : 'en';
 
-  //get date of next beat
-  $nextBeatDate = $oServerConf->getHeartbeatProperty('HB_NEXT_BEAT_DATE','HEART_BEAT_CONF');
-  $sflag = 1;
-  //if flag to send heartbeat is enabled, and it is time to send heartbeat, sent it using asynchronous beat.
-  if( ($sflag=="1") && ((strtotime ( "now" ) > $nextBeatDate) || is_null($nextBeatDate) ) ){
+$G_PUBLISH = new Publisher();
+$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php');
+G::LoadClass('serverConfiguration');
+
+//get the serverconf singleton, and check if we can send the heartbeat
+$oServerConf = & serverConf::getSingleton();
+
+$sflag = $oServerConf->getHeartbeatProperty('HB_OPTION', 'HEART_BEAT_CONF');
+$sflag = (trim($sflag) != '') ? $sflag : '1';
+
+//get date of next beat
+$nextBeatDate = $oServerConf->getHeartbeatProperty('HB_NEXT_BEAT_DATE', 'HEART_BEAT_CONF');
+$sflag = 1;
+
+//if flag to send heartbeat is enabled, and it is time to send heartbeat, sent it using asynchronous beat.
+if (($sflag == "1") && ((strtotime("now") > $nextBeatDate) || is_null($nextBeatDate))) {
     $oHeadPublisher =& headPublisher::getSingleton();
     //To do: we need to change to ExtJs
-    $oHeadPublisher->addScriptCode( 'var flagHeartBeat = 1; ');
-  }
-  else
-    $oHeadPublisher->addScriptCode( 'var flagHeartBeat = 0; ');
+    $oHeadPublisher->addScriptCode('var flagHeartBeat = 1;');
+} else {
+    $oHeadPublisher->addScriptCode('var flagHeartBeat = 0;');
+}
 
-  //check if we show the panel with the getting started info
+//check if we show the panel with the getting started info
 
-  require_once 'classes/model/Configuration.php';
-  $oConfiguration = new Configuration ( );
-  $oCriteria = new Criteria ( 'workflow' );
-  $oCriteria->add ( ConfigurationPeer::CFG_UID, 'getStarted' );
-  $oCriteria->add ( ConfigurationPeer::OBJ_UID, '' );
-  $oCriteria->add ( ConfigurationPeer::CFG_VALUE, '1' );
-  $oCriteria->add ( ConfigurationPeer::PRO_UID, '' );
-  $oCriteria->add ( ConfigurationPeer::USR_UID, '' );
-  $oCriteria->add ( ConfigurationPeer::APP_UID, '' );
-  $flagGettingStarted =  ConfigurationPeer::doCount ( $oCriteria );
-  if( $flagGettingStarted == 0 ) {
-    $oHeadPublisher->addScriptCode( 'var flagGettingStarted = 1; ');
-  }
-  else
-    $oHeadPublisher->addScriptCode( 'var flagGettingStarted = 0; ');
+require_once 'classes/model/Configuration.php';
+$oConfiguration = new Configuration ( );
+$oCriteria = new Criteria ( 'workflow' );
+$oCriteria->add(ConfigurationPeer::CFG_UID, 'getStarted');
+$oCriteria->add(ConfigurationPeer::OBJ_UID, '');
+$oCriteria->add(ConfigurationPeer::CFG_VALUE, '1');
+$oCriteria->add(ConfigurationPeer::PRO_UID, '');
+$oCriteria->add(ConfigurationPeer::USR_UID, '');
+$oCriteria->add(ConfigurationPeer::APP_UID, '');
+$flagGettingStarted =  ConfigurationPeer::doCount($oCriteria);
+if ($flagGettingStarted == 0) {
+    $oHeadPublisher->addScriptCode('var flagGettingStarted = 1;');
+} else {
+    $oHeadPublisher->addScriptCode('var flagGettingStarted = 0;');
+}
 
-  G::loadClass('configuration');
-  $oConf = new Configurations;
-  $oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS','');
+$dummy = '';
 
-  $flagForgotPassword = isset($oConf->aConfig['login_enableForgotPassword'])? $oConf->aConfig['login_enableForgotPassword']: 'off';
-  $oHeadPublisher->addScriptCode("var flagForgotPassword = '$flagForgotPassword';");
+G::loadClass('configuration');
+
+$oConf = new Configurations();
+
+$oConf->loadConfig($dummy, 'ENVIRONMENT_SETTINGS', '');
+
+$flagForgotPassword = isset($oConf->aConfig['login_enableForgotPassword'])
+                      ? $oConf->aConfig['login_enableForgotPassword']
+                      : 'off';
+
+$oHeadPublisher->addScriptCode("var flagForgotPassword = '$flagForgotPassword';");
+
+G::RenderPage('publish');
 
-  G::RenderPage ( "publish" );
diff --git a/workflow/engine/templates/cases/casesDocuments.js b/workflow/engine/templates/cases/casesDocuments.js
index 8e7366af0..2a80855c7 100755
--- a/workflow/engine/templates/cases/casesDocuments.js
+++ b/workflow/engine/templates/cases/casesDocuments.js
@@ -1617,7 +1617,8 @@ var documentsTab = {
       dataUrl : '../appFolder/appFolderAjax.php',
       baseParams : {
         action : 'expandNode',
-        sendWhat : 'dirs'
+        sendWhat : 'dirs',
+        renderTree : 1
       }
     }),
     containerScroll : true,
diff --git a/workflow/engine/templates/cases/main.js b/workflow/engine/templates/cases/main.js
index 123ff772b..f92c17434 100755
--- a/workflow/engine/templates/cases/main.js
+++ b/workflow/engine/templates/cases/main.js
@@ -179,22 +179,7 @@ Ext.onReady(function(){
     region: 'center',
     margins: '0 0 0 0',
     useArrows : true,
-    tbar: [
-      {
-        xtype: 'tbfill'
-      },
-      {
-        id:'refreshNotifiers',
-        xtype: 'tbbutton',
-        cls: 'x-btn-icon',
-        icon: '/images/refresh.gif',
-        /*text: 'Reload notifiers',*/
-        handler: function(){
-          updateCasesTree();
-          updateCasesView();
-        }
-      }
-    ],
+
     animate:true,
     autoScroll: true,
     rootVisible: false,
@@ -322,11 +307,13 @@ Ext.onReady(function(){
     collapsible: true,
     collapseMode: 'mini',
     margins: '0 0 0 2',
+
     items: [
       treeMenuItems,
       treeMenuItemDetail
     ]
   });
+  mainMenu.setTitle('<a href="#"><img id="refreshNotifiers" src="/images/refresh.gif" onClick="updateCasesTree(); updateCasesView();" /></a>');
 
   /**
    * Triggers Panel
@@ -556,7 +543,7 @@ function updateCasesView() {
 
 function updateCasesTree() {
   //treeMenuItems.root.reload();
-  Ext.getCmp('refreshNotifiers').setIcon('/images/ext/default/grid/loading.gif');
+  document.getElementById('refreshNotifiers').src = '/images/ext/default/grid/loading.gif';
 
   itemsTypes = Array('CASES_INBOX', 'CASES_DRAFT', 'CASES_CANCELLED', 'CASES_SENT', 'CASES_PAUSED', 'CASES_COMPLETED','CASES_SELFSERVICE');
   if(currentSelectedTreeMenuItem){
@@ -586,7 +573,7 @@ function updateCasesTree() {
         }
         else continue;
       }
-      Ext.getCmp('refreshNotifiers').setIcon('/images/refresh.gif');
+      document.getElementById('refreshNotifiers').src = '/images/refresh.gif';
 
     },
     failure: function(){},
diff --git a/workflow/engine/templates/dashboard/dashletsList.js b/workflow/engine/templates/dashboard/dashletsList.js
index 71ba652d9..bd3e3f56f 100644
--- a/workflow/engine/templates/dashboard/dashletsList.js
+++ b/workflow/engine/templates/dashboard/dashletsList.js
@@ -158,7 +158,11 @@ Ext.onReady(function(){
         {name : 'DAS_INS_UPDATE_DATE'},
         {name : 'DAS_INS_STATUS_LABEL'}
       ]
-    })
+    }),
+    sortInfo: {
+        field: 'DAS_INS_TITLE',
+        direction: 'ASC'
+    }
   });
 
   cmodel = new Ext.grid.ColumnModel({
diff --git a/workflow/engine/xmlform/login/login.xml b/workflow/engine/xmlform/login/login.xml
index 9798aab77..41373f02f 100755
--- a/workflow/engine/xmlform/login/login.xml
+++ b/workflow/engine/xmlform/login/login.xml
@@ -1,54 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dynaForm name="login" version="1.0" basedir="" xmlform_type="NORMAL" width="400px" enabletemplate="1">
-  <TITLE type="title">
-    <en>Login</en>
-  </TITLE>
-  <USR_USERNAME type="text" size="30" maxlength="50" validate="Any">
-    <en>User</en>
-  </USR_USERNAME>
-  <USR_PASSWORD type="password" size="30" maxlength="32">
-    <en>Password</en>
-  </USR_PASSWORD>
-  <USER_LANG type="dropdown" sqlconnection="dbarray">
-  SELECT LANG_ID, LANG_NAME FROM langOptions
-    <en>Language</en>
-  </USER_LANG>
-  <URL type="hidden"/>
-  <LOGIN_VERIFY_MSG type="private" showInTable="0"/>
-  <BSUBMIT type="submit">
-    <en>Login</en>
-  </BSUBMIT>
-  
-  <FORGOT_PASWORD_LINK type="link" link="forgotPassword" onclick="" colAlign="right" colWidth="135" style="display:none;">
-    <en>Forgot Password</en>    
-  </FORGOT_PASWORD_LINK>
-  
-
-
-  <JS type="javascript"><![CDATA[
+<TITLE type="title">
+  <en>Login</en>
+</TITLE>
+<USR_USERNAME type="text" size="30" maxlength="50" validate="Any">
+  <en>User</en>
+</USR_USERNAME>
+<USR_PASSWORD type="password" size="30" maxlength="32">
+  <en>Password</en>
+</USR_PASSWORD>
+<USER_LANG type="dropdown" sqlconnection="dbarray">
+SELECT LANG_ID, LANG_NAME FROM langOptions
+  <en>Language</en>
+</USER_LANG>
+<URL type="hidden"/>
+<LOGIN_VERIFY_MSG type="private" showInTable="0"/>
+<BSUBMIT type="submit">
+  <en>Login</en>
+</BSUBMIT>
+<FORGOT_PASWORD_LINK type="link" link="forgotPassword" onclick="" colAlign="right" colWidth="135" style="display:none;">
+  <en>Forgot Password</en>
+</FORGOT_PASWORD_LINK>
+<JS type="javascript">
+<![CDATA[
 // enable/disable forgot password link
-if(flagForgotPassword == 'on' || flagForgotPassword == '1')
+if(flagForgotPassword == 'on' || flagForgotPassword == '1') {
   document.getElementById("form[FORGOT_PASWORD_LINK]").style.display = 'block';//hideRowById('FORGOT_PASWORD_LINK');
-  
+}
+
 var panel;
 
-function processHbInfo(){
-  ajax_server="../services/processHeartBeat_Ajax.php";
-  parameters="action=processInformation";
-  method="POST";
-  callback="";
-  asynchronous=true;
-  ajax_post(ajax_server, parameters, method, callback, asynchronous );
+function processHbInfo() {
+  ajax_server = "../services/processHeartBeat_Ajax.php";
+  parameters = "action=processInformation";
+  method = "POST";
+  callback = "";
+  asynchronous = true;
+  ajax_post(ajax_server, parameters, method, callback, asynchronous);
 };
 
-function showGettingStarted () {
+function showGettingStarted() {
   panel = new leimnud.module.panel();
-  panel.options={
-    size  :{w:620,h:500},
-    position:{x:50,y:50,center:true},
-    control :{close:true,resize:false},fx:{modal:true},
-    statusBar:false,
-    fx  :{shadow:true,modal:true}
+  panel.options = {
+    size: {w:620,h:500},
+    position: {x:50,y:50,center:true},
+    control: {close:true,resize:false},fx:{modal:true},
+    statusBar: false,
+    fx: {shadow:true,modal:true}
   };
   panel.make();
   panel.loader.show();
@@ -56,7 +54,7 @@ function showGettingStarted () {
     url:"../services/login_getStarted.php",
     method:"POST"
   });
-  r.callback=function(rpc) {
+  r.callback = function(rpc) {
     panel.loader.hide();
     panel.addContent(rpc.xmlhttp.responseText);
   };
@@ -64,12 +62,12 @@ function showGettingStarted () {
 };
 
 var saveConfig = function() {
-  if(document.getElementById("getStarted").checked==true) {
+  if (document.getElementById("getStarted").checked == true) {
     var oRPC = new leimnud.module.rpc.xmlhttp({
-      url   : '../login/login_Ajax',
-      async : false,
+      url: '../login/login_Ajax',
+      async: false,
       method: 'POST',
-      args  : 'function=getStarted_save'
+      args: 'function=getStarted_save'
     });
     oRPC.make();
   }
@@ -77,24 +75,28 @@ var saveConfig = function() {
 }
 
 var dynaformOnload = function() {
-  setFocus (getField ('USR_USERNAME'));  
-  if (flagHeartBeat) processHbInfo();
-  if (flagGettingStarted) showGettingStarted();
+  setFocus(getField('USR_USERNAME'));
+  if (flagHeartBeat) {
+    processHbInfo();
+  }
+  if (flagGettingStarted) {
+    showGettingStarted();
+  }
 };
 
 var openInfoPanel = function() {
   var oInfoPanel = new leimnud.module.panel();
   oInfoPanel.options = {
-    size    :{w:500,h:424},
-    position:{x:0,y:0,center:true},
-    title   :'@G::LoadTranslation(ID_SYSTEM_INFO)',
-    theme   :'processmaker',
-    control :{
-      close :true,
-      drag  :false
+    size: {w:500,h:424},
+    position: {x:0,y:0,center:true},
+    title: '@G::LoadTranslation(ID_SYSTEM_INFO)',
+    theme: 'processmaker',
+    control: {
+      close: true,
+      drag: false
     },
     fx:{
-      modal:true
+      modal: true
     }
   };
   oInfoPanel.setStyle = {modal: {
@@ -102,38 +104,27 @@ var openInfoPanel = function() {
   }};
   oInfoPanel.make();
   var oRPC = new leimnud.module.rpc.xmlhttp({
-    url   : '../login/dbInfo',
-    async : false,
+    url: '../login/dbInfo',
+    async: false,
     method: 'POST',
-    args  : ''
+    args: ''
   });
   oRPC.make();
   oInfoPanel.addContent(oRPC.xmlhttp.responseText);
 };
 
-leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() { 
+leimnud.event.add(document.getElementById('form[BSUBMIT]'), 'click', function() {
   setNestedProperty(this, Array('disabled'), 'true');
   setNestedProperty(this, Array('value'), @@LOGIN_VERIFY_MSG);
-  lang = getField('USER_LANG').value;
-  createCookie('pmos_generik', '{"lang":"'+lang+'"}', 365);
-    
+
   var client = getBrowserClient();
-    
-  if (client.browser != "firefox"){ 
+
+  if (client.browser != "firefox") {
     document.login.submit();
-  } 
-}.extend(document.getElementById('form[BSUBMIT]'))); 
-  
-try{
-  c = new String(readCookie('pmos_generik'));
-  o = eval("("+c+")");
-  if( o != null){
-    getField('USER_LANG').value = o.lang; 
   }
-} 
-catch(e){}
+}.extend(document.getElementById('form[BSUBMIT]')));
 
-]]></JS>
+]]>
+</JS>
 
-
-</dynaForm>
+</dynaForm>
\ No newline at end of file