diff --git a/files/assets/css/classic.css b/files/assets/css/classic.css
index 0852071af..eaddc9565 100644
--- a/files/assets/css/classic.css
+++ b/files/assets/css/classic.css
@@ -490,7 +490,7 @@ a.nav-link:hover {
     color:black !important;
 }
 
-#frontpage .btn.btn-secondary.text-small-m {
+#frontpage .btn.btn-secondary.{
 	color: #ff0 !important;
 	text-shadow: -1px -1px 0 #000,1px -1px 0 #000,-1px 1px 0 #000,1px 1px 0 #000 !important;
 	background: transparent !important;
diff --git a/files/templates/changelog.html b/files/templates/changelog.html
index e3030a13b..18ae76fe2 100644
--- a/files/templates/changelog.html
+++ b/files/templates/changelog.html
@@ -67,8 +67,8 @@
 {% block content %}
 
 {% if v %}
-	<a id="subscribe" class="{% if v.changelogsub %}d-none{% endif %} btn btn-primary followbutton " role="button" onclick="post_toast2(this, '/changelogsub','subscribe','unsubscribe')">Subscribe</a>
-	<a id="unsubscribe" class="{% if not v.changelogsub %}d-none{% endif %} btn btn-primary followbutton " role="button" onclick="post_toast2(this, '/changelogsub','subscribe','unsubscribe')">Unsubscribe</a>
+	<a id="subscribe" class="{% if v.changelogsub %}d-none{% endif %} btn btn-primary followbutton" role="button" onclick="post_toast2(this, '/changelogsub','subscribe','unsubscribe')">Subscribe</a>
+	<a id="unsubscribe" class="{% if not v.changelogsub %}d-none{% endif %} btn btn-primary followbutton" role="button" onclick="post_toast2(this, '/changelogsub','subscribe','unsubscribe')">Unsubscribe</a>
 {% endif %}
 
 <div class="row no-gutters {% if listing %}mt-md-3{% elif not listing %}my-md-3{% endif %}">
diff --git a/files/templates/home.html b/files/templates/home.html
index 88e0b2890..60cb9ee4f 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -33,36 +33,20 @@
   
 <div class="row" style="overflow: visible;padding-top:5px;">
 	<div class="col">
-		<div class="d-flex justify-content-between align-items-center pt-3 pb-2 sorting" style="float:right">
-
-			{% block navbar %}
-			<div class="d-flex align-items-center">
-				{% if v %}
-					<style>
-						@media (max-width: 500px) {
-							.text-small-m {
-								font-size: min(3.3vw,12px) !important;
-								margin-right: min(1.5vw,0.5rem) !important;
-								padding: min(1vw,0.75rem) !important;
-							}
-							.ddd {
-								margin-right: 0 !important;
-								margin-left: min(1.1vw,0.5rem) !important;
-							}
-						}
-					</style>
-				
-					{% if v.paid_dues %}
-						{% if ccmode=="true"%}
-							<a data-bs-toggle="tooltip" data-bs-placement="bottom" title="Only show country club posts" class="btn btn-primary text-primary text-small-m mx-2 ddd" href="?sort={{sort}}&t={{t}}&ccmode=false"><i class="fas fa-golf-club mr-2 text-small-m"></i>CC</a>
-						{% else %}
-							<a data-bs-toggle="tooltip" data-bs-placement="bottom" title="Only show country club posts" class="btn btn-secondary text-small-m mx-2 ddd" href="?sort={{sort}}&t={{t}}&ccmode=true"><i class="fas fa-golf-club mr-2 text-small-m"></i>CC</a>
-						{% endif %}
+		{% if v %}
+			<div class="mt-3 d-lg-none">
+				{% if sub %}
+					{% if v.subs == 1 %}
+						<a class="btn btn-primary btn-block {% if v.subscribed_to(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/subscribe','subscribe-sub','unsubscribe-sub');this.classList.toggle('d-none');nextElementSibling.classList.toggle('d-none')">Subscribe to /h/{{sub.name}}</a>
+						<a class="btn btn-primary btn-block {% if not v.subscribed_to(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unsubscribe','subscribe-sub','unsubscribe-sub');this.classList.toggle('d-none');previousElementSibling.classList.toggle('d-none')">Unsubscribe from /h/{{sub.name}}</a>
+					{% else %}
+						<a class="btn btn-primary btn-block {% if v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/block','block-sub','unblock-sub');this.classList.toggle('d-none');nextElementSibling.classList.toggle('d-none')">Block /h/{{sub.name}}</a>
+						<a class="btn btn-primary btn-block {% if not v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unblock','block-sub','unblock-sub');this.classList.toggle('d-none');previousElementSibling.classList.toggle('d-none')">Unblock /h/{{sub.name}}</a>
 					{% endif %}
