diff --git a/files/helpers/services.py b/files/helpers/services.py
index baa35812e..4846bcdb5 100644
--- a/files/helpers/services.py
+++ b/files/helpers/services.py
@@ -26,7 +26,7 @@ def pusher_thread2(interests, notifbody, username):
 				'notification': {
 					'title': f'New message from @{username}',
 					'body': notifbody,
-					'deep_link': f'{SITE_FULL}/notifications?messages=true',
+					'deep_link': f'{SITE_FULL}/notifications/messages',
 					'icon': SITE_FULL + assetcache_path(f'images/{SITE_ID}/icon.webp'),
 				}
 			},
@@ -36,7 +36,7 @@ def pusher_thread2(interests, notifbody, username):
 					'body': notifbody,
 				},
 				'data': {
-					'url': '/notifications?messages=true',
+					'url': '/notifications/messages',
 				}
 			}
 		},
diff --git a/files/routes/front.py b/files/routes/front.py
index a0b09c77a..f2560b9ea 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -42,104 +42,175 @@ def unread(v):
 
 @app.get("/notifications")
 @auth_required
-def notifications(v):
-	try: page = max(int(request.values.get("page", 1)), 1)
-	except: page = 1
+def notifications_main(v: User):
+	page: int = max(request.values.get("page", 1, int) or 1, 1)
 
-	messages = request.values.get('messages')
-	modmail = request.values.get('modmail')
-	posts = request.values.get('posts')
-	if modmail and v.admin_level >= 2:
-		comments = g.db.query(Comment).filter(Comment.sentto == MODMAIL_ID).order_by(Comment.id.desc()).offset(25*(page-1)).limit(26).all()
-		next_exists = (len(comments) > 25)
-		listing = comments[:25]
-	elif messages:
-		if v and (v.shadowbanned or v.admin_level >= 3):
-			comments = g.db.query(Comment).filter(Comment.sentto != None, or_(Comment.author_id==v.id, Comment.sentto==v.id), Comment.parent_submission == None, Comment.level == 1).order_by(Comment.id.desc()).offset(25*(page-1)).limit(26).all()
-		else:
-			comments = g.db.query(Comment).join(User, User.id == Comment.author_id).filter(User.shadowbanned == None, Comment.sentto != None, or_(Comment.author_id==v.id, Comment.sentto==v.id), Comment.parent_submission == None, Comment.level == 1).order_by(Comment.id.desc()).offset(25*(page-1)).limit(26).all()
-
-		next_exists = (len(comments) > 25)
-		listing = comments[:25]
-	elif posts:
-		notifications = g.db.query(Notification, Comment).join(Comment, Notification.comment_id == Comment.id).filter(Notification.user_id == v.id, Comment.author_id == AUTOJANNY_ID).order_by(Notification.created_utc.desc()).offset(25 * (page - 1)).limit(101).all()
-
-		listing = []
-
-		for index, x in enumerate(notifications[:100]):
-			n, c = x
-			if n.read and index > 24: break
-			elif not n.read:
-				n.read = True
-				c.unread = True
-				g.db.add(n)
-			if n.created_utc > 1620391248: c.notif_utc = n.created_utc
-			listing.append(c)
-
-		g.db.commit()
-
-		next_exists = (len(notifications) > len(listing))
-	else:		
-		comments = g.db.query(Comment, Notification).join(Notification, Notification.comment_id == Comment.id).filter(
+	comments = (g.db.query(Comment, Notification)
+		.join(Notification.comment)
+		.filter(
 			Notification.user_id == v.id,
 			Comment.state_mod == StateMod.VISIBLE,
 			Comment.state_user_deleted_utc == None,
 			Comment.author_id != AUTOJANNY_ID,
-		).order_by(Notification.created_utc.desc())
+		).order_by(Notification.created_utc.desc()))
 
-		if not (v and (v.shadowbanned or v.admin_level >= 3)):
-			comments = comments.join(User, User.id == Comment.author_id).filter(User.shadowbanned == None)
+	if not v.shadowbanned and v.admin_level < 3:
+		comments = comments.join(Comment.author).filter(User.shadowbanned == None)
 
-		comments = comments.offset(25 * (page - 1)).limit(26).all()
+	comments = comments.offset(25 * (page - 1)).limit(26).all()
 
-		next_exists = (len(comments) > 25)
-		comments = comments[:25]
+	next_exists = (len(comments) > 25)
+	comments = comments[:25]
 
-		cids = [x[0].id for x in comments]
+	cids = [x[0].id for x in comments]
 
-		comms = get_comments(cids, v=v)
+	comms = get_comments(cids, v=v)
 
-		listing = []
-		for c, n in comments:
-			if n.created_utc > 1620391248: c.notif_utc = n.created_utc
-			if not n.read:
-				n.read = True
-				c.unread = True
-				g.db.add(n)
+	listing = []
+	for c, n in comments:
+		if n.created_utc > 1620391248: c.notif_utc = n.created_utc
+		if not n.read:
+			n.read = True
+			c.unread = True
+			g.db.add(n)
 
