diff --git a/docs/layouts/_default/baseof.html b/docs/layouts/_default/baseof.html
index 94adb78f7..113febb9a 100644
--- a/docs/layouts/_default/baseof.html
+++ b/docs/layouts/_default/baseof.html
@@ -10,7 +10,7 @@
       {{ partial "navbar.html" . }}
     </header>
     <div class="container-fluid td-default td-outer">
-      <main role="main" class="td-main" aria-label="Article content">
+      <main id="main-content" role="main" class="td-main" aria-label="Article content">
         {{ block "main" . }}{{ end }}
       </main>
       {{ partialCached "footer.html" . }}
diff --git a/docs/layouts/docs/baseof.html b/docs/layouts/docs/baseof.html
index 56c1d0fb4..3ad552702 100644
--- a/docs/layouts/docs/baseof.html
+++ b/docs/layouts/docs/baseof.html
@@ -25,7 +25,7 @@
           <div class="d-none d-xl-block col-xl-2 td-toc d-print-none">
             {{ partial "toc.html" . }}
           </div>
-          <main class="col-12 col-lg-8 col-xl-7 pl-lg-5 ps-lg-5" role="main" aria-label="Article content">
+          <main id="main-content" class="col-12 col-lg-8 col-xl-7 pl-lg-5 ps-lg-5" role="main" aria-label="Article content">
             {{ partial "version-banner.html" . }}
             {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }}
             {{ if .Draft }}
diff --git a/docs/layouts/partials/navbar-version-selector.html b/docs/layouts/partials/navbar-version-selector.html
index e11073a57..546086a14 100644
--- a/docs/layouts/partials/navbar-version-selector.html
+++ b/docs/layouts/partials/navbar-version-selector.html
@@ -9,9 +9,9 @@
     {{ $.Scratch.Set "activeVersion" .version }}
   {{ end }}
 {{ end }}
-<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+<button class="nav-link dropdown-toggle" id="navbarDropdown" role="button" data-toggle="dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 	{{ printf "%s" ($.Scratch.Get "docLabel") }}
-</a>
+</button>
 <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
 	{{ range .Site.Params.versions }}
 	<a
