diff --git a/src/frontend/js/app/nginx/certificates/list/item.ejs b/src/frontend/js/app/nginx/certificates/list/item.ejs
index dd79405..e7ee216 100644
--- a/src/frontend/js/app/nginx/certificates/list/item.ejs
+++ b/src/frontend/js/app/nginx/certificates/list/item.ejs
@@ -4,7 +4,7 @@
     </div>
 </td>
 <td>
-    <div>
+    <div class="wrap">
         <%
         if (provider === 'letsencrypt') {
             domain_names.map(function(host) {
diff --git a/src/frontend/scss/custom.scss b/src/frontend/scss/custom.scss
index 157d020..ff997da 100644
--- a/src/frontend/scss/custom.scss
+++ b/src/frontend/scss/custom.scss
@@ -27,3 +27,8 @@ a:hover {
 .card-options .dropdown-menu a:not(.btn) {
     margin-left: 0;
 }
+
+.wrap {
+    display: flex;
+    flex-wrap: wrap;
+}
diff --git a/src/frontend/scss/tabler-extra.scss b/src/frontend/scss/tabler-extra.scss
index 2756744..cb2dcbb 100644
--- a/src/frontend/scss/tabler-extra.scss
+++ b/src/frontend/scss/tabler-extra.scss
@@ -3,6 +3,11 @@ $yellow: #f1c40f;
 $blue: #467fcf;
 $pink: #f66d9b;
 
+.tag { 
+    margin-bottom: .5em;
+    margin-right: .5em;
+}
+
 .tag.hover-green:hover, .tag.hover-green:active, .tag.hover-green:focus {
     background-color: #5eba00;
     cursor: pointer;