-
-					<div class="dropdown dropdown-actions mx-2 ddd">
-						<button class="btn btn-secondary dropdown-toggle text-small-m ddd" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-							<i class="fas fa-user-group mr-2 text-small-m"></i>
+				{% else %}
+					<div class="dropdown dropdown-actions mx-2">
+						<button class="btn btn-primary btn-block dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+							<i class="fas fa-user-group mr-3 "></i>
 							{% if v.subs == 1 %}
 								Include subscribed holes
 							{% elif v.subs == 2 %}
@@ -71,56 +55,70 @@
 								View holes only
 							{% endif %}
 						</button>
-						<div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
-							{% if v.subs != 1 %}<a class="dropdown-item text-small-m" href="/sub_toggle/1"><i class="fas fa-user-group mr-2 text-small-m"></i>Include subscribed holes</a>{% endif %}
-							{% if v.subs != 2 %}<a class="dropdown-item text-small-m" href="/sub_toggle/2"><i class="fas fa-user-group mr-2 text-small-m"></i>Include all holes</a>{% endif %}
-							{% if v.subs != 3 %}<a class="dropdown-item text-small-m" href="/sub_toggle/3"><i class="fas fa-user-group mr-2 text-small-m"></i>View holes only</a>{% endif %}
+						<div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);min-width:100%">
+							{% if v.subs != 1 %}<a class="dropdown-item text-center" href="/sub_toggle/1"><i class="fas fa-user-group mr-3"></i>Include subscribed holes</a>{% endif %}
+							{% if v.subs != 2 %}<a class="dropdown-item text-center" href="/sub_toggle/2"><i class="fas fa-user-group mr-3"></i>Include all holes</a>{% endif %}
+							{% if v.subs != 3 %}<a class="dropdown-item text-center" href="/sub_toggle/3"><i class="fas fa-user-group mr-3"></i>View holes only</a>{% endif %}
 						</div>
 					</div>
 				{% endif %}
+			</div>
+		{% endif %}
 
-				<div class="dropdown dropdown-actions mx-2 ddd">
-					<button class="btn btn-secondary dropdown-toggle text-small-m ddd" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-						{% if t=="hour" %}<i class="fas fa-clock mr-2 text-small-m"></i>
-						{% elif t=="day" %}<i class="fas fa-calendar-day mr-2 text-small-m"></i>
-						{% elif t=="week" %}<i class="fas fa-calendar-week mr-2 text-small-m"></i>
-						{% elif t=="month" %}<i class="fas fa-calendar-alt mr-2 text-small-m"></i>
-						{% elif t=="year" %}<i class="fas fa-calendar mr-2 text-small-m"></i>
-						{% elif t=="all" %}<i class="fas fa-infinity mr-2 text-small-m"></i>
+		<div class="d-flex justify-content-between align-items-center pt-3 pb-2 sorting" style="float:right">
+
+			{% block navbar %}
+			<div class="d-flex align-items-center">
+				{% if v and v.paid_dues %}
+					{% if ccmode=="true"%}
+						<a data-bs-toggle="tooltip" data-bs-placement="bottom" title="Only show country club posts" class="btn btn-primary text-primary mx-2" href="?sort={{sort}}&t={{t}}&ccmode=false"><i class="fas fa-golf-club mr-2 "></i>CC</a>
+					{% else %}
+						<a data-bs-toggle="tooltip" data-bs-placement="bottom" title="Only show country club posts" class="btn btn-secondary mx-2" href="?sort={{sort}}&t={{t}}&ccmode=true"><i class="fas fa-golf-club mr-2 "></i>CC</a>
+					{% endif %}
+				{% endif %}
+
+				<div class="dropdown dropdown-actions mx-2">
+					<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+						{% if t=="hour" %}<i class="fas fa-clock mr-2 "></i>
+						{% elif t=="day" %}<i class="fas fa-calendar-day mr-2 "></i>
+						{% elif t=="week" %}<i class="fas fa-calendar-week mr-2 "></i>
+						{% elif t=="month" %}<i class="fas fa-calendar-alt mr-2 "></i>
+						{% elif t=="year" %}<i class="fas fa-calendar mr-2 "></i>
+						{% elif t=="all" %}<i class="fas fa-infinity mr-2 "></i>
 						{% endif %}
 						{{t | capitalize}}
 					</button>
 					<div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
