diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 8c2b3e3660..1b66db7390 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -44,7 +44,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
 
         $menuBrowseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name;
         $label  = "<span class='text'>{$menuItem->text}</span>";
-        $label .= $menuBrowseType == $browseType ? "<span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
+        $label .= $menuBrowseType == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
         $active = $menuBrowseType == $browseType ? 'btn-active-text' : '';
 
         if($menuItem->name == 'my')
@@ -92,7 +92,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
                 $moreLabelActive = '';
                 if(isset($lang->bug->moreSelects[$browseType]))
                 {
-                    $moreLabel       = "<span class='text'>{$lang->bug->moreSelects[$browseType]}</span><span class='label label-light label-badge'>{$pager->recTotal}</span>";
+                    $moreLabel       = "<span class='text'>{$lang->bug->moreSelects[$browseType]}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>";
                     $moreLabelActive = 'btn-active-text';
                 }
                 echo "<div class='btn-group'><a href='javascript:;' data-toggle='dropdown' class='btn btn-link {$moreLabelActive}'>{$moreLabel} <span class='caret'></span></a>";
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 512088a330..01a55005ff 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -23,7 +23,7 @@
     foreach($lang->product->featureBar['all'] as $key => $label)
     {
         $label   = "<span class='text'>{$label}</span>";
-        $label  .= $key == $status ? "<span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
+        $label  .= $key == $status ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
         $active  = $key == $status ? 'btn-active-text' : '';
         echo html::a(inlink("all", "productID={$productID}&line=&status={$key}"), $label, '', "class='btn btn-link {$active}' id='{$key}'");
     }
diff --git a/module/product/view/build.html.php b/module/product/view/build.html.php
index 5ccfd7d379..9c77f5a3ed 100644
--- a/module/product/view/build.html.php
+++ b/module/product/view/build.html.php
@@ -15,7 +15,7 @@
 <?php if($config->global->flow == 'full'):?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
-    <a class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->product->build;?></span><span class='label label-light label-badge'><?php echo count($builds);?></span></a>
+    <a class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->product->build;?></span> <span class='label label-light label-badge'><?php echo count($builds);?></span></a>
   </div>
   <div class='btn-toolbar pull-right'><?php common::printLink('build', 'create', "product=$product->id", "<i class='icon icon-plus'></i> " . $lang->build->create, '', "class='btn btn-primary'");?></div>
 </div>
diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index 2ad8f26266..1688f0fe08 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -18,7 +18,7 @@
     <?php foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem):?>
     <?php if(isset($menuItem->hidden)) continue;?>
     <?php $label   = "<span class='text'>{$menuItem->text}</span>";?>
-    <?php $label  .= $menuItem->name == $browseType ? "<span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';?>
+    <?php $label  .= $menuItem->name == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';?>
     <?php $active  = $menuItem->name == $browseType ? 'btn-active-text' : '';?>
     <?php echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType={$menuItem->name}"), $label, '', "class='btn btn-link $active' id='{$menuItem->name}'");?>
     <?php endforeach;?>
diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php
index aeedd26bd9..729666b109 100644
--- a/module/project/view/story.html.php
+++ b/module/project/view/story.html.php
@@ -30,7 +30,7 @@
     <?php endif;?>
   </div>
   <div class="btn-toolbar pull-left">
-    <?php if(common::hasPriv('project', 'story')) echo html::a($this->createLink('project', 'story', "projectID=$project->id"), "<span class='text'>{$lang->story->allStories}</span><span class='label label-light label-badge'>{$pager->recTotal}</span>", '', "class='btn btn-link btn-active-text'");?>
+    <?php if(common::hasPriv('project', 'story')) echo html::a($this->createLink('project', 'story', "projectID=$project->id"), "<span class='text'>{$lang->story->allStories}</span> <span class='label label-light label-badge'>{$pager->recTotal}</span>", '', "class='btn btn-link btn-active-text'");?>
     <?php if(common::hasPriv('project', 'storykanban')) echo html::a($this->createLink('project', 'storykanban', "projectID=$project->id"), "<span class='text'>{$lang->project->kanban}</span>", '', "class='btn btn-link'");?>
     <a class="btn btn-link querybox-toggle" id='bysearchTab'><i class="icon icon-search muted"></i> <?php echo $lang->product->searchStory;?></a>
   </div>
