diff --git a/docs/content/preview/architecture/key-concepts.md b/docs/content/preview/architecture/key-concepts.md
index 352f987946bd..25399143ec19 100644
--- a/docs/content/preview/architecture/key-concepts.md
+++ b/docs/content/preview/architecture/key-concepts.md
@@ -220,3 +220,4 @@ Fully-relational SQL API that is wire compatible with the SQL language in Postgr
 ## Zone
 
 Typically referred as Availability Zones or just AZ, a zone is a datacenter or a group of colocated datacenters. Zone is the default [fault domain](#fault-domain) in YugabyteDB.
+{{< contribute >}}
diff --git a/docs/layouts/indexpage/list.html b/docs/layouts/indexpage/list.html
index 70b15a0f7151..20876f34ac2e 100644
--- a/docs/layouts/indexpage/list.html
+++ b/docs/layouts/indexpage/list.html
@@ -1,79 +1,15 @@
 {{ define "main" }}
-{{- $headingIcon := false -}}
-{{- $headingImage := false -}}
-<div class="td-content">
-  {{ if and (.Params.resourcesIntro) (.Params.resources) }}
-    <div class="resources">
+  <div style="display:flex;">
+    {{ partial "sidebar.html" . }}
+    <div style="flex:1;">
+      <h2>{{ .Title }}</h2>
+      {{ .Content }}
       <ul>
-        <li>{{ .Params.resourcesIntro }}</li>
-        {{ range $key, $properties := .Params.resources }}
-          <li><a href="{{ $properties.url }}" class="{{- if not (modBool $key 2)}}grey-bg{{- else}}purple-bg{{- end }}" title="{{ $properties.title }}">{{ $properties.title }}</a></li>
+        {{ range .Pages }}
+          <li><a href="{{ .Permalink }}">{{ .Title }}</a></li>
         {{ end }}
       </ul>
-    </div>
-  {{ end }}
-
-  {{- if .Site.Params.search_banner -}}
-    {{ partial "search-banner.html" . }}
-  {{- end -}}
-
-  {{- if and (.Site.Params.yb.heading_icons) (.Params.image) (not .Params.hideHeadingIcon) -}}
-    {{- if in .Params.image "/" -}}
-      {{ $checkImagePath := printf "public%s" .Params.image }}
-      {{- if fileExists $checkImagePath }}
-        {{- $headingImage = true -}}
-      {{- end -}}
-    {{- else -}}
-      {{- $headingIcon = true -}}
-    {{- end -}}
-  {{- end -}}
-
-  <div class="main-heading-with-version {{- if and (not $headingImage) (not $headingIcon) }} heading-without-image{{- end }}">
-    {{- if and (.Site.Params.versions) (not .Params.unversioned) -}}
-      <div class="header-version-dropdown dropdown-list">
-        <div class="dropdown">
-          {{- partial "navbar-version-selector.html" . -}}
-        </div>
-      </div>
-    {{- end -}}
-    {{- if $headingImage -}}
-      <div class="heading-image">
-        <img alt="{{ .Title }}" title="{{ .Title }}" src="{{ .Params.image }}" />
-      </div>
-    {{- else if $headingIcon -}}
-      <div class="heading-image">
-        <i class="{{ .Params.image }}"></i>
-      </div>
-    {{- end -}}
-    <div class="heading-content">
-      <div>
-        <h1>
-          {{ if .Params.headerTitle }}{{ .Params.headerTitle }}{{ else }}{{ .Title }}{{ end }}
-          {{ if .Draft }} (Draft){{ end }}
-          {{- if .Params.tags -}}
-            {{- if .Params.tags.feature -}}
-              {{- partial "tags/feature.html" . -}}
-            {{- end -}}
-
-            {{- if .Params.tags.other -}}
-              {{- partial "tags/other.html" . -}}
-            {{- end -}}
-          {{- end -}}
-        </h1>
-        {{ with .Params.headcontent }}<div class="lead">{{ . | markdownify }}</div>{{ end }}
-      </div>
+      {{ partial "page-meta-lastmod.html" . }}
     </div>
   </div>
-
-  {{- if ne .Params.showRightNav true -}}
-    {{- partial "contribute_list" . -}}
-  {{- end -}}
-  <!-- Wrap table in div for responsive -->
-  {{ .Content | replaceRE "(<table(?:.|\n)+?</table>)" "<div class=table-responsive> ${1} </div>"  | safeHTML }}
-  {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}
-    {{ partial "feedback.html" .Site.Params.ui.feedback }}
-    <br />
-  {{ end }}
-  {{ partial "page-meta-lastmod.html" . }}
-</div>
 {{ end }}
diff --git a/docs/layouts/partials/page-meta-lastmod.html b/docs/layouts/partials/page-meta-lastmod.html
new file mode 100644
index 000000000000..45b7f11c422d
--- /dev/null
+++ b/docs/layouts/partials/page-meta-lastmod.html
@@ -0,0 +1,9 @@
+{{ if .Lastmod }}
+  <p style="font-size:0.9em;color:#777;margin-top:2em;">
+    Last updated: {{ .Lastmod.Format "Jan 02, 2006" }}
+  </p>
+{{ else }}
+  <p style="font-size:0.9em;color:#777;margin-top:2em;">
+    Last updated: N/A
+  </p>
+{{ end }}
diff --git a/docs/layouts/partials/sidebar.html b/docs/layouts/partials/sidebar.html
new file mode 100644
index 000000000000..4c7a45e6db94
--- /dev/null
+++ b/docs/layouts/partials/sidebar.html
@@ -0,0 +1,10 @@
+<aside style="float:left;width:22%;padding-right:20px;border-right:1px solid #ddd;margin-right:20px;">
+  <h3>📘 Navigation</h3>
+  <ul style="list-style:none;padding:0;">
+    <li><a href="/">Home</a></li>
+    <li><a href="/preview/">Preview</a></li>
+    <li><a href="/architecture/">Architecture</a></li>
+    <li><a href="/develop/">Develop</a></li>
+    <li><a href="/deploy/">Deploy</a></li>
+  </ul>
+</aside>
diff --git a/layouts/shortcodes/contribute.html b/layouts/shortcodes/contribute.html
new file mode 100644
index 000000000000..470cf340bed4
--- /dev/null
+++ b/layouts/shortcodes/contribute.html
@@ -0,0 +1,3 @@
+<div class="contribute-box">
+  <p>Want to improve this page? <a href="https://github.com/yugabyte/yugabyte-db-docs">Contribute on GitHub!</a></p>
+</div>