diff --git a/files/templates/default.html b/files/templates/default.html
index cf731abe9e..14116a5920 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -223,6 +223,8 @@
 {% block Banner %}
 {% endblock %}
 
+{% include "header-tw.html" %}
+
 {% block mobileUserBanner %}
 {% endblock %}
 
@@ -241,6 +243,11 @@
 			{% block desktopBanner %}
 			{% endblock %}
 
+		<div class="md:px-4 bg-gray-700" id="sub-header-row">
+			{% block subHeader %}
+			{% endblock %}
+		</div>
+
 		<div class="w-full md:px-4">
 			<div class="w-full max-w-screen-2xl mx-auto mb-4 md:px-4 grid grid-cols-12 gap-6 bg-gray-300 md:bg-gray-200 rounded-b" id="main-content-row">
 
@@ -257,10 +264,13 @@
 				{% endblock %}
 			</div>
 		</div>
+
+		{% include "footer.html" %}
 	</div>
 </div>
 
 {% block mobilenavbar %}
+	{% include "mobile_navigation_bar.html" %}
 {% endblock %}
 
 {% block actionsModal %}
@@ -275,6 +285,7 @@
 {% block GIFpicker %}
 {% endblock %}
 
+
 <!-- Import toast notifications -->
 {% include "/toasts/toasts.html" %}