diff --git a/src/main/twirl/account/edit.scala.html b/src/main/twirl/account/edit.scala.html
index 24e0eaf..947be2e 100644
--- a/src/main/twirl/account/edit.scala.html
+++ b/src/main/twirl/account/edit.scala.html
@@ -13,14 +13,15 @@
       <div class="span6">
         @if(account.isEmpty){
           <fieldset>
-            <label for="userName"><strong>User name</strong></label>
+            <label for="userName" class="strong">User name</label>
             <input type="text" name="userName" id="userName" value=""/>
             <span id="error-userName" class="error"></span>
           </fieldset>
         }
         @if(account.map(_.password.nonEmpty).getOrElse(true)){
           <fieldset>
-            <label for="password"><strong>Password</strong>
+            <label for="password" class="strong">
+              Password
               @if(account.nonEmpty){
                 (Input to change password)
               }
@@ -30,19 +31,19 @@
           </fieldset>
         }
         <fieldset>
-          <label for="mailAddress"><strong>Mail Address</strong></label>
+          <label for="mailAddress" class="strong">Mail Address</label>
           <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
           <span id="error-mailAddress" class="error"></span>
         </fieldset>
         <fieldset>
-          <label for="url"><strong>URL (Optional)</strong></label>
+          <label for="url" class="strong">URL (Optional)</label>
           <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
           <span id="error-url" class="error"></span>
         </fieldset>
       </div>
       <div class="span6">
         <fieldset>
-          <label for="avatar"><strong>Image (Optional)</strong></label>
+          <label for="avatar" class="strong">Image (Optional)</label>
           @helper.html.uploadavatar(account)
         </fieldset>
       </div>
diff --git a/src/main/twirl/admin/system.scala.html b/src/main/twirl/admin/system.scala.html
index 5e9e794..81aabc9 100644
--- a/src/main/twirl/admin/system.scala.html
+++ b/src/main/twirl/admin/system.scala.html
@@ -11,22 +11,22 @@
           <!--====================================================================-->
           <!-- Account registration -->
           <!--====================================================================-->
-          <label><strong>Account registration</strong></label>
+          <label class="strong">Account registration</label>
           <fieldset>
             <label>
               <input type="radio" name="allowAccountRegistration" value="true"@if(settings.allowAccountRegistration){ checked}>
-              <strong>Allow</strong> - Users can create account by themselves.
+              <span class="strong">Allow</span> - Users can create account by themselves.
             </label>
             <label>
               <input type="radio" name="allowAccountRegistration" value="false"@if(!settings.allowAccountRegistration){ checked}>
-              <strong>Deny</strong> - Only administrators can create account.
+              <span class="strong">Deny</span> - Only administrators can create account.
             </label>
           </fieldset>
           <!--====================================================================-->
           <!-- Services -->
           <!--====================================================================-->
           <hr>
-          <label><strong>Services</strong></label>
+          <label class="strong">Services</label>
           <fieldset>
             <label>
               <input type="checkbox" name="gravatar"@if(settings.gravatar){ checked}/>
@@ -37,7 +37,7 @@
           <!-- Authentication -->
           <!--====================================================================-->
           <hr>
-          <label><strong>Authentication</strong></label>
+          <label class="strong">Authentication</label>
           <fieldset>
             <label>
               <input type="checkbox" id="ldapAuthentication" name="ldapAuthentication"@if(settings.ldap){ checked}/>
@@ -99,7 +99,7 @@
           <!-- Notification email -->
           <!--====================================================================-->
           <hr>
-          <label><strong>Notification email</strong></label>
+          <label class="strong">Notification email</label>
           <fieldset>
             <label>
               <input type="checkbox" id="notification" name="notification"@if(settings.notification){ checked}/>
diff --git a/src/main/twirl/admin/users/group.scala.html b/src/main/twirl/admin/users/group.scala.html
index 96a51ed..cf5e701 100644
--- a/src/main/twirl/admin/users/group.scala.html
+++ b/src/main/twirl/admin/users/group.scala.html
@@ -7,23 +7,23 @@
       <div class="row-fluid">
         <div class="span7">
           <fieldset>
