diff --git a/web/plugins/buildrepository/buildrepository.php b/web/plugins/buildrepository/buildrepository.php
index 5cf5acb5d5..c3585c9075 100644
--- a/web/plugins/buildrepository/buildrepository.php
+++ b/web/plugins/buildrepository/buildrepository.php
@@ -232,26 +232,29 @@ function outputCommitHTML(&$commit)
     $haveMessage = (bool)(strlen($message) > 0);
 
     // Compose the supplementary tag list.
-    $tagList = "";
+    $tagList = '<div class="tag_list">';
     if(is_array($commit['tags']))
     {
         $n = (integer)0;
-        foreach($commit['tags'] as $key => $value)
+        foreach($commit['tags'] as $tag => $value)
         {
             // Skip the first tag (its used for grouping).
-            if($n === 0) continue;
+            if($n++ === 0) continue;
 
             // Do not output guessed tags (mainly used for grouping).
             if(is_array($value) && isset($value['guessed']) && $value['guessed'] !== 0) continue;
 
-            $tagList .= '<span class="tag">'.$key.'</span>';
+            $tagList .= '<div class="tag"><label title="Tagged \''.$tag.'\'">'.$tag.'</label></div>';
         }
     }
+    $tagList .= '</div>';
 
     $repoLinkTitle = 'Show changes in the repository for this commit submitted on '. date(DATE_RFC2822, $commit['submitDate']) .'.';
 
     // Ouput HTML for the commit.
-?><span class="metadata"><a href="<?php echo $commit['repositoryUri']; ?>" class="link-external" title="<?php echo $repoLinkTitle; ?>"><?php echo date('Y-m-d', $commit['submitDate']); ?></a></span><p class="heading <?php if($haveMessage) echo 'collapsible'; ?>" <?php if($haveMessage) echo 'title="Toggle commit message display"'; ?>><strong><?php echo $tagList; ?><span class="title"><?php echo $commit['title']; ?></span></strong> by <em><?php echo $commit['author']; ?></em></p><?php
+?><span class="metadata"><a href="<?php echo $commit['repositoryUri']; ?>" class="link-external" title="<?php echo $repoLinkTitle; ?>"><?php echo date('Y-m-d', $commit['submitDate']); ?></a></span><?php
+
+?><p class="heading <?php if($haveMessage) echo 'collapsible'; ?>" <?php if($haveMessage) echo 'title="Toggle commit message display"'; ?>><strong><span class="title"><?php echo $commit['title']; ?></span></strong> by <em><?php echo $commit['author']; ?></em></p><?php echo $tagList;
 
     if($haveMessage)
     {
@@ -337,7 +340,7 @@ function outputCommitLogHTML(&$build)
 
             if($groupCount > 1)
             {
-?><strong><span class="tag"><?php echo htmlspecialchars($groupName); ?></span></strong><a name="<?php echo $groupName; ?>"></a><a class="jump" href="#commitindex" title="Back to Commits index">index</a><br /><ol><?php
+?><strong><label title="<?php echo ("Commits with primary tag '$groupName'"); ?>"><span class="tag"><?php echo htmlspecialchars($groupName); ?></span></label></strong><a name="<?php echo $groupName; ?>"></a><a class="jump" href="#commitindex" title="Back to Commits index">index</a><br /><ol><?php
             }
 
             foreach($group as &$commit)
@@ -1202,7 +1205,7 @@ public function execute($args=NULL)
   jQuery(".commit").hide();
   jQuery(".collapsible").click(function()
   {
-    jQuery(this).next(".commit").slideToggle(300);
+    jQuery(this).next().next(".commit").slideToggle(300);
   });
 });
 </script><?php
diff --git a/web/style.css b/web/style.css
index 5a3f654856..fa11b9b8d5 100644
--- a/web/style.css
+++ b/web/style.css
@@ -804,9 +804,12 @@ p.legal a {
     color: #ff8a00;
 }
 
-.commit_list span.tag {
+.commit_list .tag {
     color:#558866;
     font-family:Verdana, Arial, Helvetica, sans-serif;
+}
+
+.commit_list span.tag {
     margin-right:.8em;
 }
 
@@ -832,8 +835,6 @@ p.legal a {
     margin-left:2em;
 }
 
-/*.commit span.title { }*/
-
 span.metadata {
     font-size:smaller;
     margin-right:1em;
@@ -843,6 +844,25 @@ span.metadata {
     display:inline-block;
 }
 
+.tag_list {
+    display:inline;
+    margin: 0;
+    padding: 0;
+}
+
+.tag_list .tag {
+    display:inline-block;
+    font-size: xx-small;
+    border: 1px solid;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    padding: .25em .4em;
+    margin-left: 1em;
+    margin-right: 0;
+    background-color: #F9FFF9;
+    border-color: #BBDDBB;
+}
+
 /*----------*/
 
 .buildevent table {