diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index a2e0e71..a532c5e 100755
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -2,52 +2,52 @@
 <html lang="{{ .Site.Params.languageCode | default " en-us " }}">
 
 <head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
-  <meta name="theme-color" content="#404040">
-  <meta property="og:title" content="{{ if ne .URL " / " }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
-  <meta property="og:site_name" content="{{ .Site.Title }}" />
-  <meta property="og:url" content="{{ .Permalink }}" /> {{- if eq .IsPage true }} {{ .Render "meta" }} {{- end }} {{ .Hugo.Generator }}
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
+    <meta name="theme-color" content="#404040">
+    <meta property="og:title" content="{{ if ne .URL " / " }}{{ .Title }} &middot; {{ end }}{{ .Site.Title }}" />
+    <meta property="og:site_name" content="{{ .Site.Title }}" />
+    <meta property="og:url" content="{{ .Permalink }}" /> {{- if eq .IsPage true }} {{ .Render "meta" }} {{- end }} {{ .Hugo.Generator }}
 
-  <link rel="icon" href="{{ .Site.BaseURL }}/favicon.ico" />
-  <link rel="shortcut icon" href="{{ .Site.BaseURL }}/favicon.ico" type="image/x-icon" />
-  <link rel="canonical" href="{{ .Permalink }}"> {{ if .RSSLink }}
-  <link href="{{ .Site.BaseURL }}/index.xml" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
-  <link href="{{ .Site.BaseURL }}/index.xml" rel="feed" type="application/rss+xml" title="{{ .Site.Title }}" /> {{ end }}
+    <link rel="icon" href="{{ .Site.BaseURL }}/favicon.ico" />
+    <link rel="shortcut icon" href="{{ .Site.BaseURL }}/favicon.ico" type="image/x-icon" />
+    <link rel="canonical" href="{{ .Permalink }}"> {{ if .RSSLink }}
+    <link href="{{ .Site.BaseURL }}/index.xml" rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" />
+    <link href="{{ .Site.BaseURL }}/index.xml" rel="feed" type="application/rss+xml" title="{{ .Site.Title }}" /> {{ end }}
 
-  <title>{{- if not .IsHome }}{{ .Title }} - {{ .Site.Title }}{{- else }}{{ .Site.Title }} - {{ .Site.Params.Tagline }}{{- end}}</title>
-  <link href="https://fonts.googleapis.com/css?family=Ubuntu|Dosis" rel="stylesheet">
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/style.css" />
-
-  {{ if eq (getenv "HUGO_ENV") "PRD" }}
-  <meta name="robots" content="noindex,nofollow" />
-  {{ else }}
-  <meta name="robots" content="noindex,nofollow" />
-  {{ end }}
+    <title>{{- if not .IsHome }}{{ .Title }} - {{ .Site.Title }}{{- else }}{{ .Site.Title }} - {{ .Site.Params.Tagline }}{{- end}}</title>
+    <link href="https://fonts.googleapis.com/css?family=Ubuntu|Dosis" rel="stylesheet">
+    <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/style.css" /> {{ if eq (getenv "HUGO_ENV") "PRD" }}
+    <meta name="robots" content="noindex,nofollow" /> {{ else }}
+    <meta name="robots" content="noindex,nofollow" /> {{ end }}
 </head>
 
 <body>
-  {{- if not .IsHome }}
-  {{ partial "menu" . }}
-  {{- else }}
-  {{ partial "header_homepage" . }}
-  {{- end }}
+    {{ partial "navbar" . }}
+    
+    {{- if .IsHome }} {{ partial "header_homepage" . }} {{- end }}
 
-  {{ block "main" . }}{{ end }}
-  
-  <footer class="footer">
-      <div class="container">
-          <div class="content has-text-centered">
-              Copyright © {{ now.Format "2006" }} Yuzu Emulator
-          </div>
-      </div>
-  </footer>
+    <div class="container" style="background-color: white;">
+        <section class="section">
+            <div class="columns">
+                <div class="column is-3">
+                    {{ partial "sidebar" . }}
+                </div>
+                <div class="column is-9">
+                    {{ block "main" . }}{{ end }}
+                </div>
+            </div>
+        </section>
+    </div>
 