-            <label for="groupName"><strong>Group name</strong></label>
+            <label for="groupName" class="strong">Group name</label>
             <span id="error-groupName" class="error"></span>
             <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
           </fieldset>
           <fieldset>
-            <label><strong>URL (Optional)</strong></label>
+            <label class="strong">URL (Optional)</label>
             <span id="error-url" class="error"></span>
             <input type="text" name="url" id="url" style="width: 300px;" value="@account.map(_.url)"/>
           </fieldset>
           <fieldset>
-            <label for="avatar"><strong>Image (Optional)</strong></label>
+            <label for="avatar" class="strong">Image (Optional)</label>
             @helper.html.uploadavatar(account)
           </fieldset>
         </div>
         <div class="span5">
           <fieldset>
-            <label><strong>Members</strong></label>
+            <label class="strong">Members</label>
             <ul id="members" class="collaborator">
               @members.map { userName =>
                 <li data-name="@userName">
diff --git a/src/main/twirl/admin/users/user.scala.html b/src/main/twirl/admin/users/user.scala.html
index 713d459..74979a3 100644
--- a/src/main/twirl/admin/users/user.scala.html
+++ b/src/main/twirl/admin/users/user.scala.html
@@ -6,14 +6,14 @@
       <div class="row-fluid">
         <div class="span6">
           <fieldset>
-            <label for="userName"><strong>Username</strong></label>
+            <label for="userName" class="strong">Username</label>
             <span id="error-userName" class="error"></span>
             <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
           </fieldset>
           @if(account.map(_.password.nonEmpty).getOrElse(true)){
             <fieldset>
-              <label for="password">
-                <strong>Password</strong>
+              <label for="password" class="strong">
+                Password
                 @if(account.isDefined){
                   (Input to change password)
                 }
@@ -23,12 +23,12 @@
             </fieldset>
           }
           <fieldset>
-            <label for="mailAddress"><strong>Mail Address</strong></label>
+            <label for="mailAddress" class="strong">Mail Address</label>
             <span id="error-mailAddress" class="error"></span>
             <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
           </fieldset>
           <fieldset>
-            <label><strong>User Type</strong></label>
+            <label class="strong">User Type</label>
             <label for="userType_Normal">
               <input type="radio" name="isAdmin" id="userType_Normal" value="false"@if(account.isEmpty || !account.get.isAdmin){ checked}/> Normal
             </label>
@@ -37,14 +37,14 @@
             </label>
           </fieldset>
           <fieldset>
-            <label><strong>URL (Optional)</strong></label>
+            <label class="strong">URL (Optional)</label>
             <span id="error-url" class="error"></span>
             <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
           </fieldset>
         </div>
         <div class="span6">
           <fieldset>
-            <label for="avatar"><strong>Image (Optional)</strong></label>
+            <label for="avatar" class="strong">Image (Optional)</label>
             @helper.html.uploadavatar(account)
           </fieldset>
         </div>
diff --git a/src/main/twirl/helper/dropdown.scala.html b/src/main/twirl/helper/dropdown.scala.html
index cccd070..158cf4e 100644
--- a/src/main/twirl/helper/dropdown.scala.html
+++ b/src/main/twirl/helper/dropdown.scala.html
@@ -7,7 +7,7 @@
       @if(prefix.nonEmpty){
         <span class="muted">@prefix:</span>
       }
-      <strong>@buttonValue</strong>
+      <span class="strong">@buttonValue</span>
     }
     <span class="caret"></span>
   </button>
diff --git a/src/main/twirl/index.scala.html b/src/main/twirl/index.scala.html
index d62da6f..adce6e7 100644
--- a/src/main/twirl/index.scala.html
+++ b/src/main/twirl/index.scala.html
@@ -32,9 +32,9 @@
             <tr>
               <td>
                 @if(repository.owner == loginAccount.get.userName){
-                  <a href="@url(repository)"><strong>@repository.name</strong></a>
+                  <a href="@url(repository)"><span class="strong">@repository.name</span></a>
                 } else {
-                  <a href="@url(repository)">@repository.owner/<strong>@repository.name</strong></a>
+                  <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
                 }
               </td>
             </tr>
