diff --git a/apps/static/js/home/content.js b/apps/static/js/home/content.js
index d7975f4..41d4752 100644
--- a/apps/static/js/home/content.js
+++ b/apps/static/js/home/content.js
@@ -46,7 +46,7 @@ async function initContentTable() {
                 data: "title",
                 className: "text-truncate",
                 render: function(data, type, row) {
-                    return `<a href="${row.url}" class="text-decoration-none" target="_blank">${data}</a>`
+                    return `<a href="${row.url}" class="btn btn-link text-decoration-none" target="_blank">${data}</a>`
                 }
             },
             {
@@ -54,7 +54,7 @@ async function initContentTable() {
                 data: "subscription.name",
                 className: "text-nowrap",
                 render: function(data, type, row) {
-                    return `<a href="#" onclick="goToSubscription(${row.subscription.id})" class="text-decoration-none">${data}</a>`
+                    return `<button type="button" onclick="goToSubscription(${row.subscription.id})" class="btn btn-link text-decoration-none">${data}</button>`
                 }
             },
             {
@@ -143,7 +143,7 @@ function resolveChannelNames(guildId) {
                 $("<a>").text(channel.text)
                     .attr("href", href)
                     .attr("target", "_blank")
-                    .addClass("text-decoration-none text-nowrap")
+                    .addClass("btn btn-link text-decoration-none text-nowrap")
             );
         }
     });
diff --git a/apps/static/js/home/filters.js b/apps/static/js/home/filters.js
index 83cfd42..73d2ebc 100644
--- a/apps/static/js/home/filters.js
+++ b/apps/static/js/home/filters.js
@@ -40,7 +40,7 @@ async function initFiltersTable() {
                 title: "Name",
                 data: "name",
                 render: function(data, type, row) {
-                    return `<a href="#" onclick="showEditFilterModal(${row.id})" class="text-decoration-none">${data}</a>`
+                    return `<button type="button" onclick="showEditFilterModal(${row.id})" class="btn btn-link text-decoration-none">${data}</button>`
                 }
             },
             {
diff --git a/apps/static/js/home/subscriptions.js b/apps/static/js/home/subscriptions.js
index 7cf2f17..e262095 100644
--- a/apps/static/js/home/subscriptions.js
+++ b/apps/static/js/home/subscriptions.js
@@ -43,7 +43,7 @@ async function initSubscriptionTable() {
                 data: "name",
                 className: "text-truncate",
                 render: function(data, type, row) {
-                    return `<a href="#" onclick="showEditSubModal(${row.id})" class="text-decoration-none">${data}</a>`;
+                    return `<button type="button" onclick="showEditSubModal(${row.id})" class="btn btn-link text-decoration-none">${data}</button>`;
                 }
             },
             {
@@ -51,7 +51,7 @@ async function initSubscriptionTable() {
                 data: "url",
                 className: "text-truncate",
                 render: function(data, type) {
-                    return `<a href="${data}" class="text-decoration-none" target="_blank">${data}</a>`;
+                    return `<a href="${data}" class="btn btn-link text-decoration-none" target="_blank">${data}</a>`;
                 }
             },
             { 
diff --git a/apps/templates/includes/navbar.html b/apps/templates/includes/navbar.html
index de468a1..2740cfe 100644
--- a/apps/templates/includes/navbar.html
+++ b/apps/templates/includes/navbar.html
@@ -17,9 +17,9 @@
                 <div class="offcanvas-body">
                     <ul class="navbar-nav justify-content-end flex-grow-1 pe-3 align-items-center">
                         <li class="nav-item">
-                            <a href="#" id="themeToggle" class="me-3 text-body">
+                            <button type="button" id="themeToggle" class="me-3 btn btn-link p-0 text-body">
                                 <i class="bi bi-sun"></i>
-                            </a>
+                            </button>
                         </li>
                         {% if request.user.is_authenticated %}
                         <li class="nav-item">