diff --git a/src/application.py b/src/application.py
index fd96e58..807c51b 100644
--- a/src/application.py
+++ b/src/application.py
@@ -678,8 +678,8 @@ def problems():
     categories.sort(key=lambda x: x['category'])
 
     is_ongoing_contest = len(db.execute(
-        ("SELECT id AS n FROM contests WHERE end > datetime('now') AND "
-         "start <= datetime('now') ORDER BY end DESC")))
+        "SELECT * FROM contests WHERE end > datetime('now') AND start <= datetime('now')"
+    ))
 
     return render_template('problem/problems.html',
                            data=data, solved=solved, length=-(-length // 50),
@@ -786,7 +786,13 @@ def profile(username):
 @app.route("/ranking")
 def ranking():
     user_info = db.execute("SELECT * FROM users WHERE verified=1 ORDER BY total_points DESC")
-    return render_template("ranking.html", user_data=user_info)
+
+    is_ongoing_contest = len(db.execute(
+        "SELECT * FROM contests WHERE end > datetime('now') AND start <= datetime('now')"
+    ))
+
+    return render_template("ranking.html", user_data=user_info,
+                           is_ongoing_contest=is_ongoing_contest)
 
 
 # Error handling
diff --git a/src/templates/contest/contest.html b/src/templates/contest/contest.html
index 6519908..475dd56 100644
--- a/src/templates/contest/contest.html
+++ b/src/templates/contest/contest.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "contest/layout.html" %}
 
 {% block title %}{{ title }}{% endblock %}
 {% block active %}Contests{% endblock %}
@@ -6,27 +6,22 @@
 {% block main %}
 <div style="position: relative; margin-bottom: 0.5rem;">
     <h1 style="display: inline;">{{ title }}</h1>
-    {% if scoreboard or check_perm(["ADMIN", "SUPERADMIN"]) %}
+    {% if check_perm(["ADMIN", "SUPERADMIN"]) %}
         <div class="dropdown" style="display: inline; margin-left: 4px;">
             <button class="btn btn-secondary dropdown-toggle" type="button"
                     data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
                     style="margin-top: -18px;">Actions</button>
             <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                {% if scoreboard %}
-                    <a class="dropdown-item" href="{{ request.path }}/scoreboard">Scoreboard</a>
-                {% endif %}
-                {% if check_perm(["ADMIN", "SUPERADMIN"]) %}
-                    <a class="dropdown-item"
-                       href="/admin/submissions?contest_id={{ request.path[9:] }}">Submissions</a>
-                    <a class="dropdown-item"
-                       href="{{ request.path }}/addproblem">Add Problem</a>
-                    <a class="dropdown-item"
-                       href="{{ request.path }}/drafts">View Draft Problems</a>
-                    <a class="dropdown-item"
-                       href="{{ request.path }}/notify">Notify Participants</a>
-                    <a class="dropdown-item"
-                       href="/api/contest/scoreboard/{{ request.path[9:] }}?key={{ scoreboard_key }}">Export CTFtime Scoreboard</a>
-                {% endif %}
+                <a class="dropdown-item"
+                   href="/admin/submissions?contest_id={{ request.path[9:] }}">Submissions</a>
+                <a class="dropdown-item"
+                   href="{{ request.path }}/addproblem">Add Problem</a>
+                <a class="dropdown-item"
+                   href="{{ request.path }}/drafts">View Draft Problems</a>
+                <a class="dropdown-item"
+                   href="{{ request.path }}/notify">Notify Participants</a>
+                <a class="dropdown-item"
+                   href="/api/contest/scoreboard/{{ request.path[9:] }}?key={{ scoreboard_key }}">Export CTFtime Scoreboard</a>
             </div>
         </div>
     {% endif %}
diff --git a/src/templates/contest/contest_problem.html b/src/templates/contest/contest_problem.html
index 51eccab..b05a1a0 100644
--- a/src/templates/contest/contest_problem.html
+++ b/src/templates/contest/contest_problem.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "contest/layout.html" %}
 
 {% block title %}{{ data["name"] }}{% endblock %}
 {% block active %}Contests{% endblock %}