diff --git a/module/project/view/storykanban.html.php b/module/project/view/storykanban.html.php
index a3cd405283..d1f2a9654d 100644
--- a/module/project/view/storykanban.html.php
+++ b/module/project/view/storykanban.html.php
@@ -18,7 +18,7 @@
     <?php $total = 0;?>
     <?php foreach($stories as $colStories) $total += count($colStories);?>
     <?php if(common::hasPriv('project', 'story')) echo html::a($this->createLink('project', 'story', "projectID=$project->id"), "<span class='text'>{$lang->story->allStories}</span>", '', "class='btn btn-link'");?>
-    <?php if(common::hasPriv('project', 'storykanban')) echo html::a($this->createLink('project', 'storykanban', "projectID=$project->id"), "<span class='text'>{$lang->project->kanban}</span><span class='label label-light label-badge'>{$total}</span>", '', "class='btn btn-link btn-active-text'");?>
+    <?php if(common::hasPriv('project', 'storykanban')) echo html::a($this->createLink('project', 'storykanban', "projectID=$project->id"), "<span class='text'>{$lang->project->kanban}</span> <span class='label label-light label-badge'>{$total}</span>", '', "class='btn btn-link btn-active-text'");?>
   </div>
   <div class="btn-toolbar pull-right">
     <div class='btn-group'>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 5375481754..23a8413547 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -82,7 +82,7 @@ js::set('browseType', $browseType);
         elseif($menuType != 'status' and $menuType != 'QUERY')
         {
             $label   = "<span class='text'>{$menuItem->text}</span>";
-            $label  .= $menuType == $browseType ? "<span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
+            $label  .= $menuType == $browseType ? " <span class='label label-light label-badge'>{$pager->recTotal}</span>" : '';
             $active  = $menuType == $browseType ? 'btn-active-text' : '';
             echo html::a(inlink('task', "project=$projectID&type=$menuType"), $label, '', "id='{$menuType}' class='btn btn-link $active'");
         }
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index fa64a5be98..3439abfe1a 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -216,6 +216,6 @@ js::set('suiteID',        $suiteID);
 </div>
 <script>
 $('#module' + moduleID).closest('li').addClass('active'); 
-$('#' + caseBrowseType + 'Tab').addClass('btn-active-text').find('.text').after("<span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
+$('#' + caseBrowseType + 'Tab').addClass('btn-active-text').find('.text').after(" <span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
 </script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/testsuite/view/library.html.php b/module/testsuite/view/library.html.php
index 4b2b7a14bb..ca1760ceff 100644
--- a/module/testsuite/view/library.html.php
+++ b/module/testsuite/view/library.html.php
@@ -210,7 +210,7 @@ js::set('flow',          $config->global->flow);
 <script>
 $('#module' + moduleID).addClass('active');
 <?php if($config->global->flow == 'full'):?>
-$('#<?php echo $this->session->libBrowseType?>Tab').addClass('btn-active-text').append("<span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
+$('#<?php echo $this->session->libBrowseType?>Tab').addClass('btn-active-text').append(" <span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
 <?php endif;?>
 if(flow == 'onlyTest')
 {
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index d1d578c675..acf483b65f 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -118,5 +118,5 @@ $status = $this->session->testTaskVersionStatus;
   <div class='table-footer'><?php $pager->show('right', 'pagerjs');?></div>
   <?php endif;?>
 </div>
-<script>$(function(){$('#<?php echo $status?>Tab').addClass('btn-active-text').append("<span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>")})</script>
+<script>$(function(){$('#<?php echo $status?>Tab').addClass('btn-active-text').append(" <span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>")})</script>
 <?php include '../../common/view/footer.html.php';?>