diff --git a/_includes/JB/categories_list b/_includes/JB/categories_list
index 83be2e2900..713a50e488 100644
--- a/_includes/JB/categories_list
+++ b/_includes/JB/categories_list
@@ -22,16 +22,22 @@ Usage:
 {% else %}
   {% if categories_list.first[0] == null %}
     {% for category in categories_list %} 
-    	<li><a href="{{ BASE_PATH }}{{ site.JB.categories_path }}#{{ category }}-ref">
-    		{{ category | join: "/" }} <span>{{ site.categories[category].size }}</span>
-    	</a></li>
+    	<li>
+    	  <a href="{{ BASE_PATH }}{{ site.JB.categories_path }}#{{ category }}-ref">
+    	  	{{ category | join: "/" }}
+    	  </a>
+    	  <mark>{{ site.categories[category].size }}</mark>
+    	</li>
     {% endfor %}
   {% else %}
     {% for category in categories_list %} 
-    	<li><a href="{{ BASE_PATH }}{{ site.JB.categories_path }}#{{ category[0] }}-ref">
-    		{{ category[0] | join: "/" }} <span>{{ category[1].size }}</span>
-    	</a></li>
+    	<li>
+      	<a href="{{ BASE_PATH }}{{ site.JB.categories_path }}#{{ category[0] }}-ref">
+    	  	{{ category[0] | join: "/" }} 
+      	</a>
+      	<mark>{{ category[1].size }}</mark>
+    	</li>
     {% endfor %}
   {% endif %}
 {% endif %}
-{% assign categories_list = nil %}
\ No newline at end of file
+{% assign categories_list = nil %}
diff --git a/_includes/JB/tags_list b/_includes/JB/tags_list
index 8eb62a7600..c9992e8d0a 100644
--- a/_includes/JB/tags_list
+++ b/_includes/JB/tags_list
@@ -22,11 +22,21 @@ Usage:
 {% else %}
   {% if tags_list.first[0] == null %}
     {% for tag in tags_list %} 
-    	<li><a href="{{ BASE_PATH }}{{ site.JB.tags_path }}#{{ tag }}-ref">{{ tag }} <span>{{ site.tags[tag].size }}</span></a></li>
+    	<li>
+      	<a href="{{ BASE_PATH }}{{ site.JB.tags_path }}#{{ tag }}-ref">
+    	    {{ tag }} 
+      	</a>
+      	<mark>{{ site.tags[tag].size }}</mark>
+    	</li>
     {% endfor %}
   {% else %}
     {% for tag in tags_list %} 
-    	<li><a href="{{ BASE_PATH }}{{ site.JB.tags_path }}#{{ tag[0] }}-ref">{{ tag[0] }} <span>{{ tag[1].size }}</span></a></li>
+    	<li>
+      	<a href="{{ BASE_PATH }}{{ site.JB.tags_path }}#{{ tag[0] }}-ref">
+    	    {{ tag[0] }} 
+      	</a>
+      	<mark>{{ tag[1].size }}</mark>
+    	</li>
     {% endfor %}
   {% endif %}
 {% endif %}
diff --git a/_includes/themes/bootstrap/post.html b/_includes/themes/bootstrap/post.html
index 0288b8ceba..345e59bf8b 100644
--- a/_includes/themes/bootstrap/post.html
+++ b/_includes/themes/bootstrap/post.html
@@ -12,7 +12,7 @@ <h1>{{ page.title }} {% if page.tagline %}<small>{{page.tagline}}</small>{% endi
     </div>
 
     {% unless page.categories == empty %}
-      <ul class="tag_box inline">
+      <ul class="tag_box list-inline">
         <li><i class="icon-folder-open"></i></li>
         {% assign categories_list = page.categories %}
         {% include JB/categories_list %}
@@ -20,7 +20,7 @@ <h1>{{ page.title }} {% if page.tagline %}<small>{{page.tagline}}</small>{% endi
     {% endunless %}
 
     {% unless page.tags == empty %}
-      <ul class="tag_box inline">
+      <ul class="tag_box list-inline">
         <li><i class="icon-tags"></i></li>
         {% assign tags_list = page.tags %}
         {% include JB/tags_list %}