diff --git a/src/templates/head.html b/src/templates/head.html
index 2aacac3..1dfc3cb 100644
--- a/src/templates/head.html
+++ b/src/templates/head.html
@@ -85,11 +85,5 @@
         z-index: 6;
         pointer-events: none
     }
-
-    .is-borderless {
-        padding: 0;
-        border: none;
-        background: none;
-    }
 </style>
 
diff --git a/src/templates/list.html b/src/templates/list.html
index f9db140..c0a83f6 100644
--- a/src/templates/list.html
+++ b/src/templates/list.html
@@ -80,21 +80,24 @@
                         <th>
                             <div class="dropdown is-hoverable">
                                 <div class="dropdown-trigger">
-                                    <button class="button is-borderless" aria-haspopup="true" aria-controls="dropdown-menu4">
-                                    <span>{{ view_model.primary_key | split(pat="_") | join(sep=" ") | title }}</span>
-                                    <!-- <span class="icon is-small">
-                                        <i class="fas fa-angle-down" aria-hidden="true"></i>
-                                    </span> -->
-                                    </button>
+                                    <div class="navbar-item has-dropdown" aria-haspopup="true"
+                                        aria-controls="dropdown-menu4">
+                                        <a class="navbar-link">
+                                            <span>{{ view_model.primary_key | split(pat="_") | join(sep=" ") | title
+                                                }}</span>
+                                        </a>
+                                    </div>
                                 </div>
                                 <div class="dropdown-menu" id="dropdown-menu4" role="menu">
                                     <div class="dropdown-content">
-                                        <div class="dropdown-item is-clickable" onclick="sort_by('{{ view_model.primary_key }}', 'Asc');">
-                                            Sort by Asc <i class="ml-1 fa-solid fa-caret-up"></i>
-                                        </div>
-                                        <div class="dropdown-item is-clickable" onclick="sort_by('{{ view_model.primary_key }}', 'Desc');">
+                                        <div class="dropdown-item is-clickable"
+                                            onclick="sort_by('{{ view_model.primary_key }}', 'Desc');">
                                             Sort by Desc <i class="ml-1 fa-solid fa-caret-down"></i>
                                         </div>
+                                        <div class="dropdown-item is-clickable"
+                                            onclick="sort_by('{{ view_model.primary_key }}', 'Asc');">
+                                            Sort by Asc <i class="ml-1 fa-solid fa-caret-up"></i>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -104,21 +107,24 @@
                         <th>
                             <div class="dropdown is-hoverable">
                                 <div class="dropdown-trigger">
-                                    <button class="button is-borderless" aria-haspopup="true" aria-controls="dropdown-menu4">
-                                    <span>{{ model_field.field_name | split(pat="_") | join(sep=" ") | title }}</span>
-                                    <!-- <span class="icon is-small">
-                                        <i class="fas fa-angle-down" aria-hidden="true"></i>
-                                    </span> -->
-                                    </button>
+                                    <div class="navbar-item has-dropdown" aria-haspopup="true"
+                                        aria-controls="dropdown-menu4">
+                                        <a class="navbar-link">
+                                            <span>{{ model_field.field_name | split(pat="_") | join(sep=" ") | title
+                                                }}</span>
+                                        </a>
+                                    </div>
                                 </div>
                                 <div class="dropdown-menu" id="dropdown-menu4" role="menu">
                                     <div class="dropdown-content">
-                                        <div class="dropdown-item is-clickable" onclick="sort_by('{{ model_field.field_name }}', 'Asc');">
-                                            Sort by Asc <i class="ml-1 fa-solid fa-caret-up"></i>
-                                        </div>
-                                        <div class="dropdown-item is-clickable" onclick="sort_by('{{ model_field.field_name }}', 'Desc');">
+                                        <div class="dropdown-item is-clickable"
+                                            onclick="sort_by('{{ model_field.field_name }}', 'Desc');">
                                             Sort by Desc <i class="ml-1 fa-solid fa-caret-down"></i>
                                         </div>
+                                        <div class="dropdown-item is-clickable"
+                                            onclick="sort_by('{{ model_field.field_name }}', 'Asc');">
+                                            Sort by Asc <i class="ml-1 fa-solid fa-caret-up"></i>
+                                        </div>
                                     </div>
                                 </div>
                             </div>