diff --git a/assets/sass/main.scss b/assets/sass/main.scss
index a8266b8..ae2904a 100644
--- a/assets/sass/main.scss
+++ b/assets/sass/main.scss
@@ -417,8 +417,8 @@ h1.site-title {// {{{
   font-size: 4.8em;
   // color: #66cccc;
   color: $base05;
-  margin-top: 0.5em;
-  margin-bottom: 0;
+  margin-top: 1rem;
+  margin-bottom: 0.5rem;
 
   @include a-color($base-sky-blue);
   a {
@@ -437,6 +437,7 @@ h1.site-title {// {{{
 }// }}}
 
 .hero-logo img {
+  margin-top: 0.5rem;
   width: 100%;
 }
 
@@ -444,7 +445,7 @@ h1.site-title {// {{{
   margin-left: .5em;
   // margin-bottom: 1em;
   // margin-top: .75em;
-  @include vert-padding-rem(1);
+  @include vert-padding-rem(.5);
 
   .caret {
       color: #f2f0ec;
diff --git a/config.toml_ b/config.toml_
deleted file mode 100644
index a755aa0..0000000
--- a/config.toml_
+++ /dev/null
@@ -1,11 +0,0 @@
-# baseURL = "http://localhost:1313/"
-baseURL = "https://kevin-mok.com/"
-# baseURL = "/home/kevin/coding/mf-site/public"
-languageCode = "en-us"
-title = "Kevin Mok's Website"
-# theme = "base16"
-enableRobotsTXT = "true"
-
-[params]
-  author = "Kevin Mok"
-  description = "I'm a Computer Science (CS) student at the University of Toronto and an avid Linux/FOSS user. Come check out my personal site!" 
diff --git a/config.yaml b/config.yaml
index 6db343a..21ebb64 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,5 +1,5 @@
-# baseURL: http://localhost:1313/
-baseURL: https://kevin-mok.com/
+baseURL: http://localhost:1313/
+# baseURL: https://kevin-mok.com/
 # baseURL: /home/kevin/coding/mf-site/public
 languageCode: en-us
 title: Kevin Mok's Website
diff --git a/content/config.md b/content/config/_index.md
similarity index 98%
rename from content/config.md
rename to content/config/_index.md
index cbca5f8..21463b5 100644
--- a/content/config.md
+++ b/content/config/_index.md
@@ -2,7 +2,6 @@
 title: "Config"
 date: 2019-02-07T05:05:11-05:00
 draft: true
-layout: single
 ---
 <!---  Intro {{{ --> 
 # Kevin's Linux Setup
diff --git a/content/credits.md b/content/credits/_index.md
similarity index 82%
rename from content/credits.md
rename to content/credits/_index.md
index 12ebe01..907fc85 100644
--- a/content/credits.md
+++ b/content/credits/_index.md
@@ -2,5 +2,4 @@
 title: "Credits"
 date: 2019-02-11T03:10:25-05:00
 draft: true
-layout: single
 ---
diff --git a/content/resume.md b/content/resume/_index.md
similarity index 93%
rename from content/resume.md
rename to content/resume/_index.md
index 5bf6ca3..582201a 100644
--- a/content/resume.md
+++ b/content/resume/_index.md
@@ -3,3 +3,4 @@ title: "Resume"
 date: 2019-02-11T07:50:51-05:00
 draft: true
 ---
+Test
diff --git a/ideas.md b/ideas.md
index d3e1d1a..890b86f 100644
--- a/ideas.md
+++ b/ideas.md
@@ -1,5 +1,6 @@
 # Large
 - resume
+  - fix title
   - printable version
   - list of things done with diff. langs.
 - add CSS grid layout
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 5b39f66..5d5176f 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,10 +1,11 @@
-{{ define "main" }}
+{{ partial "header.html" . }}
 
-<!-- <main role="main" class="article-list">
-  <h1 class="list-title">{{ .Title }}</h1>
-  {{ range .Data.Pages }}
-    {{ partial "article-list-item.html" . }}
-  {{ end }}
-</main> -->
+{{ partial "site-title.html" . }}
 
-{{ end }}
+{{ partial "nav-bar.html" . }}
+
+{{ partial "base16-logo.html" . }}
+
+{{ .Content }}
+
+{{ partial "footer.html" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index c151931..5d5176f 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,7 +1,11 @@
-{{ define "main" }}
+{{ partial "header.html" . }}
 
-<main role="main" class="article">
-  {{ partial "article.html" . }}
-</main>
+{{ partial "site-title.html" . }}
 
-{{ end }}
+{{ partial "nav-bar.html" . }}
+
+{{ partial "base16-logo.html" . }}
+
+{{ .Content }}
+
+{{ partial "footer.html" . }}
diff --git a/layouts/credits.html b/layouts/credits.html
deleted file mode 100644
index 46c82c0..0000000
--- a/layouts/credits.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ define "main" }}
-
-{{ .Content }}
-
-{{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index 2afec88..025829d 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -1,9 +1,13 @@
-{{ define "main" }}
+{{ partial "header.html" . }}
 
-<div id="homepage">
+{{ partial "site-title.html" . }}
+
+{{ partial "nav-bar.html" . }}
 
-{{ partial "about.html" . }}
+{{ partial "base16-logo.html" . }}
 
+<div id="homepage">
+  {{ partial "about.html" . }}
 </div>
 
-{{ end }}
+{{ partial "footer.html" . }}
diff --git a/layouts/_default/baseof.html b/layouts/resume/section.html
similarity index 52%
rename from layouts/_default/baseof.html
rename to layouts/resume/section.html
index 753aa8b..9e462e8 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/resume/section.html
@@ -2,11 +2,6 @@
 
 {{ partial "site-title.html" . }}
 
-{{ partial "nav-bar.html" . }}
-
 {{ partial "base16-logo.html" . }}
 
-{{ block "main" . }}
-{{ end }}
-
-{{ partial "footer.html" . }}
+{{ .Content }}
diff --git a/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content b/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
index b6220eb..ad46043 100644
--- a/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
+++ b/resources/_gen/assets/scss/sass/main.scss_f300667da4f5b5f84e1a9e0702b2fdde.content
@@ -301,8 +301,8 @@ h1.site-title {
   /* font-size: 3.5em; */
   font-size: 4.8em;
   color: #d3d0c8;
-  margin-top: 0.5em;
-  margin-bottom: 0; }
+  margin-top: 1rem;
+  margin-bottom: 0.5rem; }
   h1.site-title a {
     color: #66cccc; }
     h1.site-title a:visited {
@@ -319,12 +319,13 @@ h1.site-title {
       font-size: 2em; } }
 
 .hero-logo img {
+  margin-top: 0.5rem;
   width: 100%; }
 
 .nav-bar {
   margin-left: .5em;
-  padding-top: 1rem;
-  padding-bottom: 1rem; }
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem; }
   .nav-bar .caret {
     color: #f2f0ec;
     margin-right: .75rem; }