diff --git a/docs/layouts/partials/sidebar.html b/docs/layouts/partials/sidebar.html
new file mode 100644
index 000000000..254763f5b
--- /dev/null
+++ b/docs/layouts/partials/sidebar.html
@@ -0,0 +1,94 @@
+{{/* (C) 2023 GoodData Corporation */}}
+<button type="button" id="gd-docs-menu__mobile-trigger" class="gd-docs-menu__mobile-btn" aria-expanded="false" aria-controls="gd-docs-menu" aria-label="Toggle navigation menu">
+  <span class="gd-docs-menu__mobile-icon" aria-hidden="true"></span>
+</button>
+<div class="gd-docs-menu__mobile-bg"></div>
+<nav id="gd-docs-menu" class="gd-docs-menu init" aria-label="Articles">
+    {{ if .Site.Params.versions }}
+        {{ partial "navbar-version-selector.html" . }}
+    {{ end }}
+
+    {{ partial "sidebar-tree.html" . }}
+</nav>
+
+{{ define "root-link" }}
+    {{ $isCurrent := eq .currentPage .root.FirstSection }}
+    {{ $active := .active }}
+    {{ with .root }}
+        <ul class="gd-docs-menu-section gd-docs-menu-section__root">
+        <li class="gd-docs-menu-page{{ if or $isCurrent $active }} active{{ end }}">
+            <div class="gd-docs-menu-page__title">
+            <a href="{{ .RelPermalink }}" class="gd-docs-menu-page__link">{{ .LinkTitle }}</a>
+            </div>
+        </li>
+        </ul>
+    {{ end }}
+{{ end }}
+
+{{ define "section-tree-nav-sections" }}
+    {{ $root := .root }}
+    {{ $site := .site }}
+    {{ $currentPage := .currentPage }}
+    {{ $firstInSection := (index $root 0) }}
+    {{ $isRootSection := eq $firstInSection.Parent .site.Home }}
+
+    {{ if gt (len (where $root.ByWeight "Params.toc_hide" "ne" true)) 0 }}
+
+    <ul class="gd-docs-menu-section{{ if .activeSection }} active{{ end }}">
+        {{ range $page := $root.ByWeight }}
+        {{ $page := $page.Page }}
+        {{ $pageId := replace (replaceRE "^/|/$" "" $page.RelPermalink) "/" "_" }}
+
+        {{ if and (not (eq $page.Params.toc_hide true)) (not (eq $page $site.Home)) }}
+            {{ $activePage := eq $page $currentPage }}
+            {{ $activeSection := or $activePage ($currentPage.IsDescendant $page) }}
+            {{ $pageId := replace (replaceRE "^/|/$" "" $page.RelPermalink) "/" "_" }}
+
+            <li class="gd-docs-menu-page{{ if $activePage }} active{{ end }}{{ if $page.Params.navSeparator }} gd-docs-menu-page__separator{{ end }}">
+            {{ if $page.Params.navigationLabel }}
+                <span class="gd-docs-menu-page__label">{{ $page.LinkTitle }}</span>
+            {{ else }}
+                <div class="gd-docs-menu-page__title">
+                {{ if $page.Params.externalLink }}
+                    <a href="{{ $page.Params.externalLink }}" class="gd-docs-menu-page__link" target="_blank">{{ $page.LinkTitle }}</a>
+                {{ else }}
+                    <a href="{{ $page.Permalink }}" class="gd-docs-menu-page__link">{{ $page.LinkTitle }}</a>
+                {{ end }}
+
+                {{ if $page.Pages }}
+                    <button
+                      type="button"
+                      id="btn-{{ $pageId }}"
+                      class="gd-docs-menu-page__toggle-btn"
+                      aria-expanded="{{ if $activeSection }}true{{ else }}false{{ end }}"
+                      aria-controls="section-{{ $pageId }}"
+                      aria-label="{{ if $activeSection }}Collapse{{ else }}Expand{{ end }} {{ $page.LinkTitle }} section">
+                      <span class="gd-docs-menu-page__chevron">
+                        {{ with resources.Get "icons/chevron-menu.svg" }}
+                          {{ $svg := . | minify }}
+                          {{ $svg := replace $svg.Content "<svg " "<svg aria-hidden=\"true\" focusable=\"false\" " }}
+                          {{ $svg | safeHTML }}
+                        {{ end }}
+                      </span>
+                    </button>
+                {{ end }}
+                </div>
+
+                {{ if $page.Pages }}
+                <div id="section-{{ $pageId }}" class="gd-docs-menu-section-wrapper{{ if $activeSection }} expanded{{ end }}">
+                  {{ template "section-tree-nav-sections" (dict "root" $page.Pages "currentPage" $currentPage "activeSection" $activeSection "site" $site)  }}
+                </div>
+                {{ end }}
+            {{ end }}
+            </li>
+
+            {{ if and $page.Params.navigationLabel $page.Pages }}
+            <li class="gd-docs-menu-page">
+                {{ template "section-tree-nav-sections" (dict "root" $page.Pages "currentPage" $currentPage "activeSection" $activeSection "site" $site) }}
+            </li>
+            {{ end }}
+        {{ end }}
+        {{ end }}
+        </ul>
+    {{ end }}
+{{ end }}
diff --git a/docs/layouts/partials/skip-links.html b/docs/layouts/partials/skip-links.html
new file mode 100644
index 000000000..700dd1a64
--- /dev/null
+++ b/docs/layouts/partials/skip-links.html
@@ -0,0 +1,2 @@
+{{/* (C) 2023 GoodData Corporation */}}
+<div class="skip-links"></div>