@@ -57,7 +57,7 @@
         @recentRepositories.map { repository =>
           <tr>
             <td>
-              <a href="@url(repository)">@repository.owner/<strong>@repository.name</strong></a>
+              <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
             </td>
           </tr>
         }
diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html
index 1d4a5da..f32deb6 100644
--- a/src/main/twirl/issues/create.scala.html
+++ b/src/main/twirl/issues/create.scala.html
@@ -65,7 +65,7 @@
     </div>
     <div class="span3">
       @if(hasWritePermission){
-        <strong>Add Labels</strong>
+        <span class="strong">Add Labels</span>
         <div>
           <div id="label-list">
             <ul class="label-list nav nav-pills nav-stacked">
@@ -111,7 +111,7 @@
     if(milestoneId == ''){
       $('#label-milestone').text('No milestone');
     } else {
-      $('#label-milestone').html($('<span>').append('Milestone: ').append($('<strong>').text(title)));
+      $('#label-milestone').html($('<span>').append('Milestone: ').append($('<span class="strong">').text(title)));
       $('a.milestone[data-id=' + milestoneId + '] i').attr('class', 'icon-ok');
     }
     $('input[name=milestoneId]').val(milestoneId);
diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html
index 01cec78..bb8c8df 100644
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -29,12 +29,12 @@
       }
       <div class="small" style="text-align: center;">
         @defining(comments.filter( _.action.contains("comment") ).size){ count =>
-          <strong>@count</strong> @plural(count, "comment")
+          <span class="strong">@count</span> @plural(count, "comment")
         }
       </div>
       <hr/>
       <div style="margin-bottom: 8px;">
-      <strong>Labels</strong>
+      <span class="strong">Labels</span>
       @if(hasWritePermission){
         <div class="pull-right">
           @helper.html.dropdown() {
diff --git a/src/main/twirl/issues/issuedetail.scala.html b/src/main/twirl/issues/issuedetail.scala.html
index 85b26e9..884655d 100644
--- a/src/main/twirl/issues/issuedetail.scala.html
+++ b/src/main/twirl/issues/issuedetail.scala.html
@@ -28,7 +28,11 @@
         @helper.html.dropdown() {
           <li><a href="javascript:void(0);" class="assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
           @collaborators.map { collaborator =>
-            <li><a href="javascript:void(0);" class="assign" data-name="@collaborator">@helper.html.checkicon(collaborator == issue.assignedUserName)@avatar(collaborator, 20) @collaborator</a></li>
+            <li>
+              <a href="javascript:void(0);" class="assign" data-name="@collaborator">
+                @helper.html.checkicon(Some(collaborator) == issue.assignedUserName)@avatar(collaborator, 20) @collaborator
+              </a>
+            </li>
           }
         }
       }
@@ -36,7 +40,7 @@
         <span id="label-milestone">
           @issue.milestoneId.map { milestoneId =>
             @milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) =>
-              Milestone: <strong>@milestone.title</strong>
+              Milestone: <span class="strong">@milestone.title</span>
             }
           }.getOrElse("No milestone")
         </span>
