diff --git a/files/helpers/regex.py b/files/helpers/regex.py
index 180546140a..870908de36 100644
--- a/files/helpers/regex.py
+++ b/files/helpers/regex.py
@@ -90,7 +90,7 @@ ascii_only_regex = re.compile("[ -~]+", flags=re.A)
 
 reddit_to_vreddit_regex = re.compile('(^|>|")https:\/\/old.reddit.com\/(r|u)\/', flags=re.A)
 
-reddit_domain_regex = re.compile("(^|\s|\()https?:\/\/(reddit\.com|new\.reddit.com|www\.reddit.com|i\.reddit\.com|libredd\.it|teddit\.net)\/(r|u)\/", flags=re.A)
+reddit_domain_regex = re.compile("(^|\s|\()https?:\/\/(reddit\.com|new\.reddit.com|np\.reddit.com|www\.reddit.com|i\.reddit\.com|libredd\.it|teddit\.net)\/(r|u)\/", flags=re.A)
 
 color_regex = re.compile("[a-z0-9]{6}", flags=re.A)
 
@@ -111,7 +111,7 @@ def sub_matcher(match, upper=False):
 		return match.group(0)
 	else:
 		repl = SLURS[match.group(0).lower()]
-		return repl if not upper else repl.upper()
+		return repl if not upper or "<img" in repl else repl.upper()
 
 def sub_matcher_upper(match):
 	return sub_matcher(match, upper=True)
diff --git a/files/templates/hats.html b/files/templates/hats.html
index 45768078dd..4a06aeb2e7 100644
--- a/files/templates/hats.html
+++ b/files/templates/hats.html
@@ -13,8 +13,37 @@
 				width: 80%;
 			}
 		}
+
+		.shop-tab {
+			display: inline-flex;
+			max-width: 46.6%;
+			letter-spacing: 3px;
+		}
+
+		.shop-tab.active {
+			background-color: var(--primary) !important;
+			pointer-events: none !important;
+			cursor: default !important;
+		}
 	</style>
 
+	<div class="container-fluid bg-white sticky" style="padding-top: 30px; padding-bottom: 0 !important;">
+		<div class="row box-shadow-bottom">
+			<div class="col">
+				<div class="container" style="padding-bottom: 0;">
+					<div class="row box-shadow-bottom bg-white" style="justify-content: center;">
+						<a class="btn btn-primary btn-block py-2 m-0 mr-3 shop-tab" href="/shop">
+							<span class="mr-auto ml-auto"><i class="fas fa-gift mr-2"></i>AWARDS</span>
+						</a>
+						<a class="btn btn-primary btn-block py-2 m-0 shop-tab active" href="/hats">
+							<span class="mr-auto ml-auto"><i class="fas fa-hat-cowboy mr-2"></i>HATS</span>
+						</a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
 	<header class="container pb-1 text-center">
 		<img id="hats-banner" class="mt-5" alt="hats banner" src="/i/hats.webp?v=1" width="50%">
 		<h5 class="mt-4">Number of hats you bought: {{v.num_of_owned_hats}}</h5>
diff --git a/files/templates/shop.html b/files/templates/shop.html
index 6f34e51930..1192a60f8b 100644
--- a/files/templates/shop.html
+++ b/files/templates/shop.html
@@ -19,8 +19,37 @@
 				width: 80%;
 			}
 		}
+
+		.shop-tab {
+			display: inline-flex;
+			max-width: 46.6%;
+			letter-spacing: 3px;
+		}
+
+		.shop-tab.active {
+			background-color: var(--primary) !important;
+			pointer-events: none !important;
+			cursor: default !important;
+		}
 	</style>
 
+	<div class="container-fluid bg-white sticky" style="padding-top: 30px; padding-bottom: 0 !important;">
+		<div class="row box-shadow-bottom">
+			<div class="col">
+				<div class="container" style="padding-bottom: 0;">
+					<div class="row box-shadow-bottom bg-white" style="justify-content: center;">
+						<a class="btn btn-primary btn-block m-0 mr-3 shop-tab active" href="/shop">
+							<span class="mr-auto ml-auto"><i class="fas fa-gift mr-2"></i>AWARDS</span>
+						</a>
+						<a class="btn btn-primary btn-block m-0 shop-tab" href="/hats">
+							<span class="mr-auto ml-auto"><i class="fas fa-hat-cowboy mr-2"></i>HATS</span>
+						</a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
 	<header class="container pb-1 text-center">
 		<img id="shop-banner" alt="shop banner" src="/i/shop.webp">
 		<h3 class="mt-4">{{SHOP_FLAVOR}} Earn coins.</h5>
@@ -31,8 +60,6 @@
 		{% if FEATURES['PROCOINS'] %}
 			<h5 class="mt-4">Your current marseybux: {{"{:,}".format(v.procoins)}}</h3>
 		{% endif %}
-
-		<h5 class="mt-5"><a href="/hats">Buy hats here!</a></h5>
 	</header>
 {% endblock %}