diff --git a/lib/front/front.class.php b/lib/front/front.class.php
index 2d68563605..a2026338ac 100644
--- a/lib/front/front.class.php
+++ b/lib/front/front.class.php
@@ -57,6 +57,7 @@ class html extends baseHTML
     {
         $id = "id='$name'";
         if(strpos($attrib, 'id=') !== false) $id = '';
+        if(is_null($value)) $value = '';
         $value = str_replace("'", ''', $value);
         $autocomplete = $autocomplete ? 'autocomplete="on"' : 'autocomplete="off"';
         return "<input type='text' name='$name' {$id} value='$value' $attrib $autocomplete />\n";
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 43f642332b..f234bbdbfd 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -290,14 +290,14 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
       $canBatchClose        = (common::hasPriv($storyType, 'batchClose') and strtolower($browseType) != 'closedbyme' and strtolower($browseType) != 'closedstory');
       $canBatchReview       = ($canBeChanged and common::hasPriv($storyType, 'batchReview'));
       $canBatchChangeStage  = ($canBeChanged and common::hasPriv('story', 'batchChangeStage') and $storyType == 'story');
-      $canBatchChangeBranch = ($canBeChanged and common::hasPriv($storyType, 'batchChangeBranch'));
+      $canBatchChangeBranch = ($canBeChanged and common::hasPriv($storyType, 'batchChangeBranch') and $this->session->currentProductType and $this->session->currentProductType != 'normal' and $productID);
       $canBatchChangeModule = ($canBeChanged and common::hasPriv($storyType, 'batchChangeModule'));
       $canBatchChangePlan   = ($canBeChanged and common::hasPriv('story', 'batchChangePlan') and $storyType == 'story');
       $canBatchAssignTo     = ($canBeChanged and common::hasPriv($storyType, 'batchAssignTo'));
       $canBatchUnlink       = ($canBeChanged and $this->app->tab == 'project' and common::hasPriv('projectstory', 'batchUnlinkStory'));
       $canBatchImportToLib  = ($canBeChanged and $this->app->tab == 'project' and isset($this->config->maxVersion) and common::hasPriv('story', 'batchImportToLib'));
 
-      $canBatchAction       = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlink or $canBatchImportToLib);
+      $canBatchAction       = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlink or $canBatchImportToLib or $canBatchChangeBranch);
       ?>
       <?php if(!$useDatatable) echo '<div class="table-responsive">';?>
       <table class='table has-sort-head<?php if($useDatatable) echo ' datatable';?>' id='storyList' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>'>
@@ -442,7 +442,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
                   echo "<li $class>" . html::a('javascript:;', $lang->story->review,  '', $class) . '</li>';
               }
 
-              if($canBatchChangeBranch and $this->session->currentProductType and $this->session->currentProductType != 'normal' and $productID)
+              if($canBatchChangeBranch)
               {
                   $withSearch = count($branchTagOption) > 8;
                   echo "<li class='dropdown-submenu'>";
diff --git a/module/task/config.php b/module/task/config.php
index b14fdcb456..96ca1d4d79 100644
--- a/module/task/config.php
+++ b/module/task/config.php
@@ -71,9 +71,6 @@ $config->task->datatable->fieldList['mode']['control'] = 'hidden';
 $config->task->datatable->fieldList['desc']['title']   = 'idAB';
 $config->task->datatable->fieldList['desc']['control'] = 'textarea';
 
-$config->task->datatable->fieldList['deadline']['title']   = 'idAB';
-$config->task->datatable->fieldList['deadline']['control'] = 'date';
-
 $config->task->datatable->fieldList['pri']['title']    = 'priAB';
 $config->task->datatable->fieldList['pri']['fixed']    = 'left';
 $config->task->datatable->fieldList['pri']['width']    = '50';
@@ -95,6 +92,18 @@ $config->task->datatable->fieldList['status']['fixed']    = 'no';
 $config->task->datatable->fieldList['status']['width']    = '60';
 $config->task->datatable->fieldList['status']['required'] = 'no';
 
+$config->task->datatable->fieldList['assignedTo']['title']      = 'assignedTo';
+$config->task->datatable->fieldList['assignedTo']['fixed']      = 'no';
+$config->task->datatable->fieldList['assignedTo']['width']      = '100';
+$config->task->datatable->fieldList['assignedTo']['required']   = 'no';
+$config->task->datatable->fieldList['assignedTo']['control']    = 'select';
+$config->task->datatable->fieldList['assignedTo']['dataSource'] = array('module' => 'user', 'method' => 'getTeamMemberPairs', 'params' => '$executionID&execution');
+
+$config->task->datatable->fieldList['finishedBy']['title']    = 'finishedByAB';
+$config->task->datatable->fieldList['finishedBy']['fixed']    = 'no';
+$config->task->datatable->fieldList['finishedBy']['width']    = '80';
+$config->task->datatable->fieldList['finishedBy']['required'] = 'no';
+
 $config->task->datatable->fieldList['estimate']['title']    = 'estimateAB';
 $config->task->datatable->fieldList['estimate']['fixed']    = 'no';
 $config->task->datatable->fieldList['estimate']['width']    = '60';
@@ -121,6 +130,7 @@ $config->task->datatable->fieldList['deadline']['title']    = 'deadlineAB';
 $config->task->datatable->fieldList['deadline']['fixed']    = 'no';
 $config->task->datatable->fieldList['deadline']['width']    = '70';
 $config->task->datatable->fieldList['deadline']['required'] = 'no';
+$config->task->datatable->fieldList['deadline']['control'] = 'date';
 
 $config->task->datatable->fieldList['openedBy']['title']    = 'openedByAB';
 $config->task->datatable->fieldList['openedBy']['fixed']    = 'no';
@@ -143,23 +153,11 @@ $config->task->datatable->fieldList['realStarted']['fixed']    = 'no';
 $config->task->datatable->fieldList['realStarted']['width']    = '95';
 $config->task->datatable->fieldList['realStarted']['required'] = 'no';
 
-$config->task->datatable->fieldList['assignedTo']['title']      = 'assignedTo';
-$config->task->datatable->fieldList['assignedTo']['fixed']      = 'no';
-$config->task->datatable->fieldList['assignedTo']['width']      = '100';
-$config->task->datatable->fieldList['assignedTo']['required']   = 'no';
-$config->task->datatable->fieldList['assignedTo']['control']    = 'select';
-$config->task->datatable->fieldList['assignedTo']['dataSource'] = array('module' => 'user', 'method' => 'getTeamMemberPairs', 'params' => '$executionID&execution');
-
 $config->task->datatable->fieldList['assignedDate']['title']    = 'assignedDate';
 $config->task->datatable->fieldList['assignedDate']['fixed']    = 'no';
 $config->task->datatable->fieldList['assignedDate']['width']    = '110';
 $config->task->datatable->fieldList['assignedDate']['required'] = 'no';
 
-$config->task->datatable->fieldList['finishedBy']['title']    = 'finishedByAB';
-$config->task->datatable->fieldList['finishedBy']['fixed']    = 'no';
-$config->task->datatable->fieldList['finishedBy']['width']    = '80';
-$config->task->datatable->fieldList['finishedBy']['required'] = 'no';
-
 $config->task->datatable->fieldList['finishedDate']['title']    = 'finishedDateAB';
 $config->task->datatable->fieldList['finishedDate']['fixed']    = 'no';
 $config->task->datatable->fieldList['finishedDate']['width']    = '105';
diff --git a/module/task/css/view.css b/module/task/css/view.css
index 5bb814cad8..ff734be84e 100644
--- a/module/task/css/view.css
+++ b/module/task/css/view.css
@@ -1,8 +1,6 @@
 .side-col .cell {padding: 0px;}
 .side-col #legendProjectAndTask .list-unstyled {padding: 10px; border: 1px solid #ddd; border-top: 0px; margin: 0px;}
 .tab-pane table {border: 1px solid #ddd; border-top: none;}
-.page-title{max-width: 80%; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
-.pull-left{max-width: 80%;}
 .MRThWidth {width: 90px !important;}
 .btn-edit-comment {z-index: 100;}