-						{% if t != "hour" %}<a class="dropdown-item text-small-m" href="?sort={{sort}}&t=hour&ccmode={{ccmode}}"><i class="fas fa-clock mr-2 text-small-m"></i>Hour</a>{% endif %}
-						{% if t != "day" %}<a class="dropdown-item text-small-m" href="?sort={{sort}}&t=day&ccmode={{ccmode}}"><i class="fas fa-calendar-day mr-2 text-small-m"></i>Day</a>{% endif %}
-						{% if t != "week" %}<a class="dropdown-item text-small-m" href="?sort={{sort}}&t=week&ccmode={{ccmode}}"><i class="fas fa-calendar-week mr-2 text-small-m"></i>Week</a>{% endif %}
-						{% if t != "month" %}<a class="dropdown-item text-small-m" href="?sort={{sort}}&t=month&ccmode={{ccmode}}"><i class="fas fa-calendar-alt mr-2 text-small-m"></i>Month</a>{% endif %}
-						{% if t != "year" %}<a class="dropdown-item text-small-m" href="?sort={{sort}}&t=year&ccmode={{ccmode}}"><i class="fas fa-calendar mr-2 text-small-m"></i>Year</a>{% endif %}
-						{% if t != "all" %}<a class="dropdown-item text-small-m" href="?sort={{sort}}&t=all&ccmode={{ccmode}}"><i class="fas fa-infinity mr-2 text-small-m"></i>All</a>{% endif %}
+						{% if t != "hour" %}<a class="dropdown-item" href="?sort={{sort}}&t=hour&ccmode={{ccmode}}"><i class="fas fa-clock mr-2 "></i>Hour</a>{% endif %}
+						{% if t != "day" %}<a class="dropdown-item" href="?sort={{sort}}&t=day&ccmode={{ccmode}}"><i class="fas fa-calendar-day mr-2 "></i>Day</a>{% endif %}
+						{% if t != "week" %}<a class="dropdown-item" href="?sort={{sort}}&t=week&ccmode={{ccmode}}"><i class="fas fa-calendar-week mr-2 "></i>Week</a>{% endif %}
+						{% if t != "month" %}<a class="dropdown-item" href="?sort={{sort}}&t=month&ccmode={{ccmode}}"><i class="fas fa-calendar-alt mr-2 "></i>Month</a>{% endif %}
+						{% if t != "year" %}<a class="dropdown-item" href="?sort={{sort}}&t=year&ccmode={{ccmode}}"><i class="fas fa-calendar mr-2 "></i>Year</a>{% endif %}
+						{% if t != "all" %}<a class="dropdown-item" href="?sort={{sort}}&t=all&ccmode={{ccmode}}"><i class="fas fa-infinity mr-2 "></i>All</a>{% endif %}
 					</div>
 				</div>
 
