diff --git a/assets/css/style.css b/assets/css/style.css
index e07e7c0..b9ad964 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -198,6 +198,22 @@ ba {
 
 bt {
   font-size: 12px;
+  display: inline-block;
+}
+
+ul.tag-list {
+  list-style: none;
+  display: inline-block;
+  padding: 0;
+}
+
+ul.tag-list li {
+  display: inline-block;
+}
+
+ul.tag-list li:not(:last-child):after {
+  content: ", ";
+  margin-right: 3px;
 }
 
 /* ================== PORTFOLIO IMAGES HOVER EFFECT ================== */
diff --git a/layouts/partials/article-labels.html b/layouts/partials/article-labels.html
index ae7fb5a..eaf8d68 100644
--- a/layouts/partials/article-labels.html
+++ b/layouts/partials/article-labels.html
@@ -1,16 +1,19 @@
 {{- if or .Params.categories .Params.tags -}}
-<p>
+<div>
     <bt>CATÉGORIES :&nbsp;
         {{- range .Params.categories -}}
         {{- $url := print "/categories/" (. | urlize) "/" -}}
         <a class="category" href={{- $url | relLangURL -}}>{{- . -}}</a> -
-    {{- end -}}
+        {{- end -}}
     </bt>
-    <bt>TAGS :&nbsp;
-    {{- range .Params.tags -}}
+    <bt>TAGS :&nbsp;</bt>
+    <ul class="tag-list">
+        {{- range .Params.tags -}}
         {{- $url := print "/tags/" (. | urlize) "/" -}}
-        <a class="tag" href={{- $url | relLangURL -}}>{{- . -}}</a>
-    {{- end -}}
-    </bt>
-</p>
+        <li><a $url -}} class="tag" href={{- relLangURL |>
+            <bt>{{- . -}}</bt>
+        </a></li>
+        {{- end -}}
+    </ul>
+</div>
 {{- end -}}
\ No newline at end of file
diff --git a/layouts/partials/note-labels.html b/layouts/partials/note-labels.html
index a3d2bfb..1abcfe7 100644
--- a/layouts/partials/note-labels.html
+++ b/layouts/partials/note-labels.html
@@ -1,8 +1,8 @@
 {{- if or .Params.categories .Params.tags -}}
-    <p class="note labels">
+    <ul class="note labels tag-list">
         {{- range .Params.tags -}}
-            {{- $url := print "/tags/" (. | urlize) "/" -}}
-            <a class="tag" href="{{- $url | relLangURL -}}">{{- . -}}</a>
+        {{- $url := print "/tags/" (. | urlize) "/" -}}
+        <li><a class="tag" href="{{- $url | relLangURL -}}">{{- . -}}</a></li>
         {{- end -}}
-    </p>
+    </ul>
 {{- end -}}
\ No newline at end of file