-  <script src="{{ .Site.BaseURL }}/js/script.js"></script>
-  
-  <script defer src="https://use.fontawesome.com/releases/v5.0.2/js/all.js"></script>
-  {{- block "scripts" . }}{{- end }}
+    <footer class="footer container has-text-centered">
+        Copyright © {{ now.Format "2006" }} {{ .Site.Params.ProjectName }}
+    </footer>
+
+    <script src="{{ .Site.BaseURL }}/js/script.js"></script>
+
+    <script defer src="https://use.fontawesome.com/releases/v5.0.2/js/all.js"></script> {{- block "scripts" . }}{{- end }}
 </body>
 
 </html>
\ No newline at end of file
diff --git a/layouts/index.html b/layouts/index.html
index 414522b..1a46806 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,14 +1,3 @@
-{{- define "main" }}
-<section class="hero is-info">
-    <div class="hero-body">
-        <div class="container">
-            <p class="title">
-                Upcoming news...
-            </p>
-            <p class="subtitle">
-                We'll have more information available soon!
-            </p>
-        </div>
-    </div>
-</section>
-{{- end }}
\ No newline at end of file
+{{ define "main" }}
+    <p>No articles have been written yet, check back soon!</p>
+{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/header_homepage.html b/layouts/partials/header_homepage.html
index 6f8ed53..f3b998b 100644
--- a/layouts/partials/header_homepage.html
+++ b/layouts/partials/header_homepage.html
@@ -1,25 +1 @@
-<div class="container is-mobile">
-    <nav class="navbar" role="navigation" aria-label="main navigation">
-        <div class="container">
-            <div class="navbar-brand">
-                <a class="navbar-item" href="{{ .Site.BaseURL }}">
-                    <img src="{{ .Site.BaseURL }}/images/menu.png" alt="{{ .Site.Title }} {{ .Site.Params.Tagline }}" width="112" height="28">
-                </a>
-            </div>
-        </div>
-    </nav>
-</div>
-
-<section class="hero is-primary">
-    <div class="hero-body">
-        <div class="container">
-            <h1 class="title">{{ .Site.Title }}</h1>
-            <h2 class="subtitle">{{ .Site.Params.Tagline }}</h2>
-            <a class="button is-primary is-inverted" href="{{ .Site.Params.GithubURL }}">
-                <span class="icon">
-                    <i class="fab fa-github"></i>
-                </span>
-                <span>Source Code</span>
-            </a>
-        </div>
-</section>
\ No newline at end of file
+<code>Cannot find override file: `./layouts/partials/header_homepage.html`</code>
\ No newline at end of file
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
new file mode 100644
index 0000000..b48866d
--- /dev/null
+++ b/layouts/partials/navbar.html
@@ -0,0 +1,14 @@
+<nav class="navbar is-transparent is-size-6" role="navigation" aria-label="main navigation">
+    <div class="container">
+        <div class="navbar-brand">
+            <a class="navbar-item" href="{{ .Site.BaseURL }}">
+                <img src="{{ .Site.BaseURL }}/images/menu.png" alt="{{ .Site.Title }} {{ .Site.Params.Tagline }}" width="112" height="28">
+            </a>
+        </div>
+        <div class="navbar-menu">
+            <div class="navbar-start">
+                <!-- TODO: Navbar goes here -->
+            </div>
+        </div>
+    </div>
+</nav>
\ No newline at end of file
diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
new file mode 100644
index 0000000..1417dcd
--- /dev/null
+++ b/layouts/partials/sidebar.html
@@ -0,0 +1 @@
+<code>Cannot find override file: `./layouts/partials/sidebar.html`</code>
\ No newline at end of file