@@ -53,7 +57,7 @@
             @milestones.map { case (milestone, _, _) =>
               <li>
                 <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
-                  @helper.html.checkicon(milestone.milestoneId == issue.milestoneId) @milestone.title
+                  @helper.html.checkicon(Some(milestone.milestoneId) == issue.milestoneId) @milestone.title
                   <div class="small" style="padding-left: 20px;">
                     @milestone.dueDate.map { dueDate =>
                       @if(isPast(dueDate)){
@@ -79,7 +83,7 @@
 </div>
 <div class="issue-participants">
   @defining((issue.openedUserName :: comments.map(_.commentedUserName)).distinct){ participants =>
-    <strong>@participants.size</strong> @plural(participants.size, "participant")
+    <span class="strong">@participants.size</span> @plural(participants.size, "participant")
     @participants.map { participant => <a href="@url(participant)">@avatar(participant, 20, tooltip = true)</a> }
   }
 </div>
@@ -131,7 +135,7 @@
         $('#label-milestone').text('No milestone');
         $('#milestone-progress-area').empty();
       } else {
-        $('#label-milestone').html($('<span>').append('Milestone: ').append($('<strong>').text(title)));
+        $('#label-milestone').html($('<span>').append('Milestone: ').append($('<span class="strong">').text(title)));
         $('#milestone-progress-area').html(data);
         $('a.milestone[data-id=' + milestoneId + '] i').attr('class', 'icon-ok');
       }
diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html
index d9ce5fc..1355e89 100644
--- a/src/main/twirl/issues/list.scala.html
+++ b/src/main/twirl/issues/list.scala.html
@@ -106,7 +106,7 @@
         }
       }
       <hr/>
-      <strong>Labels</strong>
+      <span class="strong">Labels</span>
       <div>
         <div id="label-list">
           <ul class="label-list nav nav-pills nav-stacked">
@@ -127,7 +127,7 @@
         <hr/>
         <input type="button" class="btn btn-block" id="manageLabel" data-toggle="button" value="Manage Labels"/>
         <br/>
-        <strong>New label</strong>
+        <span class="strong">New label</span>
         @_root_.issues.labels.html.edit(None, repository)
       }
     </div>
diff --git a/src/main/twirl/issues/listparts.scala.html b/src/main/twirl/issues/listparts.scala.html
index 273dbab..e035b9d 100644
--- a/src/main/twirl/issues/listparts.scala.html
+++ b/src/main/twirl/issues/listparts.scala.html
@@ -32,14 +32,14 @@
       <div class="btn-group">
         <button class="btn dropdown-toggle" data-toggle="dropdown">
           Sort:
-          <strong>
+          <span class="strong">
             @if(condition.sort == "created"  && condition.direction == "desc"){ Newest }
             @if(condition.sort == "created"  && condition.direction == "asc" ){ Oldest }
             @if(condition.sort == "comments" && condition.direction == "desc"){ Most commented }
             @if(condition.sort == "comments" && condition.direction == "asc" ){ Least commented }
             @if(condition.sort == "updated"  && condition.direction == "desc"){ Recently updated }
             @if(condition.sort == "updated"  && condition.direction == "asc" ){ Least recently updated }
-          </strong>
+          </span>
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
@@ -94,7 +94,7 @@
         <tr>
           <td style="background-color: #eee;">
             <div class="btn-group">