-				<div class="dropdown dropdown-actions ml-2 ddd">
-					<button class="btn btn-secondary dropdown-toggle text-small-m ddd" type="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-						{% if sort=="hot" %}<i class="fas fa-fire mr-2 text-small-m"></i>{% endif %}
-						{% if sort=="bump" %}<i class="fas fa-arrow-up mr-2 text-small-m"></i>{% endif %}
-						{% if sort=="top" %}<i class="fas fa-arrow-alt-circle-up mr-2 text-small-m"></i>{% endif %}
-						{% if sort=="bottom" %}<i class="fas fa-arrow-alt-circle-down mr-2 text-small-m"></i>{% endif %}
-						{% if sort=="new" %}<i class="fas fa-sparkles mr-2 text-small-m"></i>{% endif %}
-						{% if sort=="old" %}<i class="fas fa-book mr-2 text-small-m"></i>{% endif %}
-						{% if sort=="controversial" %}<i class="fas fa-bullhorn mr-2 text-small-m"></i>{% endif %}
-						{% if sort=="comments" %}<i class="fas fa-comments mr-2 text-small-m"></i>{% endif %}
+				<div class="dropdown dropdown-actions ml-2">
+					<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton2" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+						{% if sort=="hot" %}<i class="fas fa-fire mr-2 "></i>{% endif %}
+						{% if sort=="bump" %}<i class="fas fa-arrow-up mr-2 "></i>{% endif %}
+						{% if sort=="top" %}<i class="fas fa-arrow-alt-circle-up mr-2 "></i>{% endif %}
+						{% if sort=="bottom" %}<i class="fas fa-arrow-alt-circle-down mr-2 "></i>{% endif %}
+						{% if sort=="new" %}<i class="fas fa-sparkles mr-2 "></i>{% endif %}
+						{% if sort=="old" %}<i class="fas fa-book mr-2 "></i>{% endif %}
+						{% if sort=="controversial" %}<i class="fas fa-bullhorn mr-2 "></i>{% endif %}
+						{% if sort=="comments" %}<i class="fas fa-comments mr-2 "></i>{% endif %}
 						{{sort | capitalize}}
 					</button>
 					<div class="dropdown-menu" aria-labelledby="dropdownMenuButton2" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
-						{% if sort != "hot" %}<a class="dropdown-item text-small-m" href="?sort=hot&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-fire mr-2 text-small-m"></i>Hot</a>{% endif %}
-						{% if sort != "bump" %}<a class="dropdown-item text-small-m" href="?sort=bump&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-arrow-up mr-2 text-small-m"></i>Bump</a>{% endif %}
-						{% if sort != "top" %}<a class="dropdown-item text-small-m" href="?sort=top&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-arrow-alt-circle-up mr-2 text-small-m"></i>Top</a>{% endif %}
-						{% if sort != "bottom" %}<a class="dropdown-item text-small-m" href="?sort=bottom&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-arrow-alt-circle-down mr-2 text-small-m"></i>Bottom</a>{% endif %}
-						{% if sort != "new" %}<a class="dropdown-item text-small-m" href="?sort=new&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-sparkles mr-2 text-small-m"></i>New</a>{% endif %}
-						{% if sort != "old" %}<a class="dropdown-item text-small-m" href="?sort=old&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-book mr-2 text-small-m"></i>Old</a>{% endif %}
-						{% if sort != "controversial" %}<a class="dropdown-item text-small-m" href="?sort=controversial&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-bullhorn mr-2 text-small-m"></i>Controversial</a>{% endif %}
-						{% if sort != "comments" %}<a class="dropdown-item text-small-m" href="?sort=comments&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-comments mr-2 text-small-m"></i>Comments</a>{% endif %}
+						{% if sort != "hot" %}<a class="dropdown-item" href="?sort=hot&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-fire mr-2 "></i>Hot</a>{% endif %}
+						{% if sort != "bump" %}<a class="dropdown-item" href="?sort=bump&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-arrow-up mr-2 "></i>Bump</a>{% endif %}
+						{% if sort != "top" %}<a class="dropdown-item" href="?sort=top&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-arrow-alt-circle-up mr-2 "></i>Top</a>{% endif %}
+						{% if sort != "bottom" %}<a class="dropdown-item" href="?sort=bottom&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-arrow-alt-circle-down mr-2 "></i>Bottom</a>{% endif %}
+						{% if sort != "new" %}<a class="dropdown-item" href="?sort=new&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-sparkles mr-2 "></i>New</a>{% endif %}
+						{% if sort != "old" %}<a class="dropdown-item" href="?sort=old&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-book mr-2 "></i>Old</a>{% endif %}
+						{% if sort != "controversial" %}<a class="dropdown-item" href="?sort=controversial&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-bullhorn mr-2 "></i>Controversial</a>{% endif %}
+						{% if sort != "comments" %}<a class="dropdown-item" href="?sort=comments&t={{t}}&ccmode={{ccmode}}"><i class="fas fa-comments mr-2 "></i>Comments</a>{% endif %}
 					</div>
 				</div>
 			</div>
