diff --git a/files/templates/sidebars/ProfileSidebar.html b/files/templates/sidebars/ProfileSidebar.html
index 09385337bb..55fec8a750 100644
--- a/files/templates/sidebars/ProfileSidebar.html
+++ b/files/templates/sidebars/ProfileSidebar.html
@@ -1,22 +1,4 @@
 <div class="hidden xl:block xl:col-start-10 xl:col-end-13 flex-shrink-0 my-4 px-4 py-3 rounded-md bg-gray-300/40 shadow-inner">
-	{% if u.id == v.id or not u.is_private %}
-	<ul class="flex items-center justify-around">
-		<li>
-			<div class="text-lg font-bold mb-0">{{ u.stored_subscriber_count }}</div>
-			<small class="mt-1 block font-bold text-gray-500">Followers</small>
-		</li>
-		<li>
-			<div class="text-lg font-bold mb-0">{{ u.coins }}</div>
-			<small class="mt-1 block font-bold text-gray-500">Dramacoin</small>
-		</li>
-		{% if u.procoins %}
-		<li>
-			<div class="text-lg font-bold mb-0">{{ u.procoins }}</div>
-			<small class="mt-1 block font-bold text-gray-500">MarseyBux</small>
-		</li>
-		{% endif %}
-	</ul>
-	{% endif %}
 	<h2 class="ml-2 font-bold text-lg font-heading leading-normal mb-2">Bio</h2>
 	<div class="flex flex-col space-y-4 mb-3">
 		<div>
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index f366cabdcf..19fc30c1b5 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -65,33 +65,71 @@
 				</div>
 			</div>
 		</div>
-		{% if v and v.id != u.id %}
-		<ul class="ml-auto flex flex-wrap space-x-2 items-center mb-0">
-			<li>
-				<button class="btn btn-gray" onclick="toggleElement('profile-toggleable-mobile', 'message-mobile')">
-					<i class="fas fa-paper-plane fa-sm fa-fw md:mr-1"></i>
-					<span class="hidden md:inline-block">Message</span>
-				</button >
-			</li>
-			{% if u.id != 995 %}
-			<li id="button-unsub2" class="{% if not is_following %}hidden{% endif %}">
-				<button class="btn btn-gray" onclick="post_toast2('/unfollow/{{u.username}}','button-unsub2','button-sub2')">
-					<i class="fas fa-heart-broken fa-sm fa-fw mr-1"></i>
-					Unfollow
-				</button>
-			</li>
+		<div class="ml-auto">
+			{% if u.id == v.id or not u.is_private %}
+			<ul class="hidden xl:flex items-center justify-around mb-0">
+				<li>
+					<div class="text-lg font-bold mb-0">{{ u.stored_subscriber_count }}</div>
+					<small class="mt-1 block font-bold text-gray-500">Followers</small>
+				</li>
+				<li>
+					<div class="text-lg font-bold mb-0">{{ u.coins }}</div>
+					<small class="mt-1 block font-bold text-gray-500">Dramacoin</small>
+				</li>
+				{% if u.procoins %}
+				<li>
+					<div class="text-lg font-bold mb-0">{{ u.procoins }}</div>
+					<small class="mt-1 block font-bold text-gray-500">MarseyBux</small>
+				</li>
+				{% endif %}
+			</ul>
 			{% endif %}
-			<li id="button-sub2" class="{% if is_following or u.is_nofollow or u.is_blocked %}hidden{% endif %}">
-				<button class="btn btn-gray" onclick="post_toast2('/follow/{{u.username}}','button-unsub2','button-sub2')">
-					<i class="far fa-heart fa-sm fa-fw mr-1"></i>
-					Follow
-				</button>		
-			</li>
-			<!-- <li> dropdown here </li> -->
-		</ul>
+			{% if v and v.id != u.id %}
+			<ul class="flex flex-wrap space-x-2 items-center mb-0">
+				<li>
+					<button class="btn btn-gray" onclick="toggleElement('profile-toggleable-mobile', 'message-mobile')">
+						<i class="fas fa-paper-plane fa-sm fa-fw md:mr-1"></i>
+						<span class="hidden md:inline-block">Message</span>
+					</button >
+				</li>
+				{% if u.id != 995 %}
+				<li id="button-unsub2" class="{% if not is_following %}hidden{% endif %}">
+					<button class="btn btn-gray" onclick="post_toast2('/unfollow/{{u.username}}','button-unsub2','button-sub2')">
+						<i class="fas fa-heart-broken fa-sm fa-fw mr-1"></i>
+						Unfollow
+					</button>
+				</li>
+				{% endif %}
+				<li id="button-sub2" class="{% if is_following or u.is_nofollow or u.is_blocked %}hidden{% endif %}">
+					<button class="btn btn-gray" onclick="post_toast2('/follow/{{u.username}}','button-unsub2','button-sub2')">
+						<i class="far fa-heart fa-sm fa-fw mr-1"></i>
+						Follow
+					</button>		
+				</li>
+				<!-- <li> dropdown here </li> -->
+			</ul>
+		</div>
 		{% endif %}
 	</div>
 	<div class="relative col-span-full flex xl:hidden flex-col">
+		{% if u.id == v.id or not u.is_private %}
+		<ul class="hidden xl:flex items-center justify-around">
+			<li>
+				<div class="text-lg font-bold mb-0">{{ u.stored_subscriber_count }}</div>
+				<small class="mt-1 block font-bold text-gray-500">Followers</small>
+			</li>
+			<li>
+				<div class="text-lg font-bold mb-0">{{ u.coins }}</div>
+				<small class="mt-1 block font-bold text-gray-500">Dramacoin</small>
+			</li>
+			{% if u.procoins %}
+			<li>
+				<div class="text-lg font-bold mb-0">{{ u.procoins }}</div>
+				<small class="mt-1 block font-bold text-gray-500">MarseyBux</small>
+			</li>
+			{% endif %}
+		</ul>
+		{% endif %}
 		{% if u.bio_html %}
 		<div class="mb-3">
 			<p class="text-black text-break">{{u.bio_html | safe}}</p>