diff --git a/src/templates/contest/contest_problem_noexist.html b/src/templates/contest/contest_problem_noexist.html
index db49224..de68b19 100644
--- a/src/templates/contest/contest_problem_noexist.html
+++ b/src/templates/contest/contest_problem_noexist.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "contest/layout.html" %}
 
 {% block title %}Nonexistent problem{% endblock %}
 {% block active %}Contests{% endblock %}
diff --git a/src/templates/contest/create_problem.html b/src/templates/contest/create_problem.html
index e146777..4154591 100644
--- a/src/templates/contest/create_problem.html
+++ b/src/templates/contest/create_problem.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "contest/layout.html" %}
 
 {% block title %}Create Problem{% endblock %}
 {% block active %}Contests{% endblock %}
diff --git a/src/templates/contest/draft_problems.html b/src/templates/contest/draft_problems.html
index f85c40a..8f5c052 100644
--- a/src/templates/contest/draft_problems.html
+++ b/src/templates/contest/draft_problems.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "contest/layout.html" %}
 
 {% block title %}{{ title }} Draft Problems{% endblock %}
 {% block active %}Contests{% endblock %}
diff --git a/src/templates/contest/edit_problem.html b/src/templates/contest/edit_problem.html
index c687302..b8e203d 100644
--- a/src/templates/contest/edit_problem.html
+++ b/src/templates/contest/edit_problem.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "contest/layout.html" %}
 
 {% block title %}Edit {{ data["name"] }}{% endblock %}
 {% block active %}Contests{% endblock %}
diff --git a/src/templates/contest/export_problem.html b/src/templates/contest/export_problem.html
index 30dcdd2..e878e33 100644
--- a/src/templates/contest/export_problem.html
+++ b/src/templates/contest/export_problem.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "contest/layout.html" %}
 
 {% block title %}Export {{ data["name"] }}{% endblock %}
 {% block active %}Contests{% endblock %}
diff --git a/src/templates/contest/layout.html b/src/templates/contest/layout.html
new file mode 100644
index 0000000..c127ee3
--- /dev/null
+++ b/src/templates/contest/layout.html
@@ -0,0 +1,5 @@
+{% extends "layout.html" %}
+
+{% block contest_leaderboard %}
+<li><a class="nav-link" href="{{ '/'.join(request.path.split('/')[:3]) }}/scoreboard">Contest Leaderboard</a></li>
+{% endblock %}
\ No newline at end of file
diff --git a/src/templates/contest/notify.html b/src/templates/contest/notify.html
index c2b20e3..a04b2d5 100644
--- a/src/templates/contest/notify.html
+++ b/src/templates/contest/notify.html
@@ -1,4 +1,4 @@
-{% extends "layout.html" %}
+{% extends "contest/layout.html" %}
 
 {% block title %}Notify Participants{% endblock %}
 {% block active %}Contests{% endblock %}
diff --git a/src/templates/contest/scoreboard.html b/src/templates/contest/scoreboard.html
index ccd4eae..39f76ff 100644
--- a/src/templates/contest/scoreboard.html
+++ b/src/templates/contest/scoreboard.html
@@ -1,7 +1,7 @@
-{% extends "layout.html" %}
+{% extends "contest/layout.html" %}
 
 {% block title %}{{ title }} Scoreboard{% endblock %}
-{% block active %}Contests{% endblock %}
+{% block active %}Contest Leaderboard{% endblock %}
 
 {% block main %}
 <h1><a href="{{ request.path[:-11] }}">{{ title }}</a></h1>
diff --git a/src/templates/layout.html b/src/templates/layout.html
index 2d14f3f..0983f95 100644
--- a/src/templates/layout.html
+++ b/src/templates/layout.html
@@ -27,8 +27,9 @@
                     <ul class="navbar-nav me-auto">
                         <li><a class="nav-link" href="/">Home</a></li>
                         <li><a class="nav-link" href="/problems">Practice</a></li>
+                        <li><a class="nav-link" href="/ranking">Practice Leaderboard</a></li>
                         <li><a class="nav-link" href="/contests">Contests</a></li>
