diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index d01c55fee3..c82efd9332 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -281,7 +281,7 @@
             <table class='table table-data table-condensed table-borderless table-fixed'>
               <tr>
                 <th class='w-60px'><?php echo $lang->bug->fromCase;?></th>
-                <td><?php if($bug->case) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), $bug->caseTitle);?></td>
+                <td><?php if($bug->case) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), "#$bug->case $bug->caseTitle", '_blank');?></td>
               </tr>
               <tr>
                 <th><?php echo $lang->bug->toCase;?></th>
@@ -308,10 +308,6 @@
                   ?>
                 </td>
               </tr>
-              <tr>
-                <th><?php echo $lang->bug->case;?></th>
-                <td><?php if(isset($bug->caseTitle)) echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), "#$bug->case $bug->caseTitle", '_blank');?></td>
-              </tr>
               <tr>
                 <th><?php echo $lang->bug->toStory;?></th>
                 <td><?php if($bug->toStory != 0) echo html::a($this->createLink('story', 'view', "storyID=$bug->toStory"), "#$bug->toStory $bug->toStoryTitle", '_blank');?></td>
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index 1d30fc3d7b..b55ed2cffe 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -275,12 +275,23 @@
           </div>
           <div class='tab-pane' id='legendRelated'>
             <table class='table table-data table-condensed table-borderless'>
+              <tr class='text-top'>
+                <th class='w-70px'><?php echo $lang->story->legendFromBug;?></th>
+                <td class='pd-0'>
+                  <ul class='list-unstyled'>
+                  <?php if(!empty($fromBug)) echo "<li title='#$fromBug->id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id"), "#$fromBug->id $fromBug->title") . '</li>';?>
+                  </ul>
+                </td>
+              </tr>
               <tr class='text-top'>
                 <th class='w-70px'><?php echo $lang->story->legendBugs;?></th>
                 <td class='pd-0'>
                   <ul class='list-unstyled'>
                   <?php
-                  if(!empty($fromBug)) echo "<li title='#$fromBug->id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id"), "#$fromBug->id $fromBug->title") . " <span class='label label-warning'>{$lang->story->legendFromBug}</span></li>";
+                  foreach($bugs as $bug)
+                  {
+                      echo "<li title='#$bug->id $bug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$bug->id"), "#$bug->id $bug->title") . '</li>';
+                  }
                   ?>
                   </ul>
                 </td>
@@ -308,10 +319,19 @@
                     {
                         if(isset($story->extraStories[$linkStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID]) . '</li>';
                     }
+                    ?>
+                  </ul>
+                </td>
+              </tr>
+              <tr class='text-top'>
+                <th><?php echo $lang->story->legendChildStories;?></th>
+                <td class='pd-0'>
+                  <ul class='list-unstyled'>
+                    <?php
                     $childStories = explode(',', $story->childStories) ;    
                     foreach($childStories as $childStoryID)
                     {
-                      if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . " <span class='label label-info'>{$lang->story->legendChildStories}</span></li>";
+                      if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . '</li>';
                     }
                     ?>
                   </ul>