diff --git a/files/templates/sidebar_Drama.html b/files/templates/sidebar_Drama.html
index 2b2da3d62..3defe1389 100644
--- a/files/templates/sidebar_Drama.html
+++ b/files/templates/sidebar_Drama.html
@@ -14,23 +14,27 @@
 			<div class="mb-4">{{sub.sidebar_html|safe}}</div>
 		{% endif %}
 		{% if v %}
-			<a class="btn btn-primary btn-block {% if v.subscribed_to(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/subscribe','subscribe-sub','unsubscribe-sub');this.classList.toggle('d-none');nextElementSibling.classList.toggle('d-none')">SUBSCRIBE</a>
-			<a class="btn btn-primary btn-block {% if not v.subscribed_to(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unsubscribe','subscribe-sub','unsubscribe-sub');this.classList.toggle('d-none');previousElementSibling.classList.toggle('d-none')">UNSUBSCRIBE</a>
-		
-			<a class="btn btn-primary btn-block {% if v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/block','block-sub','unblock-sub');this.classList.toggle('d-none');nextElementSibling.classList.toggle('d-none')">BLOCK HOLE</a>
-			<a class="btn btn-primary btn-block {% if not v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unblock','block-sub','unblock-sub');this.classList.toggle('d-none');previousElementSibling.classList.toggle('d-none')">UNBLOCK HOLE</a>
+			<div class="d-lg-block d-none btn-block">
+				{% if v.subs == 1 %}
+					<a class="btn btn-primary btn-block {% if v.subscribed_to(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/subscribe','subscribe-sub','unsubscribe-sub');this.classList.toggle('d-none');nextElementSibling.classList.toggle('d-none')">SUBSCRIBE TO HOLE</a>
+					<a class="btn btn-primary btn-block {% if not v.subscribed_to(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unsubscribe','subscribe-sub','unsubscribe-sub');this.classList.toggle('d-none');previousElementSibling.classList.toggle('d-none')">UNSUBSCRIBE FROM HOLE</a>
+				{% else %}
+					<a class="btn btn-primary btn-block {% if v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/block','block-sub','unblock-sub');this.classList.toggle('d-none');nextElementSibling.classList.toggle('d-none')">BLOCK HOLE</a>
+					<a class="btn btn-primary btn-block {% if not v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unblock','block-sub','unblock-sub');this.classList.toggle('d-none');previousElementSibling.classList.toggle('d-none')">UNBLOCK HOLE</a>
+				{% endif %}
+			</div>
 
 			{% if v.id in (AEVANN_ID,CARP_ID) %}
 				<a class="btn btn-primary btn-block" href="/create_sub">CREATE HOLE</a>
 			{% endif %}
 			{% if v.mods(sub.name) %}
-				<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/settings">SUB SETTINGS</a>
+				<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/settings">HOLE SETTINGS</a>
 			{% endif %}
 		{% endif %}
-		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/mods">MODS</a>
-		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/subscribers">SUBSCRIBERS</a>
-		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/exilees">EXILEES</a>
-		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/blockers">BLOCKERS</a>
+		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/mods">HOLE MODS</a>
+		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/subscribers">HOLE SUBSCRIBERS</a>
+		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/exilees">HOLE EXILEES</a>
+		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/blockers">HOLE BLOCKERS</a>
 	{% else %}
 		{% if v and v.id in (AEVANN_ID,CARP_ID) %}
 			<a class="btn btn-primary btn-block" href="/create_sub">CREATE HOLE</a>
diff --git a/files/templates/sidebar_PCM.html b/files/templates/sidebar_PCM.html
index b4bfc7090..80f09bbfa 100644
--- a/files/templates/sidebar_PCM.html
+++ b/files/templates/sidebar_PCM.html
@@ -8,12 +8,19 @@
 			<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/settings">SUB SETTINGS</a>
 		{% endif %}
 		{% if v %}