-                        <li><a class="nav-link" href="/ranking">Rankings</a></li>
+                        {% block contest_leaderboard %}{% endblock %}
                         {% if check_perm(["ADMIN", "SUPERADMIN", "PROBLEM_MANAGER"]) %}
                             <li><a class="nav-link" href="/admin/console">Admin Console</a></li>
                         {% endif %}
diff --git a/src/templates/ranking.html b/src/templates/ranking.html
index b2a3401..eea4bb3 100644
--- a/src/templates/ranking.html
+++ b/src/templates/ranking.html
@@ -1,10 +1,20 @@
 {% extends "layout.html" %}
 
-{% block title %}Rankings{% endblock %}
-{% block active %}Rankings{% endblock %}
+{% block title %}Practice Leaderboard{% endblock %}
+{% block active %}Practice Leaderboard{% endblock %}
 
 {% block main %}
-<h1>Rankings</h1>
+<h1>Practice Leaderboard</h1>
+{% if is_ongoing_contest %}
+<div class="alert alert-danger alert-dismissible fade show" role="alert">
+        There is currently an ongoing contest. To view its scoreboard, go to the <a href="/contests">Contests</a> page, enter the contest, and then click "Contest Leaderboard" at the top of the page.
+        This scoreboard is only for <b>practice problems unrelated to the contest</b>.
+        <button type="button"
+                class="btn-close"
+                data-bs-dismiss="alert"
+                aria-label="Close"></button>
+    </div>
+{% endif %}
 <div style="overflow-x: auto;">
     <table class="table table-hover table-full-width">
         <thead class="table-dark">
diff --git a/src/tests/test_contest.py b/src/tests/test_contest.py
index 0db46af..7ffd7d2 100644
--- a/src/tests/test_contest.py
+++ b/src/tests/test_contest.py
@@ -114,6 +114,7 @@ def test_contest(client, database):
 
     result = client.get('/contest/testingcontest/problem/helloworldtesting')
     assert result.status_code == 200
+    assert b'Contest Leaderboard' in result.data
 
     result = client.post('/contest/testingcontest/problem/helloworldtesting/edit', data={
         'name': 'hello world 2',
diff --git a/src/tests/test_pages.py b/src/tests/test_pages.py
index 63bd524..848664a 100644
--- a/src/tests/test_pages.py
+++ b/src/tests/test_pages.py
@@ -22,7 +22,8 @@ def test_pages(client, database):
 
     result = client.get('/ranking')
     assert result.status_code == 200
-    assert b'Rankings' in result.data
+    assert b'Practice Leaderboard' in result.data
+    assert b'Contest Leaderboard' not in result.data
 
     result = client.post('/login', data={
         'username': 'normal_user',
diff --git a/src/views/contest.py b/src/views/contest.py
index 43cc235..ea6685a 100644
--- a/src/views/contest.py
+++ b/src/views/contest.py
@@ -31,9 +31,6 @@ def contest(contest_id):
         return redirect("/contests")
 
     title = contest_info[0]["name"]
-
-    # Check for scoreboard permission
-    scoreboard = contest_info[0]["scoreboard_visible"] or check_perm(["ADMIN", "SUPERADMIN"])
     scoreboard_key = contest_info[0]["scoreboard_key"]
 
     user_info = db.execute(
@@ -82,7 +79,7 @@ def contest(contest_id):
         }
         data.append(keys)
 
-    return render_template("contest/contest.html", title=title, scoreboard=scoreboard,
+    return render_template("contest/contest.html", title=title,
                            scoreboard_key=scoreboard_key, data=data)
 
 
@@ -409,7 +406,7 @@ def contest_scoreboard(contest_id):
     # Ensure proper permissions
     if not (contest_info[0]["scoreboard_visible"] or check_perm(["ADMIN", "SUPERADMIN"])):
         flash('You are not allowed to view the scoreboard!', 'danger')
-        return redirect("/contest/" + contest_id)
+        return redirect(request.referrer)
 
     data = db.execute(
         ("SELECT user_id, points, lastAC, username FROM contest_users "