diff --git a/frontend/src/static/js/components/page-layout/PageHeader/Logo.jsx b/frontend/src/static/js/components/page-layout/PageHeader/Logo.jsx
index 074d43f..768fb93 100644
--- a/frontend/src/static/js/components/page-layout/PageHeader/Logo.jsx
+++ b/frontend/src/static/js/components/page-layout/PageHeader/Logo.jsx
@@ -4,9 +4,11 @@ export const Logo = ({ src, loading = 'lazy', title, alt, href = '#' }) => {
   return src ? (
     <div className="logo">
       <a href={href} title={title}>
-        <span>
-          <img src={src} alt={alt || title} title={title} loading={loading} />
-        </span>
+	<h1>
+          <span>
+            <img src={src} alt={alt || title} title={title} loading={loading} />
+          </span>
+	</h1>
       </a>
     </div>
   ) : null;
diff --git a/frontend/src/static/js/components/page-layout/PageHeader/PageHeader.scss b/frontend/src/static/js/components/page-layout/PageHeader/PageHeader.scss
index 7d00ee1..d5431fb 100755
--- a/frontend/src/static/js/components/page-layout/PageHeader/PageHeader.scss
+++ b/frontend/src/static/js/components/page-layout/PageHeader/PageHeader.scss
@@ -253,6 +253,10 @@ a.user-menu-top-link {
     font-size: 1em;
   }
 
+  h1 {
+    margin: 0;
+  }
+
   a {
     color: inherit;
     display: block;
diff --git a/frontend/src/static/js/utils/renderer.js b/frontend/src/static/js/utils/renderer.js
index 7e663b6..e6d25dd 100755
--- a/frontend/src/static/js/utils/renderer.js
+++ b/frontend/src/static/js/utils/renderer.js
@@ -19,6 +19,13 @@ export function renderPage(idSelector, PageComponent) {
   const appSidebar = document.getElementById('app-sidebar');
   const appContent = idSelector ? document.getElementById(idSelector) : undefined;
 
+  while (appHeader.firstChild) {
+    appHeader.removeChild(appHeader.firstChild);
+  }
+  while (appSidebar.firstChild) {
+    appSidebar.removeChild(appSidebar.firstChild);
+  }
+
   if (appContent && PageComponent) {
     ReactDOM.render(
       <AppProviders>
diff --git a/templates/components/header.html b/templates/components/header.html
index 716e328..bd4df0d 100644
--- a/templates/components/header.html
+++ b/templates/components/header.html
@@ -1,4 +1,4 @@
-<div id="app-header"></div>
+<div id="app-header"><h1>{{ PORTAL_NAME }}</h1></div>
 
 {% comment %}
 Uncomment, or replace with your own cookie consent code.
@@ -17,4 +17,4 @@ Uncomment, or replace with your own cookie consent code.
 </script>
 
 
-{% endcomment %}
\ No newline at end of file
+{% endcomment %}
diff --git a/templates/components/sidebar.html b/templates/components/sidebar.html
index 947de45..8895f19 100644
--- a/templates/components/sidebar.html
+++ b/templates/components/sidebar.html
@@ -1 +1,26 @@
-<div id="app-sidebar"></div>
\ No newline at end of file
+<div id="app-sidebar">
+        <nav>
+                <ul>
+                        <li><a href="/">Home</a></li>
+                        <li><a href="/featured">Featured</a></li>
+                        <li><a href="/recommended">Recommended</a></li>
+                        <li><a href="/members">Members</a></li>
+                        <li><a href="/latest">Recent uploads</a></li>
+                        <li><a href="/tags">Tags</a></li>
+                        <li><a href="/categories">Categories</a></li>
+                </ul>
+        </nav>
+        <nav>
+                <ul>
+                        <li><a href="/history">History</a></li>
+                        <li><a href="/liked">Liked media</a></li>
+                </ul>
+        </nav>
+        <nav>
+                <ul>
+                        <li><a href="/about">About</a></li>
+                        <li><a href="/tos">Terms</a></li>
+                        <li><a href="/contact">Contact</a></li>
+                </ul>
+        </nav>
+</div>