diff --git a/assets/css/v2/style.css b/assets/css/v2/style.css
index 3c2e726..42958b3 100644
--- a/assets/css/v2/style.css
+++ b/assets/css/v2/style.css
@@ -529,6 +529,7 @@ atomic-search-layout atomic-layout-section[section="search"] {
   max-height: 100vh;
   overflow: hidden;
   scrollbar-gutter: stable;
+  scrollbar-width: none;
 }
 
 .sidebar .scrollbar-container:hover {
@@ -698,7 +699,7 @@ atomic-search-layout atomic-layout-section[section="search"] {
 
 .sidebar .sidebar-navigation ul li .partial {
   margin-top: 0;
-  top: calc(50% - 3.5px);
+  top: 5px;
   left: -13px;
 }
 
@@ -707,10 +708,7 @@ atomic-search-layout atomic-layout-section[section="search"] {
   position: relative;
 }
 
-.sidebar
-  .sidebar-navigation
-  .parent-collapsible-content
-  li:not(:only-child)::before {
+.sidebar .sidebar-navigation .parent-collapsible-content:first-child::before {
   content: "";
   position: absolute;
   border-left: black 1px solid;
@@ -719,6 +717,16 @@ atomic-search-layout atomic-layout-section[section="search"] {
   height: calc(100% - 9px - 10px);
 }
 
+.sidebar
+  .sidebar-navigation
+  .parent-collapsible-content
+  li:not(:only-child)
+  a
+  + :not(:has(#TableOfContents))
+  li::before {
+  border: none;
+}
+
 /* First Sidebar Nav Horizontal Lines */
 .sidebar
   .sidebar-navigation
@@ -748,6 +756,22 @@ atomic-search-layout atomic-layout-section[section="search"] {
   align-items: flex-start;
 }
 
+/* Table of Contents */
+#TableOfContents {
+  /* Close all TOC on sidebar */
+  display: none;
+}
+
+.collapsible-content li ul li:has(.current) > nav {
+  /* Open TOC for current page */
+  display: block !important;
+}
+
+#TableOfContents li {
+  position: relative;
+  list-style: square;
+}
+
 /* content */
 main {
   flex: 1;
diff --git a/layouts/partials/sidebar-list-pages.html b/layouts/partials/sidebar-list-pages.html
index cc158d5..e35a147 100644
--- a/layouts/partials/sidebar-list-pages.html
+++ b/layouts/partials/sidebar-list-pages.html
@@ -20,6 +20,9 @@
                 <span class="box-link partial"></span>              
             {{ end }}
             <a href="{{ .Permalink }}" style="{{if eq $currentUrl .Permalink}}font-weight: bold;{{end}}">{{ .Title }} </a>
+            {{- with .TableOfContents -}}
+                {{- . -}}
+            {{- end -}}
         {{ end }}
     </li>
     {{ end }}