-              <button class="btn btn-mini" id="state"><strong>@{if(condition.state == "open") "Close" else "Reopen"}</strong></button>
+              <button class="btn btn-mini strong" id="state">@{if(condition.state == "open") "Close" else "Reopen"}</button>
             </div>
             @helper.html.dropdown("Label") {
               @labels.map { label =>
diff --git a/src/main/twirl/issues/milestones/edit.scala.html b/src/main/twirl/issues/milestones/edit.scala.html
index c102495..f49099e 100644
--- a/src/main/twirl/issues/milestones/edit.scala.html
+++ b/src/main/twirl/issues/milestones/edit.scala.html
@@ -11,12 +11,12 @@
       <span id="error-title" class="error"></span>
     </fieldset>
     <fieldset>
-      <label for="description"><strong>Description</strong></label>
+      <label for="description" class="strong">Description</label>
       <textarea id="description" name="description" style="width: 500px; height: 150px;">@milestone.map(_.description)</textarea>
       <span id="error-description" class="error"></span>
     </fieldset>
     <fieldset>
-      <label for="dueDate"><strong>Due Date</strong></label>
+      <label for="dueDate" class="strong">Due Date</label>
       @helper.html.datepicker("dueDate", milestone.flatMap(_.dueDate))
       <span id="error-dueDate" class="error"></span>
     </fieldset>
diff --git a/src/main/twirl/newrepo.scala.html b/src/main/twirl/newrepo.scala.html
index f7575be..f8973bc 100644
--- a/src/main/twirl/newrepo.scala.html
+++ b/src/main/twirl/newrepo.scala.html
@@ -5,10 +5,10 @@
 <div style="width: 600px; margin: 10px auto;">
   <form id="form" method="post" action="@path/new" validate="true">
     <fieldset>
-      <label for="name"><strong>Repository name</strong></label>
+      <label for="name" class="strong">Repository name</label>
       <div class="btn-group" style="margin-bottom: 10px;" id="owner-dropdown">
         <button class="btn dropdown-toggle" data-toggle="dropdown">
-          <strong>@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</strong>
+          <span class="strong">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</span>
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
@@ -24,13 +24,13 @@
       <span id="error-name" class="error"></span>
     </fieldset>
     <fieldset>
-      <label for="description"><strong>Description</strong> (optional)</label>
+      <label for="description" class="strong">Description (optional)</label>
       <input type="text" name="description" id="description" style="width: 95%;"/>
     </fieldset>
     <fieldset class="margin">
       <label>
         <input type="radio" name="isPrivate" value="false" checked>
-        <strong>Public</strong><br>
+        <span class="strong">Public</span><br>
         <div>
           <span class="note">All users and guests can read this repository.</span>
         </div>
@@ -39,7 +39,7 @@
     <fieldset>
       <label>
         <input type="radio" name="isPrivate" value="true">
-        <strong>Private</strong><br>
+        <span class="strong">Private</span><br>
         <div>
           <span class="note">Only collaborators can read this repository.</span>
         </div>
@@ -48,7 +48,7 @@
     <fieldset class="margin">
       <label for="createReadme">
         <input type="checkbox" name="createReadme" id="createReadme"/>
-        <strong>Initialize this repository with a README</strong>
+        <span class="strong">Initialize this repository with a README</span>
         <div>
           <span class="note">This will allow you to <code>git clone</code> the repository immediately.</span>
         </div>
@@ -68,6 +68,6 @@
   $('#owner-dropdown i').attr('class', 'icon-white');
   $(this).find('i').attr('class', 'icon-ok');
 
-  $('#owner-dropdown strong').html($(this).find('span').html());
+  $('#owner-dropdown span.strong').html($(this).find('span').html());
 });
 </script>
diff --git a/src/main/twirl/pulls/compare.scala.html b/src/main/twirl/pulls/compare.scala.html
index 780bd3b..202294a 100644
--- a/src/main/twirl/pulls/compare.scala.html
+++ b/src/main/twirl/pulls/compare.scala.html
@@ -82,7 +82,7 @@
       <tr>
         <td style="padding: 20px; background-color: #eee; text-align: center;">
           <h4>There isn't anything to compare.</h4>
-          <strong>@originRepository.owner:@originId</strong> and <strong>@forkedRepository.owner:@forkedId</strong> are identical.
+          <span class="strong">@originRepository.owner:@originId</span> and <span class="strong">@forkedRepository.owner:@forkedId</span> are identical.
         </td>
       </tr>
     </table>
@@ -153,7 +153,7 @@
     var e = $(this);
     e.parents('ul').find('i').attr('class', 'icon-white');
     e.find('i').attr('class', 'icon-ok');
