diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index 144ea0b602..f362b8ccd9 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -13,7 +13,11 @@
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('confirmDelete', $lang->productplan->confirmDelete)?>
 <div id='titlebar'>
-  <div class='heading'><i class='icon-flag'></i> <?php echo $lang->productplan->browse;?>  </div>
+  <div class='heading'>
+    <i class='icon-flag'></i>
+    <?php if($product->type !== 'normal') echo '<span class="label label-info label-badge">' . $branches[$branch] . '</span>';?>
+    <?php echo $lang->productplan->browse;?>
+  </div>
   <div class='actions'>
     <?php common::printIcon('productplan', 'create', "productID=$product->id&branch=$branch", '', 'button', 'plus');?>
   </div>
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index e7625774c0..6063877f6c 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -15,7 +15,11 @@
 <?php js::set('confirmDelete', $lang->release->confirmDelete)?>
 <div>
   <div id='titlebar'>
-    <div class='heading'><i class='icon-tags'></i> <?php echo $lang->release->browse;?>  </div>
+    <div class='heading'>
+      <i class='icon-tags'></i>
+      <?php if($product->type !== 'normal') echo '<span class="label label-info label-badge">' . $branches[$branch] . '</span>';?>
+      <?php echo $lang->release->browse;?>
+    </div>
     <div class='actions'>
       <?php common::printIcon('release', 'create', "product=$product->id&branch=$branch");?>
     </div>
diff --git a/module/story/control.php b/module/story/control.php
index e2ac4458ee..870daa1022 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -265,7 +265,7 @@ class story extends control
         $this->view->storyTitle       = $title;
         $this->view->spec             = $spec;
         $this->view->branch           = $branch;
-        $this->view->branchGroups     = $this->loadModel('branch')->getByProducts($productID);
+        $this->view->branches         = $this->loadModel('branch')->getPairs($productID);
 
         $this->display();
     }
diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php
index 450779ef0c..a5258339ca 100644
--- a/module/story/view/batchcreate.html.php
+++ b/module/story/view/batchcreate.html.php
@@ -16,8 +16,8 @@
     <span class='prefix'><?php echo html::icon($lang->icons['story']);?></span>
     <strong>
       <small class='text-muted'><?php echo html::icon($lang->icons['batchCreate']);?></small>
+      <?php if($product->type !== 'normal') echo '<span class="label label-info label-badge">' . $branches[$branch] . '</span>';?>
       <?php echo $lang->story->batchCreate;?>
-      <?php if($product->type !== 'normal') echo '<span class="label label-danger">' . $branchGroups[$productID][$branch] . '</span>';?>
     </strong>
     <div class='actions'>
       <?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn' data-width='600px'")?>