diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 022ceaa..f7762a6 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -12,20 +12,44 @@
     </div>
 
     {{ block "main" . }}
+
+    {{ if .Site.Params.hero }}
     {{ partial "hero.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.section1 }}
     {{ partial "section1.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.section2 }}
     {{ partial "section2.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.section3 }}
     {{ partial "section3.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.section4 }}
     {{ partial "section4.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.section5 }}
     {{ partial "section5.html" . }}
+    {{ end }}
+
+    {{ if .Site.Params.footer }}
     {{ partial "footer.html" . }}
+    {{ end }}
 
     <!-- Back To Top Button -->
     <div id="backtotop"><a href="#"></a></div>
 
+    {{ if .Site.Params.sidebar }}
     {{ partial "sidebar.html" . }}
     {{ end }}
+    
+    {{ end }}
 
     {{ partial "javascript.html" . }}
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 4b3bf5b..71b9bd6 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,10 +1,8 @@
-{{- $footer       := .Site.Params.footer }}
-{{- $logo         := index $footer "logo" }}
-{{- $productLinks := index $footer "product" }}
-{{- $docLinks     := index $footer "docs" }}
-{{- $blogrollLinks:= index $footer "blogroll" }}
-{{- $socialMedia  := index $footer "socialmedia" }}
-{{- $bulmaLogo    := index $footer "bulmalogo" }}
+{{- $footer      := .Site.Params.footer }}
+{{- $logo        := index $footer "logo" }}
+{{- $quickLinks  := index $footer "quicklinks" }}
+{{- $socialMedia := index $footer "socialmedia" }}
+{{- $bulmaLogo   := index $footer "bulmalogo" }}
 <footer class="footer footer-dark">
   <div class="container">
     <div class="columns">
@@ -13,54 +11,24 @@
           <img src="{{ printf "/images/logos/%s" $logo | relURL }}">
         </div>
       </div>
-      <div class="column">
-        <div class="footer-column">
-          <div class="footer-header">
-              <h3>Product</h3>
+      {{- range $quickLinks }}
+        <div class="column">
+          <div class="footer-column">
+            <div class="footer-header">
+                <h3>{{ .title }}</h3>
+            </div>
+            <ul class="link-list">
+              {{- range .links }}
+              <li>
+                <a href="{{ .link }}">
+                  {{ .text }}
+                </a>
+              </li>
+              {{- end }}
+            </ul>
           </div>
-          <ul class="link-list">
-            {{- range $productLinks }}
-            <li>
-              <a href="{{ .link }}">
-                {{ .text }}
-              </a>
-            </li>
-            {{- end }}
-          </ul>
         </div>
-      </div>
-      <div class="column">
-        <div class="footer-column">
-          <div class="footer-header">
-            <h3>Docs</h3>
-          </div>
-          <ul class="link-list">
-            {{- range $docLinks }}
-            <li>
-              <a href="{{ .link }}">
-                {{ .text }}
-              </a>
-            </li>
-            {{- end }}
-          </ul>
-        </div>
-      </div>
-      <div class="column">
-        <div class="footer-column">
-          <div class="footer-header">
-            <h3>Blogroll</h3>
-          </div>
-          <ul class="link-list">
-            {{- range $blogrollLinks }}
-            <li>
-              <a href="{{ .link }}">
-                {{ .text }}
-              </a>
-            </li>
-            {{- end }}
-          </ul>
-        </div>
-      </div>
+      {{- end }}
       <div class="column">
         <div class="footer-column">
           <div class="footer-header">
diff --git a/layouts/partials/navbar-clone.html b/layouts/partials/navbar-clone.html
index 60975f8..f3beb11 100644
--- a/layouts/partials/navbar-clone.html
+++ b/layouts/partials/navbar-clone.html
@@ -1,11 +1,16 @@
-{{- $navbar := .Site.Params.navbar }}
+{{- $navbar         := .Site.Params.navbar }}
+{{- $sidebarVisible := .Site.Params.sidebar }}
+{{- $navbarLogo     := .Site.Params.navbarlogo }}
 <nav id="navbar-clone" class="navbar is-fresh is-transparent" role="navigation" aria-label="main navigation">
   <div class="container">
     <div class="navbar-brand">
-      <a class="navbar-item" href="https://cssninja.io">
-        <img src="{{ "images/logos/fresh-alt.svg" | relURL }}" alt="" width="112" height="28">
+      {{- if $navbarLogo}}
+      <a class="navbar-item" href="{{ $navbarLogo.link }}">
+        <img src="{{ printf "/images/%s" $navbarLogo.image | relURL }}" alt="" width="112" height="28">
       </a>
+      {{- end}}
 
+      {{- if $sidebarVisible }}
       <a class="navbar-item is-hidden-desktop is-hidden-tablet">
         <div id="menu-icon-wrapper" class="menu-icon-wrapper" style="visibility: visible;">
           <svg width="1000px" height="1000px">
@@ -16,6 +21,7 @@
           <button id="menu-icon-trigger" class="menu-icon-trigger"></button>
         </div>
       </a>
+      {{- end }}
 
       <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="cloned-navbar-menu">
         <span aria-hidden="true"></span>
@@ -26,6 +32,7 @@
 
     <div id="cloned-navbar-menu" class="navbar-menu is-fixed">
 
+      {{- if $sidebarVisible }}
       <div class="navbar-start">
         <a class="navbar-item is-hidden-mobile">
           <div id="cloned-menu-icon-wrapper" class="menu-icon-wrapper" style="visibility: visible;">
@@ -38,6 +45,7 @@
           </div>
         </a>
       </div>
+      {{- end }}
 
       <div class="navbar-end">
         {{- range $navbar }}
@@ -70,4 +78,4 @@
       </div>
     </div>
 </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index 3525a5e..7f75103 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,11 +1,16 @@
-{{- $navbar := .Site.Params.navbar }}
+{{- $navbar         := .Site.Params.navbar }}
+{{- $sidebarVisible := .Site.Params.sidebar }}
+{{- $navbarLogo     := .Site.Params.navbarlogo }}
 <nav class="navbar is-fresh is-transparent no-shadow" role="navigation" aria-label="main navigation">
   <div class="container">
     <div class="navbar-brand">
-      <a class="navbar-item" href="https://cssninja.io">
-        <img src="{{ "/images/logos/fresh-alt.svg" | absURL }}" alt="" width="112" height="28">
+      {{- if $navbarLogo}}
+      <a class="navbar-item" href="{{ $navbarLogo.link }}">
+        <img src="{{ printf "/images/%s" $navbarLogo.image | relURL }}" alt="" width="112" height="28">
       </a>
+      {{- end}}
 
+      {{- if $sidebarVisible }}
       <a class="navbar-item is-hidden-desktop is-hidden-tablet">
         <div id="menu-icon-wrapper" class="menu-icon-wrapper" style="visibility: visible;">
           <svg width="1000px" height="1000px">
@@ -16,6 +21,7 @@
           <button id="menu-icon-trigger" class="menu-icon-trigger"></button>
         </div>
       </a>
+      {{- end }}
 
       <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbar-menu">
         <span aria-hidden="true"></span>
@@ -26,6 +32,7 @@
 
       <div id="navbar-menu" class="navbar-menu is-static">
 
+        {{- if $sidebarVisible }}
         <div class="navbar-start">
           <a class="navbar-item is-hidden-mobile">
             <div id="menu-icon-wrapper" class="menu-icon-wrapper" style="visibility: visible;">
@@ -38,6 +45,7 @@
             </div>
           </a>
         </div>
+        {{- end }}
 
         <div class="navbar-end">
           {{- range $navbar }}
@@ -70,4 +78,4 @@
         </div>
       </div>
   </div>
-</nav>
\ No newline at end of file
+</nav>