-			if c.parent_submission:
+		if c.parent_submission:
+			if c.replies2 == None:
+				c.replies2 = (c.child_comments
+					.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids)))
+					.order_by(Comment.created_utc.desc()).all())
+				for x in c.replies2:
+					if x.replies2 == None: x.replies2 = []
+			count = 0
+			while (count < 50 and c.parent_comment
+					and (c.parent_comment.author_id == v.id or c.parent_comment.id in cids)):
+				count += 1
+				c = c.parent_comment
 				if c.replies2 == None:
-					c.replies2 = c.child_comments.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).all()
+					c.replies2 = (c.child_comments
+						.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids)))
+						.order_by(Comment.created_utc.desc()).all())
 					for x in c.replies2:
-						if x.replies2 == None: x.replies2 = []
-				count = 0
-				while count < 50 and c.parent_comment and (c.parent_comment.author_id == v.id or c.parent_comment.id in cids):
-					count += 1
-					c = c.parent_comment
-					if c.replies2 == None:
-						c.replies2 = c.child_comments.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).all()
-						for x in c.replies2:
-							if x.replies2 == None:
-								x.replies2 = x.child_comments.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids))).all()
-			else:
-				while c.parent_comment:
-					c = c.parent_comment
-				c.replies2 = g.db.query(Comment).filter_by(parent_comment_id=c.id).order_by(Comment.id).all()
+						if x.replies2 == None:
+							x.replies2 = (x.child_comments
+								.filter(or_(Comment.author_id == v.id, Comment.id.in_(cids)))
+								.order_by(Comment.created_utc.desc()).all())
+		else:
+			while c.parent_comment:
+				c = c.parent_comment
+			c.replies2 = c.child_comments.order_by(Comment.id).all()
 
-			if c not in listing: listing.append(c)
+		if c not in listing: listing.append(c)
 
 	g.db.commit()
 
-	if request.headers.get("Authorization"): return {"data":[x.json for x in listing]}
+	if request.headers.get("Authorization"):
+		return {"data": [x.json for x in listing]}
 
 	return render_template("notifications.html",
-							v=v,
-							notifications=listing,
-							next_exists=next_exists,
-							page=page,
-							standalone=True,
-							render_replies=True
-						   )
+		v=v,
+		notifications=listing,
+		next_exists=next_exists,
+		page=page,
+		standalone=True,
+		render_replies=True,
+	)
+
+
+@app.get("/notifications/posts")
+@auth_required
+def notifications_posts(v: User):
+	page: int = max(request.values.get("page", 1, int) or 1, 1)
+
+	notifications = (g.db.query(Notification, Comment)
+		.join(Comment, Notification.comment_id == Comment.id)
+		.filter(Notification.user_id == v.id, Comment.author_id == AUTOJANNY_ID)
+		.order_by(Notification.created_utc.desc()).offset(25 * (page - 1)).limit(101).all())
+
+	listing = []
+
+	for index, x in enumerate(notifications[:100]):
+		n, c = x
+		if n.read and index > 24: break
+		elif not n.read:
+			n.read = True
+			c.unread = True
+			g.db.add(n)
+		if n.created_utc > 1620391248: c.notif_utc = n.created_utc
+		listing.append(c)
+
+	next_exists = (len(notifications) > len(listing))
+
+	g.db.commit()
+
+	if request.headers.get("Authorization"):
+		return {"data": [x.json for x in listing]}
+
+	return render_template("notifications.html",
+		v=v,
+		notifications=listing,
+		next_exists=next_exists,
+		page=page,
+		standalone=True,
+		render_replies=True,
+	)
+
+
+@app.get("/notifications/modmail")
+@admin_level_required(2)
+def notifications_modmail(v: User):
+	page: int = max(request.values.get("page", 1, int) or 1, 1)
+
+	comments = (g.db.query(Comment)
+		.filter(Comment.sentto == MODMAIL_ID)
+		.order_by(Comment.id.desc()).offset(25 * (page - 1)).limit(26).all())
+	next_exists = (len(comments) > 25)
+	listing = comments[:25]
+
+	if request.headers.get("Authorization"):
+		return {"data": [x.json for x in listing]}
+
+	return render_template("notifications.html",
+		v=v,
+		notifications=listing,
+		next_exists=next_exists,
+		page=page,
+		standalone=True,
+		render_replies=True,
+	)
+
+
+@app.get("/notifications/messages")
+@auth_required
+def notifications_messages(v: User):
+	page: int = max(request.values.get("page", 1, int) or 1, 1)
+
+	comments = g.db.query(Comment).filter(
+		Comment.sentto != None,
+		or_(Comment.author_id==v.id, Comment.sentto==v.id),
+		Comment.parent_submission == None,
+		Comment.level == 1,
+	)
+
+	if not v.shadowbanned and v.admin_level < 3:
+		comments = comments.join(Comment.author).filter(User.shadowbanned == None)
+
+	comments = comments.order_by(Comment.id.desc()).offset(25 * (page - 1)).limit(26).all()
+
+	next_exists = (len(comments) > 25)
+	listing = comments[:25]
+
+	if request.headers.get("Authorization"):
+		return {"data": [x.json for x in listing]}
+
+	return render_template("notifications.html",
+		v=v,
+		notifications=listing,
+		next_exists=next_exists,
+		page=page,
+		standalone=True,
+		render_replies=True,
+	)
 
 
 @app.get("/")