-			<a class="btn btn-primary btn-block {% if v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/block','block-sub','unblock-sub');this.classList.toggle('d-none');nextElementSibling.classList.toggle('d-none')">BLOCK HOLE</a>
-			<a class="btn btn-primary btn-block {% if not v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unblock','block-sub','unblock-sub');this.classList.toggle('d-none');previousElementSibling.classList.toggle('d-none')">UNBLOCK HOLE</a>
+			<div class="d-lg-block d-none btn-block">
+				{% if v.subs == 1 %}
+					<a class="btn btn-primary btn-block {% if v.subscribed_to(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/subscribe','subscribe-sub','unsubscribe-sub');this.classList.toggle('d-none');nextElementSibling.classList.toggle('d-none')">SUBSCRIBE TO HOLE</a>
+					<a class="btn btn-primary btn-block {% if not v.subscribed_to(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unsubscribe','subscribe-sub','unsubscribe-sub');this.classList.toggle('d-none');previousElementSibling.classList.toggle('d-none')">UNSUBSCRIBE FROM HOLE</a>
+				{% else %}
+					<a class="btn btn-primary btn-block {% if v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/block','block-sub','unblock-sub');this.classList.toggle('d-none');nextElementSibling.classList.toggle('d-none')">BLOCK HOLE</a>
+					<a class="btn btn-primary btn-block {% if not v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/h/{{sub.name}}/unblock','block-sub','unblock-sub');this.classList.toggle('d-none');previousElementSibling.classList.toggle('d-none')">UNBLOCK HOLE</a>
+				{% endif %}
+			</div>
 		{% endif %}
-		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/mods">MODS</a>
-		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/exilees">EXILEES</a>
-		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/blockers">BLOCKERS</a>
+		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/mods">HOLE MODS</a>
+		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/exilees">HOLE EXILEES</a>
+		<a class="btn btn-primary btn-block" href="/h/{{sub.name}}/blockers">HOLE BLOCKERS</a>
 	{% endif %}
 	
 	<a class="btn btn-primary btn-block" href="/create_sub">CREATE HOLE</a>
diff --git a/files/templates/user_listing.html b/files/templates/user_listing.html
index fdbeb267c..54d6d5eea 100644
--- a/files/templates/user_listing.html
+++ b/files/templates/user_listing.html
@@ -13,12 +13,12 @@
 
 					{% if v %}
 						{% if v.id!=u.id and not u.is_private and not u.is_nofollow %}
-						<div id="button-sub-{{u.id}}" style="z-index: 2" class="{% if u.has_follower(v) %}d-none{% endif %}"><a class="btn btn-primary " role="button" onclick="post_toast2(this,'/follow/{{u.username}}','button-sub-{{u.id}}','button-unsub-{{u.id}}')">Follow</a></div>
+						<div id="button-sub-{{u.id}}" style="z-index: 2" class="{% if u.has_follower(v) %}d-none{% endif %}"><a class="btn btn-primary" role="button" onclick="post_toast2(this,'/follow/{{u.username}}','button-sub-{{u.id}}','button-unsub-{{u.id}}')">Follow</a></div>
 
-						{% if not u.fish %}<div id="button-unsub-{{u.id}}" style="z-index: 2" class="{% if not u.has_follower(v) %} d-none{% endif %}"><a class="btn btn-secondary " role="button" onclick="post_toast2(this,'/unfollow/{{u.username}}','button-sub-{{u.id}}','button-unsub-{{u.id}}')">Unfollow</a></div>{% endif %}
+						{% if not u.fish %}<div id="button-unsub-{{u.id}}" style="z-index: 2" class="{% if not u.has_follower(v) %} d-none{% endif %}"><a class="btn btn-secondary" role="button" onclick="post_toast2(this,'/unfollow/{{u.username}}','button-sub-{{u.id}}','button-unsub-{{u.id}}')">Unfollow</a></div>{% endif %}
 						{% endif %}
 					{% else %}
-					<div id="button-sub-{{u.id}}" style="z-index: 2"><a class="btn btn-primary " href="/signup">Follow</a></div>
+					<div id="button-sub-{{u.id}}" style="z-index: 2"><a class="btn btn-primary" href="/signup">Follow</a></div>
 					{% endif %}
 				</div>