diff --git a/module/project/js/kanban.js b/module/project/js/kanban.js
index 02e700afc0..a23204f053 100644
--- a/module/project/js/kanban.js
+++ b/module/project/js/kanban.js
@@ -4,23 +4,25 @@ $(function()
     var adjustBoardsHeight = function()
     {
         var $cBoards = $('.c-boards');
+        var viewHeight = $(window).height() - $('#header').height() - $('#footer').height() - 111;
         if ($cBoards.length === 1)
         {
             var $boardsWrapper = $cBoards.find('.boards-wrapper');
-            $boardsWrapper.css('min-height', $(window).height() - $('#header').height() - $('#footer').height() - 111);
+            $boardsWrapper.css('min-height', viewHeight);
             if($boardsWrapper.height() > $boardsWrapper.find('.boards').height())
             {
                 $boardsWrapper.find('.boards').css(isFirefox ? 'height' : 'min-height', $boardsWrapper.height() - 1);
             }
             return
         }
+
         $cBoards.each(function()
         {
             var $theBoards = $(this);
-            var height = $(window).height() - $('#header').height() - $('#footer').height() - 111;
+
             var $boardsWrapper = $theBoards.find('.boards-wrapper');
-            var minHeight = Math.min($theBoards.prev().outerHeight() - 1, height);
-            $boardsWrapper.css({maxHeight: height, minHeight: minHeight});
+            var minHeight = Math.min($theBoards.prev().find('.board-story').outerHeight() + 4, viewHeight);
+            $boardsWrapper.css({maxHeight: viewHeight, minHeight: minHeight});
             if($boardsWrapper.height() > $boardsWrapper.find('.boards').height())
             {
                 var $boards = $boardsWrapper.find('.boards');
diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index 30ee650cce..ecb6bf0ad9 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -115,7 +115,7 @@ $account = $this->app->user->account;
           <div class='board-story' data-id='<?php echo $story->id;?>'>
             <?php echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', 'class="kanbaniframe group-title" title="' . $story->title . '"');?>
             <div class="small group-info">
-              <span class='story-id board-id' title='<?php echo $lang->story->id?>'><?php echo $story->id?></span>
+              <span class='story-id board-id' title='<?php echo $lang->story->id?>'>#<?php echo $story->id?></span>
               <span class='label-pri label-pri-<?php echo $story->pri?>' title='<?php echo $lang->story->pri?>'><?php echo zget($lang->story->priList, $story->pri);?></span>
               <span class='story-stage' title='<?php echo $lang->story->stage?>'><span class="label label-dot"></span> <?php echo $lang->story->stageList[$story->stage];?></span>
               <div class='pull-right text-muted story-estimate' title='<?php echo $lang->story->estimate?>'><?php echo $story->estimate . 'h ';?></div>