diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index dac7ee3352..d948647bcb 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -256,7 +256,7 @@ function createColumnCreateMenu(options)
         if(priv.canCreateStory) items.push({label: storyLang.create, url: $.createLink('story', 'create', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&objectID=' + executionID + '&bugID=0&planID=0&todoID=0&extra=laneID=' + laneID + ',columnID=' + col.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
         if(priv.canBatchCreateStory) items.push({label: executionLang.batchCreateStroy, url: $.createLink('story', 'batchcreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&executionID=' + executionID + '&plan=0&type=story&extra=laneID=' + laneID + ',columnID=' + col.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '90%'}});
         if(priv.canLinkStory) items.push({label: executionLang.linkStory, url: $.createLink('execution', 'linkStory', 'executionID=' + executionID + '&browseType=&param=0&recTotal=0&recPerPage=50,&pageID=1&extra=laneID=' + laneID + ',columnID=' + col.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '90%'}});
-        if(priv.canLinkStoryByPlane) items.push({label: executionLang.linkStoryByPlan, url: '#linkStoryByPlan', 'attrs' : {'data-toggle': 'modal', 'data-target': '#linkStoryByPlan','data-col' : col.id, 'data-lane' : laneID, 'class' : 'linkStoryByPlanButton'}});
+        if(priv.canLinkStoryByPlan) items.push({label: executionLang.linkStoryByPlan, url: '#linkStoryByPlan', 'attrs' : {'data-toggle': 'modal', 'data-target': '#linkStoryByPlan','data-col' : col.id, 'data-lane' : laneID, 'class' : 'linkStoryByPlanButton'}});
     }
     else if(col.type == 'unconfirmed')
     {
@@ -1092,7 +1092,7 @@ function initKanban($kanban)
 $(function()
 {
     changeStatus(execution.status);
-    
+
     if($.cookie('isFullScreen') == 1) $.cookie('isFullScreen', 0);
 
     window.kanbanScaleSize = +$.zui.store.get('executionKanbanScaleSize', 1);
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index 2825eaed0d..1dd03d38f3 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -285,7 +285,7 @@ function renderHeaderCol($col, col, $header, kanban)
     if(col.asParent) $col = $col.children('.kanban-header-col');
     var $actions = $('<div class="actions" />');
     var printStoryButton =  printTaskButton = printBugButton = false;
-    if(priv.canCreateStory || priv.canBatchCreateStory || priv.canLinkStory || priv.canLinkStoryByPlane) printStoryButton = true;
+    if(priv.canCreateStory || priv.canBatchCreateStory || priv.canLinkStory || priv.canLinkStoryByPlan) printStoryButton = true;
     if(priv.canCreateTask  || priv.canBatchCreateTask) printTaskButton = true;
     if(priv.canCreateBug   || priv.canBatchCreateBug)  printBugButton  = true;
 
@@ -514,16 +514,16 @@ function findDropColumns($element, $root)
 }
 
 /**
- * changeCardColType 
- * 
- * @param  int    $cardID 
- * @param  int    $fromColID 
- * @param  int    $toColID 
- * @param  int    $fromLaneID 
- * @param  int    $toLaneID 
- * @param  string $cardType 
- * @param  string $fromColType 
- * @param  string $toColType 
+ * Change card's type by changing column.
+ *
+ * @param  int    $cardID
+ * @param  int    $fromColID
+ * @param  int    $toColID
+ * @param  int    $fromLaneID
+ * @param  int    $toLaneID
+ * @param  string $cardType
+ * @param  string $fromColType
+ * @param  string $toColType
  * @access public
  * @return void
  */
@@ -682,10 +682,10 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
 
 /**
  * Handle drop task.
- * 
- * @param  object $element 
- * @param  object $event 
- * @param  object $kanban 
+ *
+ * @param  object $element
+ * @param  object $event
+ * @param  object $kanban
  * @access public
  * @return void
  */
@@ -718,11 +718,11 @@ var kanbanActionHandlers =
 
 /**
  * Handle kanban action.
- * 
- * @param  string $action 
- * @param  object $element 
- * @param  object $event 
- * @param  object $kanban 
+ *
+ * @param  string $action
+ * @param  object $element
+ * @param  object $event
+ * @param  object $kanban
  * @access public
  * @return void
  */
@@ -783,7 +783,7 @@ function createColumnCreateMenu(options)
         if(priv.canCreateStory) items.push({label: storyLang.create, url: $.createLink('story', 'create', 'productID=' + productID, '', true), className: 'iframe'});
         if(priv.canBatchCreateStory) items.push({label: executionLang.batchCreateStroy, url: $.createLink('story', 'batchcreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-width': '90%'}});
         if(priv.canLinkStory) items.push({label: executionLang.linkStory, url: $.createLink('execution', 'linkStory', 'executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-width': '90%'}});
-        if(priv.canLinkStoryByPlane) items.push({label: executionLang.linkStoryByPlan, url: '#linkStoryByPlan', 'attrs' : {'data-toggle': 'modal'}});
+        if(priv.canLinkStoryByPlan) items.push({label: executionLang.linkStoryByPlan, url: '#linkStoryByPlan', 'attrs' : {'data-toggle': 'modal'}});
     }
     else if(col.laneType == 'bug')
     {
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 425f0e7350..e1054c64af 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -56,8 +56,8 @@ $canBatchCreateBug   = common::hasPriv('bug',   'batchCreate');
 $canCreateStory      = ($productID and common::hasPriv('story', 'create'));
 $canBatchCreateStory = ($productID and common::hasPriv('story', 'batchCreate'));
 $canLinkStory        = ($productID and common::hasPriv('execution', 'linkStory'));
-$canLinkStoryByPlane = ($productID and common::hasPriv('execution', 'importplanstories'));
-$hasStoryButton      = ($canCreateStory or $canBatchCreateStory or $canLinkStory or $canLinkStoryByPlane);
+$canLinkStoryByPlan  = ($productID and common::hasPriv('execution', 'importplanstories'));
+$hasStoryButton      = ($canCreateStory or $canBatchCreateStory or $canLinkStory or $canLinkStoryByPlan);
 $hasTaskButton       = ($canCreateTask or $canBatchCreateTask);
 $hasBugButton        = ($canCreateBug or $canBatchCreateBug);
 
@@ -70,7 +70,7 @@ js::set('priv',
         'canCreateStory'      => $canCreateStory,
         'canBatchCreateStory' => $canBatchCreateStory,
         'canLinkStory'        => $canLinkStory,
-        'canLinkStoryByPlane' => $canLinkStoryByPlane,
+        'canLinkStoryByPlan'  => $canLinkStoryByPlan,
         'canAssignTask'       => common::hasPriv('task', 'assignto'),
         'canAssignStory'      => common::hasPriv('story', 'assignto'),
         'canFinishTask'       => common::hasPriv('task', 'finish'),
@@ -141,14 +141,14 @@ js::set('hasTaskButton', $hasTaskButton);
 
     echo $actions;
     ?>
-    <?php if($canCreateTask or $canBatchCreateTask or $canCreateBug or $canBatchCreateBug or $canCreateStory or $canBatchCreateStory or $canLinkStory or $canLinkStoryByPlane):?>
+    <?php if($canCreateTask or $canBatchCreateTask or $canCreateBug or $canBatchCreateBug or $canCreateStory or $canBatchCreateStory or $canLinkStory or $canLinkStoryByPlan):?>
     <div class='dropdown' id='createDropdown'>
       <button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $this->lang->create;?> <span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
         <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe'") . '</li>';?>
         <?php if($canBatchCreateStory) echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>
-        <?php if($canLinkStoryByPlane) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . '</li>';?>
+        <?php if($canLinkStoryByPlan) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . '</li>';?>
         <?php if($hasStoryButton and $hasBugButton) echo '<li class="divider"></li>';?>
         <?php if($canCreateBug) echo '<li>' . html::a(helper::createLink('bug', 'create', "productID=$productID&branch=0&extra=executionID=$execution->id", '', true), $lang->bug->create, '', "class='iframe'") . '</li>';?>
         <?php if($canBatchCreateBug) echo '<li>' . html::a(helper::createLink('bug', 'batchCreate', "productID=$productID&branch=$branchID&executionID=$execution->id", '', true), $lang->bug->batchCreate, '', "class='iframe'") . '</li>';?>
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index 5205158b97..bfb7bc01aa 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -79,19 +79,19 @@
     $canCreateStory      = ($productID and common::hasPriv('story', 'create'));
     $canBatchCreateStory = ($productID and common::hasPriv('story', 'batchCreate'));
     $canLinkStory        = ($productID and common::hasPriv('execution', 'linkStory'));
-    $canLinkStoryByPlane = ($productID and common::hasPriv('execution', 'importplanstories'));
-    $hasStoryButton      = ($canCreateStory or $canBatchCreateStory or $canLinkStory or $canLinkStoryByPlane);
+    $canLinkStoryByPlan  = ($productID and common::hasPriv('execution', 'importplanstories'));
+    $hasStoryButton      = ($canCreateStory or $canBatchCreateStory or $canLinkStory or $canLinkStoryByPlan);
     $hasTaskButton       = ($canCreateTask or $canBatchCreateTask);
     $hasBugButton        = ($canCreateBug or $canBatchCreateBug);
     ?>
-    <?php if($canCreateTask or $canBatchCreateTask or $canCreateBug or $canBatchCreateBug or $canCreateStory or $canBatchCreateStory or $canLinkStory or $canLinkStoryByPlane):?>
+    <?php if($canCreateTask or $canBatchCreateTask or $canCreateBug or $canBatchCreateBug or $canCreateStory or $canBatchCreateStory or $canLinkStory or $canLinkStoryByPlan):?>
     <div class='dropdown' id='createDropdown'>
       <button class='btn btn-primary' type='button' data-toggle='dropdown'><i class='icon icon-plus'></i> <?php echo $this->lang->create;?> <span class='caret'></span></button>
       <ul class='dropdown-menu pull-right'>
         <?php if($canCreateStory) echo '<li>' . html::a(helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->createStory, '', "class='iframe'") . '</li>';?>
         <?php if($canBatchCreateStory) echo '<li>' . html::a(helper::createLink('story', 'batchCreate', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id", '', true), $lang->execution->batchCreateStroy, '', "class='iframe' data-width='90%'") . '</li>';?>
         <?php if($canLinkStory) echo '<li>' . html::a(helper::createLink('execution', 'linkStory', "execution=$execution->id", '', true), $lang->execution->linkStory, '', "class='iframe' data-width='90%'") . '</li>';?>
-        <?php if($canLinkStoryByPlane) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . '</li>';?>
+        <?php if($canLinkStoryByPlan) echo '<li>' . html::a('#linkStoryByPlan', $lang->execution->linkStoryByPlan, '', 'data-toggle="modal"') . '</li>';?>
         <?php if($hasStoryButton and $hasBugButton) echo '<li class="divider"></li>';?>
         <?php if($canCreateBug) echo '<li>' . html::a(helper::createLink('bug', 'create', "productID=$productID&branch=0&extra=executionID=$execution->id", '', true), $lang->bug->create, '', "class='iframe'") . '</li>';?>
         <?php if($canBatchCreateBug) echo '<li>' . html::a(helper::createLink('bug', 'batchCreate', "productID=$productID&branch=0&executionID=$execution->id", '', true), $lang->bug->batchCreate, '', "class='iframe'") . '</li>';?>
@@ -102,7 +102,7 @@
     </div>
     <?php endif;?>
     <?php else:?>
-    <?php $canCreateTask = $canBatchCreateTask = $canCreateBug = $canBatchCreateBug = $canCreateStory = $canBatchCreateStory = $canLinkStory = $canLinkStoryByPlane = false;?>
+    <?php $canCreateTask = $canBatchCreateTask = $canCreateBug = $canBatchCreateBug = $canCreateStory = $canBatchCreateStory = $canLinkStory = $canLinkStoryByPlan = false;?>
     <?php endif;?>
   </div>
 </div>
@@ -150,7 +150,7 @@ js::set('priv',
         'canCreateStory'      => $canCreateStory,
         'canBatchCreateStory' => $canBatchCreateStory,
         'canLinkStory'        => $canLinkStory,
-        'canLinkStoryByPlane' => $canLinkStoryByPlane,
+        'canLinkStoryByPlan'  => $canLinkStoryByPlan,
         'canAssignTask'       => common::hasPriv('task', 'assignto'),
         'canAssignStory'      => common::hasPriv('story', 'assignto'),
         'canFinishTask'       => common::hasPriv('task', 'finish'),
diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index 735d62d60e..e94575fb5d 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -22,7 +22,7 @@
 .region .kanban-header-sub-cols .kanban-header-col > .title {max-width: 100% !important;min-width:240px;}
 .region .sort .region-header {cursor: move;}
 
-.region .kanban {padding: 0px 10px 10px 10px; min-height: unset;}
+.region .kanban {padding: 0px 10px 10px 10px; min-height: unset; width: 100%; overflow: auto;}
 .region .kanban .form-actions {margin: 0;}
 .region .kanban .form-actions .btn {margin-right: 10px; min-width: 50px;}
 
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 8136b47aa2..e0ac79f644 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -1160,7 +1160,7 @@ $(function()
     $('#kanban').sortable(
     {
         selector: '.region, .kanban-board, .kanban-lane, .kanban-item.sort, .kanban-col',
-        trigger: '.region.sort > .region-header, .kanban-board.sort > .kanban-header > .kanban-group-header, .kanban-lane.sort > .kanban-lane-name, .kanban-item.sort, .kanban-col.sort',
+        trigger: '.region.sort > .region-header, .kanban-board.sort > .kanban-header > .kanban-group-header, .kanban-lane.sort > .kanban-lane-name, .kanban-item.sort, .kanban-header-col.sort',
         container: function($ele)
         {
             return $ele.parent();