diff --git a/files/routes/users.py b/files/routes/users.py
index 69e983a08..de8be3825 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -540,7 +540,7 @@ def messagereply(v):
 						'notification': {
 							'title': f'New message from @{v.username}',
 							'body': notifbody,
-							'deep_link': f'{SITE_FULL}/notifications?messages=true',
+							'deep_link': f'{SITE_FULL}/notifications/messages',
 							'icon': SITE_FULL + assetcache_path(f'images/{SITE_ID}/icon.webp'),
 						}
 					},
@@ -550,7 +550,7 @@ def messagereply(v):
 							'body': notifbody,
 						},
 						'data': {
-							'url': '/notifications?messages=true',
+							'url': '/notifications/messages',
 						}
 					}
 				},
diff --git a/files/templates/header.html b/files/templates/header.html
index 45271776b..67ae0a87f 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -27,7 +27,7 @@
 
 			{% if v %}
 				{% if v.notifications_count %}
-					<a class="mobile-nav-icon d-md-none pl-0" href="/notifications{% if v.do_posts %}?posts=true{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Notifications"><i class="fas fa-bell align-middle text-danger" {% if v.do_posts %}style="color:blue!important"{% endif %}></i><span class="notif-count ml-1" style="padding-left: 4.5px;{% if v.do_posts %}background:blue{% endif %}">{{v.notifications_count}}</span></a>
+					<a class="mobile-nav-icon d-md-none pl-0" href="/notifications{% if v.do_posts %}/posts{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Notifications"><i class="fas fa-bell align-middle text-danger" {% if v.do_posts %}style="color:blue!important"{% endif %}></i><span class="notif-count ml-1" style="padding-left: 4.5px;{% if v.do_posts %}background:blue{% endif %}">{{v.notifications_count}}</span></a>
 				{% else %}
 					<a class="mobile-nav-icon d-md-none" href="/notifications" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Notifications"><i class="fas fa-bell  align-middle text-gray-500 black"></i></a>
 				{% endif %}
@@ -57,7 +57,7 @@
 				{% if v.notifications_count %}
 
 				<li class="nav-item d-flex align-items-center text-center justify-content-center mx-1">
-					<a class="nav-link position-relative" href="/notifications{% if v.do_posts %}?posts=true{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Notifications"><i class="fas fa-bell text-danger" {% if v.do_posts %}style="color:blue!important"{% endif %}></i><span class="notif-count ml-1" style="padding-left: 4.5px;{% if v.do_posts %}background:blue{% endif %}">{{v.notifications_count}}</span></a>
+					<a class="nav-link position-relative" href="/notifications{% if v.do_posts %}/posts{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Notifications"><i class="fas fa-bell text-danger" {% if v.do_posts %}style="color:blue!important"{% endif %}></i><span class="notif-count ml-1" style="padding-left: 4.5px;{% if v.do_posts %}background:blue{% endif %}">{{v.notifications_count}}</span></a>
 				</li>
 
 				{% else %}
diff --git a/files/templates/notifications.html b/files/templates/notifications.html
index e237df7f8..947795b91 100644
--- a/files/templates/notifications.html
+++ b/files/templates/notifications.html
@@ -19,18 +19,18 @@
 		</a>
 	</li>
 	<li class="nav-item">
-		<a class="nav-link py-3{% if '/notifications?posts=true' in request.full_path %} active{% endif %}" href="/notifications?posts=true">
+		<a class="nav-link py-3{% if '/notifications/posts' in request.full_path %} active{% endif %}" href="/notifications/posts">
 		Posts {% if v.post_notifications_count %}<span class="font-weight-bold" style="color:blue">({{v.post_notifications_count}})</span>{% endif %}
 		</a>
 	</li>
 	<li class="nav-item">
-		<a class="nav-link py-3{% if '/notifications?messages=true' in request.full_path %} active{% endif %}" href="/notifications?messages=true">
+		<a class="nav-link py-3{% if '/notifications/messages' in request.full_path %} active{% endif %}" href="/notifications/messages">
 		Messages
 		</a>
 	</li>
 	{% if v.admin_level >= 2 %}
 		<li class="nav-item">
-			<a class="nav-link py-3{% if '/notifications?modmail=true' in request.full_path %} active{% endif %}" href="/notifications?modmail=true">
+			<a class="nav-link py-3{% if '/notifications/modmail' in request.full_path %} active{% endif %}" href="/notifications/modmail">
 			Modmail
 			</a>
 		</li>