-    e.parents('div.btn-group').find('button strong').text(e.text());
+    e.parents('div.btn-group').find('button span.strong').text(e.text());
 
     @if(members.isEmpty){
       location.href = '@url(repository)/compare/' +
diff --git a/src/main/twirl/pulls/discussion.scala.html b/src/main/twirl/pulls/discussion.scala.html
index da2d4d0..770a2d6 100644
--- a/src/main/twirl/pulls/discussion.scala.html
+++ b/src/main/twirl/pulls/discussion.scala.html
@@ -22,9 +22,9 @@
             </div>
             <div>
               @if(hasConflict){
-                <strong>We can’t automatically merge this pull request.</strong>
+                <span class="strong">We can’t automatically merge this pull request.</span>
               } else {
-                <strong>This pull request can be automatically merged.</strong>
+                <span class="strong">This pull request can be automatically merged.</span>
               }
             </div>
             <div class="small">
@@ -37,13 +37,13 @@
             <div id="command-line" style="display: none;">
               <hr>
               @if(hasConflict){
-                <strong>Checkout via command line</strong>
+                <span class="strong">Checkout via command line</span>
                 <p>
                   If you cannot merge a pull request automatically here, you have the option of checking
                   it out via command line to resolve conflicts and perform a manual merge.
                 </p>
               } else {
-                <strong>Merging via command line</strong>
+                <span class="strong">Merging via command line</span>
                 <p>
                   If you do not want to use the merge button or an automatic merge cannot be performed,
                   you can perform a manual merge on the command line.
@@ -54,7 +54,7 @@
               }
               <div>
                 <p>
-                  <strong>Step 1:</strong> Check out a new branch to test the changes — run this from your project directory
+                  <span class="strong">Step 1:</span> Check out a new branch to test the changes — run this from your project directory
                 </p>
                 @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.requestBranch}"){ command =>
                   @helper.html.copy("merge-command-copy-1", command){
@@ -64,7 +64,7 @@
               </div>
               <div>
                 <p>
-                  <strong>Step 2:</strong> Bring in @{pullreq.requestUserName}'s changes and test
+                  <span class="strong">Step 2:</span> Bring in @{pullreq.requestUserName}'s changes and test
                 </p>
                 @defining(s"git pull ${requestRepositoryUrl} ${pullreq.requestBranch}"){ command =>
                   @helper.html.copy("merge-command-copy-2", command){
@@ -74,7 +74,7 @@
               </div>
               <div>
                 <p>
-                  <strong>Step 3:</strong> Merge the changes and update the server
+                  <span class="strong">Step 3:</span> Merge the changes and update the server
                 </p>
                 @defining(s"git checkout master\ngit merge ${pullreq.requestUserName}-${pullreq.branch}\ngit push origin ${pullreq.branch}"){ command =>
                   @helper.html.copy("merge-command-copy-3", command){
@@ -86,8 +86,8 @@
           </div>
           <div id="confirm-merge-form" style="display: none;">
             <form method="POST" action="@url(repository)/pull/@issue.issueId/merge">
-              <div>
-                <strong>Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}</strong>
+              <div class="strong">
+                Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}
               </div>
               <span id="error-message" class="error"></span>
               <textarea name="message" style="width: 680px; height: 80px;">@issue.title</textarea>
@@ -113,7 +113,7 @@
       <span class="label label-success issue-status">Open</span>
     }
     <div class="small" style="text-align: center;">
-      <strong>@comments.size</strong> @plural(comments.size, "comment")
+      <span class="strong">@comments.size</span> @plural(comments.size, "comment")
     </div>
     <hr/>
   </div>
diff --git a/src/main/twirl/pulls/listparts.scala.html b/src/main/twirl/pulls/listparts.scala.html
index 0cd8918..cb8a158 100644
--- a/src/main/twirl/pulls/listparts.scala.html
+++ b/src/main/twirl/pulls/listparts.scala.html
@@ -23,14 +23,14 @@
   <div class="btn-group">
     <button class="btn dropdown-toggle" data-toggle="dropdown">
       Sort:
-      <strong>
+      <span class="strong">
         @if(condition.sort == "created"  && condition.direction == "desc"){ Newest }
         @if(condition.sort == "created"  && condition.direction == "asc" ){ Oldest }
         @if(condition.sort == "comments" && condition.direction == "desc"){ Most commented }
         @if(condition.sort == "comments" && condition.direction == "asc" ){ Least commented }
         @if(condition.sort == "updated"  && condition.direction == "desc"){ Recently updated }
         @if(condition.sort == "updated"  && condition.direction == "asc" ){ Least recently updated }
-      </strong>
+      </span>
       <span class="caret"></span>
     </button>
     <ul class="dropdown-menu">
diff --git a/src/main/twirl/repo/tab.scala.html b/src/main/twirl/repo/tab.scala.html
index e23aa20..8a5a9eb 100644
--- a/src/main/twirl/repo/tab.scala.html
+++ b/src/main/twirl/repo/tab.scala.html
@@ -8,13 +8,13 @@
     <div class="btn-group" style="margin-right: 20px;">
       <button class="btn dropdown-toggle" data-toggle="dropdown">
         @if(id.length == 40){
-          tree: <strong>@id.substring(0, 10)</strong>
+          tree: <span class="strong">@id.substring(0, 10)</span>
         }
         @if(repository.branchList.contains(id)){
-          branch: <strong>@id</strong>
+          branch: <span class="strong">@id</span>
         }
         @if(repository.tags.exists(_.name == id)){
-          tag: <strong>@id</strong>
+          tag: <span class="strong">@id</span>
         }
         <span class="caret"></span>
       </button>
diff --git a/src/main/twirl/search/issues.scala.html b/src/main/twirl/search/issues.scala.html
index 7cd0cbf..d381091 100644
--- a/src/main/twirl/search/issues.scala.html
+++ b/src/main/twirl/search/issues.scala.html
@@ -24,7 +24,7 @@
           Opened by <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a>
           at @datetime(issue.registeredDate)
           @if(issue.commentCount > 0){
-            &nbsp;&nbsp;<i class="icon-comment"></i><strong>@issue.commentCount</strong> @plural(issue.commentCount, "comment")
+            &nbsp;&nbsp;<i class="icon-comment"></i><span class="strong">@issue.commentCount</span> @plural(issue.commentCount, "comment")
           }
         </div>
       </div>
diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html
index e41deda..e0698bf 100644
--- a/src/main/twirl/settings/options.scala.html
+++ b/src/main/twirl/settings/options.scala.html
@@ -10,11 +10,11 @@
         <div class="box-header">Settings</div>
         <div class="box-content">
           <fieldset>
-            <label for="description"><strong>Description</strong></label>
+            <label for="description" class="strong">Description</label>
             <input type="text" name="description" id="description" style="width: 600px;" value="@repository.repository.description"/>
           </fieldset>
           <fieldset class="margin">
-            <label for="defaultBranch"><strong>Default Branch</strong></label>
+            <label for="defaultBranch" class="strong">Default Branch</label>
             <select name="defaultBranch" id="defaultBranch">
               @repository.branchList.map { branch =>
                 <option value="@branch"@if(branch==repository.repository.defaultBranch){ selected}>@branch</option>
@@ -28,7 +28,7 @@
                 @if(!repository.repository.isPrivate              ){ checked  }
                 @if(repository.repository.parentUserName.isDefined){ disabled }
               >
-              <strong>Public</strong><br>
+              <span class="strong">Public</span><br>
               <div>
                 <span class="note">All users and guests can read this repository.</span>
               </div>
@@ -40,7 +40,7 @@
                 @if(repository.repository.isPrivate               ){ checked  }
                 @if(repository.repository.parentUserName.isDefined){ disabled }
               >
-              <strong>Private</strong><br>
+              <span class="strong">Private</span><br>
               <div>
                 <span class="note">Only collaborators can read this repository.</span>
               </div>
@@ -54,8 +54,8 @@
         <div class="box-content">
           <dl>
             <dt>
-              <label class="checkbox">
-                <input type="checkbox" name="wiki" id="wiki"/> <strong>Wiki</strong>
+              <label class="checkbox strong">
+                <input type="checkbox" name="wiki" id="wiki"/> Wiki
               </label>
             </dt>
             <dd>
@@ -67,8 +67,8 @@
           <hr>
           <dl>
             <dt>
-              <label class="checkbox">
-                <input type="checkbox" name="issue" id="issue"/> <strong>Issue</strong>
+              <label class="checkbox strong">
+                <input type="checkbox" name="issue" id="issue"/> Issue
               </label>
             </dt>
             <dd>