diff --git a/assets/css/default.css b/assets/css/default.css
index 96c4198a..3d29329e 100644
--- a/assets/css/default.css
+++ b/assets/css/default.css
@@ -754,7 +754,6 @@ body.dark-theme {
   color: #ccc;
 }
 
-
 .dark-theme .error-card {
   border: 1px solid #5e5e5e;
 }
@@ -912,7 +911,7 @@ h1, h2, h3, h4, h5, p,
 #logo > h1 { text-align: center; }
 
 #footer_buffer {
-  margin-top: 50vh;
+  margin-top: 12.5vh;
 }
 
 @media screen and (max-width: 450px) {
diff --git a/locales/en-US.json b/locales/en-US.json
index 07a458e6..687cfa49 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -474,7 +474,7 @@
     "footer_navigation_section_header": "Navigation",
     "footer_home_link": "Home",
     "footer_project_information_section_header": "Invidious",
-    "footer_project_homepage_link": "Project Homepage",
+    "footer_project_website_link": "Project Website",
     "footer_source_code_link": "Source Code",
     "footer_issue_tracker_link": "Issue tracker",
     "footer_public_instances_link": "Public instances",
diff --git a/src/invidious/routes/channels.cr b/src/invidious/routes/channels.cr
index e662c931..3c53f754 100644
--- a/src/invidious/routes/channels.cr
+++ b/src/invidious/routes/channels.cr
@@ -154,7 +154,8 @@ module Invidious::Routes::Channels
     items.each(&.author = "")
 
     selected_tab = Frontend::ChannelPage::TabsAvailable::Playlists
-    templated "channel", buffer_footer: true
+
+    templated "channel"
   end
 
   def self.podcasts(env)
diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr
index 7896d7ec..eed7b77a 100644
--- a/src/invidious/views/channel.ecr
+++ b/src/invidious/views/channel.ecr
@@ -59,3 +59,7 @@
 
 
 <%= rendered "components/items_paginated" %>
+
+<% if selected_tab == Frontend::ChannelPage::TabsAvailable::Playlists %>
+<div id="footer_buffer"></div>  
+<% end %>
\ No newline at end of file
diff --git a/src/invidious/views/template.ecr b/src/invidious/views/template.ecr
index 2665b381..9077207e 100644
--- a/src/invidious/views/template.ecr
+++ b/src/invidious/views/template.ecr
@@ -151,11 +151,11 @@
 				</div>
 				<% end %>
 
-				<% if companion_switched %>
-					<div class="h-box">
-						<p><%= translate(locale, "backend_unavailable") %></p>
-					</div>
-				<% end %>
+                <% if companion_switched %>
+                    <div class="h-box">
+                        <p><%= translate(locale, "backend_unavailable") %></p>
+                    </div>
+                <% end %>
 
 				<% if CONFIG.banner %>
 					<div class="h-box">
@@ -163,206 +163,201 @@
 					</div>
 				<% end %>
 
-				<%= content %>
+            <%= content %>
+        </div>
+    </div>
+    <script src="/<%= JS_PATH %>/handlers.js?v=<%= ASSET_COMMIT %>"></script>
+    <script src="/<%= JS_PATH %>/themes.js?v=<%= ASSET_COMMIT %>"></script>
+    <% if env.get? "user" %>
+        <script src="/<%= JS_PATH %>/sse.js?v=<%= ASSET_COMMIT %>"></script>
+        <script id="notification_data" type="application/json">
+        <%=
+        {
+            "upload_text" => HTML.escape(translate(locale, "`x` uploaded a video")),
+            "live_upload_text" => HTML.escape(translate(locale, "`x` is live"))
+        }.to_pretty_json
+        %>
+        </script>
+        <% if CONFIG.enable_user_notifications %>
+        <script src="/<%= JS_PATH %>/notifications.js?v=<%= ASSET_COMMIT %>"></script>
+        <% end %>
+    <% end %>
 
-			<% if buffer_footer %>
-				<div id="footer_buffer"></div>
-			<% end %>
+    <footer class="pure-g">
+        <div class="pure-u-1 pure-u-md-2-24"></div>
+        <div class="h-box pure-u-1 pure-u-md-20-24" id="footer-content-container">
+            <div class="pure-u-1 footer-content">
+                <div class="footer-section pure-u-1-4" id="footer-custom-text">
+                    <b>Invidious</b>
+                    <% if CONFIG.footer %>
+                        <p><%=CONFIG.footer%></p>
+                    <% else %>
+                        <p><%=translate(locale, "default_invidious_footer_text")%></p>
+                    <% end %>
+                    
+                </div>
+                <div class="footer-section">
+                    <b class="footer-section-header"><%= translate(locale, "footer_navigation_section_header")%></b>
+                    <ul class="pure-menu-list footer-section-list">
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="/" title="<%= translate(locale, "footer_home_link")%>">
+                                <%= translate(locale, "footer_home_link") %>
+                            </a>
+                        </li>
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="/feed/popular" title="<%= translate(locale, "Popular")%>">
+                                <%= translate(locale, "Popular") %>
+                            </a>
+                        </li>
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="/feed/trending" title="<%= translate(locale, "Trending")%>" style="">
+                                <%= translate(locale, "Trending") %>
+                            </a>
+                        </li>
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="/search" title="<%= translate(locale, "Search")%>">
+                                <%= translate(locale, "Search") %>
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+                <div class="footer-section">
+                    <b class="footer-section-header">Invidious</b>
+                    <ul class="pure-menu-list footer-section-list">
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="https://invidious.io" title="<%= translate(locale, "footer_project_website_link")%>">
+                                <%= translate(locale, "footer_project_website_link") %>
+                            </a>
+                        </li>
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="https://github.com/iv-org/invidious" title="<%= translate(locale, "footer_source_code_link")%>">
+                                <%= translate(locale, "footer_source_code_link") %>
+                            </a>
+                        </li>
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="https://github.com/iv-org/invidious/issues" title="<%= translate(locale, "footer_issue_tracker_link")%>" style="">
+                                <%= translate(locale, "footer_issue_tracker_link") %>
+                            </a>
+                        </li>
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="https://instances.invidious.io" title="<%= translate(locale, "footer_public_instances_link")%>">
+                                <%= translate(locale, "footer_public_instances_link") %>
+                            </a>
+                        </li>
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="https://invidious.io/donate" title="<%= translate(locale, "footer_donate_link")%>">
+                                <%= translate(locale, "footer_donate_link") %>
+                            </a>
+                        </li>
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="https://matrix.to/#/#invidious:matrix.org" title="<%= translate(locale, "footer_matrix_link")%>">
+                                <%= translate(locale, "footer_matrix_link") %>
+                            </a>
+                        </li>
 
-		</div>
-	</div>
-	<script src="/<%= JS_PATH %>/handlers.js?v=<%= ASSET_COMMIT %>"></script>
-	<script src="/<%= JS_PATH %>/themes.js?v=<%= ASSET_COMMIT %>"></script>
-	<% if env.get? "user" %>
-		<script src="/<%= JS_PATH %>/sse.js?v=<%= ASSET_COMMIT %>"></script>
-		<script id="notification_data" type="application/json">
-		<%=
-		{
-			"upload_text" => HTML.escape(translate(locale, "`x` uploaded a video")),
-			"live_upload_text" => HTML.escape(translate(locale, "`x` is live"))
-		}.to_pretty_json
-		%>
-		</script>
-		<% if CONFIG.enable_user_notifications %>
-		<script src="/<%= JS_PATH %>/notifications.js?v=<%= ASSET_COMMIT %>"></script>
-		<% end %>
-	<% end %>
+                    </ul>                
+                </div>
+                <% if CONFIG.instance_maintainer_email || CONFIG.modified_source_code_url || CONFIG.footer_instance_tos_link || CONFIG.footer_instance_privacy_policy_link %>
+                    <div class="footer-section">
+                        <b class="footer-section-header">
+                            <% if CONFIG.modified_source_code_url %>
+                                <%= translate(locale, "footer_instance_section_header_modified_source")%>
+                            <% else %>
+                                <%= translate(locale, "footer_instance_section_header")%>
+                            <% end %>
+                        </b>
+                        <ul class="pure-menu-list footer-section-list">
+                            <% if CONFIG.instance_maintainer_email %>
+                                <li class="pure-menu-item footer-section-item">
+                                    <a href="<%=HTML.escape("mailto:#{CONFIG.instance_maintainer_email.not_nil!}")%>" title="<%= translate(locale, "footer_contact_link")%>">
+                                        <%= translate(locale, "footer_contact_link") %>
+                                    </a>
+                                </li>
+                            <% end %>
+                            <% if CONFIG.modified_source_code_url %>
+                                <li class="pure-menu-item footer-section-item">
+                                    <a href="<%=HTML.escape(CONFIG.modified_source_code_url.not_nil!)%>" title="<%= translate(locale, "footer_instance_section_modified_source_code")%>">
+                                        <%= translate(locale, "footer_instance_section_modified_source_code") %>
+                                    </a>
+                                </li>
+                            <% end %>
+                            <% if CONFIG.footer_instance_tos_link %>
+                                <li class="pure-menu-item footer-section-item">
+                                    <a href="<%=HTML.escape(CONFIG.footer_instance_tos_link.not_nil!)%>" title="<%= translate(locale, "footer_instance_section_tos")%>">
+                                        <%= translate(locale, "footer_instance_section_tos") %>
+                                    </a>
+                                </li>
+                            <% end %>
+                            <% if CONFIG.footer_instance_privacy_policy_link %>
+                                <li class="pure-menu-item footer-section-item">
+                                    <a href="<%=HTML.escape(CONFIG.footer_instance_privacy_policy_link.not_nil!)%>" title="<%= translate(locale, "footer_instance_section_privacy_policy")%>">
+                                        <%= translate(locale, "footer_instance_section_privacy_policy") %>
+                                    </a>
+                                </li>
+                            <% end %>
 
-	<footer class="pure-g">
-		<div class="pure-u-1 pure-u-md-2-24"></div>
-		<div class="h-box pure-u-1 pure-u-md-20-24" id="footer-content-container">
-			<div class="pure-u-1 footer-content">
-				<div class="footer-section pure-u-1-4" id="footer-custom-text">
-					<b>Invidious</b>
-					<% if CONFIG.footer %>
-						<p><%=CONFIG.footer%></p>
-					<% else %>
-						<p><%=translate(locale, "default_invidious_footer_text")%></p>
-					<% end %>
+                            <% if CONFIG.footer_instance_donate_link %>
+                                <li class="pure-menu-item footer-section-item">
+                                    <a href="<%=HTML.escape(CONFIG.footer_instance_donate_link.not_nil!)%>" title="<%= translate(locale, "footer_instance_section_donate")%>">
+                                        <%= translate(locale, "footer_instance_section_donate") %>
+                                    </a>
+                                </li>
+                            <% end %>
 
-				</div>
-				<div class="footer-section">
-					<b class="footer-section-header"><%= translate(locale, "footer_navigation_section_header")%></b>
-					<ul class="pure-menu-list footer-section-list">
-						<li class="pure-menu-item footer-section-item">
-							<a href="/" title="<%= translate(locale, "footer_home_link")%>">
-								<%= translate(locale, "footer_home_link") %>
-							</a>
-						</li>
-						<li class="pure-menu-item footer-section-item">
-							<a href="/feed/popular" title="<%= translate(locale, "Popular")%>">
-								<%= translate(locale, "Popular") %>
-							</a>
-						</li>
-						<li class="pure-menu-item footer-section-item">
-							<a href="/feed/trending" title="<%= translate(locale, "Trending")%>" style="">
-								<%= translate(locale, "Trending") %>
-							</a>
-						</li>
-						<li class="pure-menu-item footer-section-item">
-							<a href="/search" title="<%= translate(locale, "Search")%>">
-								<%= translate(locale, "Search") %>
-							</a>
-						</li>
-					</ul>
-				</div>
-				<div class="footer-section">
-					<b class="footer-section-header">Invidious</b>
-					<ul class="pure-menu-list footer-section-list">
-						<li class="pure-menu-item footer-section-item">
-							<a href="https://invidious.io" title="<%= translate(locale, "footer_project_homepage_link")%>">
-								<%= translate(locale, "footer_project_homepage_link") %>
-							</a>
-						</li>
-						<li class="pure-menu-item footer-section-item">
-							<a href="https://github.com/iv-org/invidious" title="<%= translate(locale, "footer_source_code_link")%>">
-								<%= translate(locale, "footer_source_code_link") %>
-							</a>
-						</li>
-						<li class="pure-menu-item footer-section-item">
-							<a href="https://github.com/iv-org/invidious/issues" title="<%= translate(locale, "footer_issue_tracker_link")%>" style="">
-								<%= translate(locale, "footer_issue_tracker_link") %>
-							</a>
-						</li>
-						<li class="pure-menu-item footer-section-item">
-							<a href="https://instances.invidious.io" title="<%= translate(locale, "footer_public_instances_link")%>">
-								<%= translate(locale, "footer_public_instances_link") %>
-							</a>
-						</li>
-						<li class="pure-menu-item footer-section-item">
-							<a href="https://invidious.io/donate" title="<%= translate(locale, "footer_donate_link")%>">
-								<%= translate(locale, "footer_donate_link") %>
-							</a>
-						</li>
-						<li class="pure-menu-item footer-section-item">
-							<a href="https://matrix.to/#/#invidious:matrix.org" title="<%= translate(locale, "footer_matrix_link")%>">
-								<%= translate(locale, "footer_matrix_link") %>
-							</a>
-						</li>
+                            <% CONFIG.footer_instance_section_custom_fields.each do | field | %>
+                                <li class="pure-menu-item footer-section-item">
+                                    <a href="<%=HTML.escape(field[1])%>" title="<%= HTML.escape(field[0]) %>">
+                                        <%= HTML.escape(field[0]) %>
+                                    </a>
+                                </li>
+                            <% end %>
+                        </ul>
+                    </div>
+                <% end %>
 
-					</ul>
-				</div>
-				<% if CONFIG.instance_maintainer_email || CONFIG.modified_source_code_url || CONFIG.footer_instance_tos_link || CONFIG.footer_instance_privacy_policy_link %>
-					<div class="footer-section">
-						<b class="footer-section-header">
-							<% if CONFIG.modified_source_code_url %>
-								<%= translate(locale, "footer_instance_section_header_modified_source")%>
-							<% else %>
-								<%= translate(locale, "footer_instance_section_header")%>
-							<% end %>
-						</b>
-						<ul class="pure-menu-list footer-section-list">
-							<% if CONFIG.instance_maintainer_email %>
-								<li class="pure-menu-item footer-section-item">
-									<a href="<%=HTML.escape("mailto:#{CONFIG.instance_maintainer_email.not_nil!}")%>" title="<%= translate(locale, "footer_contact_link")%>">
-										<%= translate(locale, "footer_contact_link") %>
-									</a>
-								</li>
-							<% end %>
-							<% if CONFIG.modified_source_code_url %>
-								<li class="pure-menu-item footer-section-item">
-									<a href="<%=HTML.escape(CONFIG.modified_source_code_url.not_nil!)%>" title="<%= translate(locale, "footer_instance_section_modified_source_code")%>">
-										<%= translate(locale, "footer_instance_section_modified_source_code") %>
-									</a>
-								</li>
-							<% end %>
-							<% if CONFIG.footer_instance_tos_link %>
-								<li class="pure-menu-item footer-section-item">
-									<a href="<%=HTML.escape(CONFIG.footer_instance_tos_link.not_nil!)%>" title="<%= translate(locale, "footer_instance_section_tos")%>">
-										<%= translate(locale, "footer_instance_section_tos") %>
-									</a>
-								</li>
-							<% end %>
-							<% if CONFIG.footer_instance_privacy_policy_link %>
-								<li class="pure-menu-item footer-section-item">
-									<a href="<%=HTML.escape(CONFIG.footer_instance_privacy_policy_link.not_nil!)%>" title="<%= translate(locale, "footer_instance_section_privacy_policy")%>">
-										<%= translate(locale, "footer_instance_section_privacy_policy") %>
-									</a>
-								</li>
-							<% end %>
-
-							<% if CONFIG.footer_instance_donate_link %>
-								<li class="pure-menu-item footer-section-item">
-									<a href="<%=HTML.escape(CONFIG.footer_instance_donate_link.not_nil!)%>" title="<%= translate(locale, "footer_instance_section_donate")%>">
-										<%= translate(locale, "footer_instance_section_donate") %>
-									</a>
-								</li>
-							<% end %>
-
-							<% CONFIG.footer_instance_section_custom_fields.each do | field | %>
-								<li class="pure-menu-item footer-section-item">
-									<a href="<%=HTML.escape(field[1])%>" title="<%= HTML.escape(field[0]) %>">
-										<%= HTML.escape(field[0]) %>
-									</a>
-								</li>
-							<% end %>
-						</ul>
-					</div>
-				<% end %>
-
-				<div class="footer-section">
-					<b class="footer-section-header"><%= translate(locale, "footer_support_section_header")%></b>
-					<ul class="pure-menu-list footer-section-list">
-						<li class="pure-menu-item footer-section-item">
-							<a href="https://github.com/iv-org/invidious/issues/new" title="<%= translate(locale, "footer_report_bug_link")%>">
-								<%= translate(locale, "footer_report_bug_link") %>
-							</a>
-						</li>
-						<li class="pure-menu-item footer-section-item">
-							<a href="#" title="<%= translate(locale, "footer_faq_link")%>" style="">
-								<%= translate(locale, "footer_faq_link") %>
-							</a>
-						</li>
-					</ul>
-				</div>
-			</div>
-			<hr/>
-			<div class="footer-footer">
-			<%
-				if CONFIG.invidious_companion.present?
-				companion_public_url = env.get("companion_public_url").as(String)
-			%>
-			<div class="box">You are currently using Backend: <%= current_backend ? companion_public_url : "Unable to get backend, this is bug, please report it!" %></div>
-			<% end %>
-				<span class="left">
-					<% if CONFIG.modified_source_code_url %>
-						<%= translate(locale, "footer_current_version_modified") %>
-					<% else %>
-						<%= translate(locale, "Current version: ") %>
-					<% end %>
-
-					<%= CURRENT_VERSION %>-<%= CURRENT_COMMIT %> @ <%= CURRENT_BRANCH %>
-				</span>
-				<div class="right">
-					<a href="/privacy" title="<%= translate(locale, "footer_privacy_policy_link")%>"><%= translate(locale, "footer_privacy_policy_link") %></a>
-					<span> | </span>
-					<a href="/licenses" title="<%= translate(locale, "footer_licences_link")%>"><%= translate(locale, "footer_licences_link") %></a>
-				</div>
-			</div>
-		</div>
-		</div>
-		<div class="pure-u-1 pure-u-md-2-24"></div>
-	</footer>
+                <div class="footer-section">
+                    <b class="footer-section-header"><%= translate(locale, "footer_support_section_header")%></b>
+                    <ul class="pure-menu-list footer-section-list">
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="https://github.com/iv-org/invidious/issues/new" title="<%= translate(locale, "footer_report_bug_link")%>">
+                                <%= translate(locale, "footer_report_bug_link") %>
+                            </a>
+                        </li>
+                        <li class="pure-menu-item footer-section-item">
+                            <a href="#" title="<%= translate(locale, "footer_faq_link")%>" style="">
+                                <%= translate(locale, "footer_faq_link") %>
+                            </a>
+                        </li>
+                    </ul>                
+                </div>
+            </div>
+            <hr/>
+            <div class="footer-footer">
+                <span class="left">
+                    <%
+                        if CONFIG.invidious_companion.present?
+                        companion_public_url = env.get("companion_public_url").as(String)
+                    %>
+                    <div class="box">You are currently using Backend: <%= current_backend ? companion_public_url : "Unable to get backend, this is bug, please report it!" %></div>
+                    <% end %>
+                    <% if CONFIG.modified_source_code_url %>
+                        <%= translate(locale, "footer_current_version_modified") %>
+                    <% else %>
+                        <%= translate(locale, "Current version: ") %>
+                    <% end %>
+                    
+                    <%= CURRENT_VERSION %>-<%= CURRENT_COMMIT %> @ <%= CURRENT_BRANCH %>
+                </span>
+                <div class="right">
+                    <a href="/privacy" title="<%= translate(locale, "footer_privacy_policy_link")%>"><%= translate(locale, "footer_privacy_policy_link") %></a>
+                    <span> | </span>
+                    <a href="/licenses" title="<%= translate(locale, "footer_licences_link")%>"><%= translate(locale, "footer_licences_link") %></a>
+                </div>
+            </div>
+        </div>
+        </div>
+        <div class="pure-u-1 pure-u-md-2-24"></div>
+    </footer>
 </body>
 
 </html>
diff --git a/src/invidious/views/user/preferences.ecr b/src/invidious/views/user/preferences.ecr
index 5903d6cc..4039e03b 100644
--- a/src/invidious/views/user/preferences.ecr
+++ b/src/invidious/views/user/preferences.ecr
@@ -368,3 +368,5 @@
         </fieldset>
     </form>
 </div>
+
+<div id="footer_buffer"></div>