diff --git a/gatsby-node.js b/gatsby-node.js
index 46ae2418..1a765c90 100755
--- a/gatsby-node.js
+++ b/gatsby-node.js
@@ -132,12 +132,13 @@ exports.createPages = ({ graphql, actions }) => {
         await createSwaggerPages(createPage)
 
         // API: ocean.js
-        const lastRelease = result.data.oceanJs.repository.releases.edges.filter(
-          ({ node }) =>
-            !node.isPrerelease &&
-            !node.isDraft &&
-            node.releaseAssets.edges.length > 0
-        )[0].node.releaseAssets.edges[0].node
+        const lastRelease =
+          result.data.oceanJs.repository.releases.edges.filter(
+            ({ node }) =>
+              !node.isPrerelease &&
+              !node.isDraft &&
+              node.releaseAssets.edges.length > 0
+          )[0].node.releaseAssets.edges[0].node
 
         await createTypeDocPage(
           createPage,
diff --git a/src/components/Sidebar.jsx b/src/components/Sidebar.jsx
index 7c6cd4a8..62d26cb9 100644
--- a/src/components/Sidebar.jsx
+++ b/src/components/Sidebar.jsx
@@ -122,7 +122,10 @@ export default class Sidebar extends Component {
         {sidebarfile.map((group, i) => (
           <div key={i}>
             {collapsed ? (
-              group.items.some((item) => location.pathname.startsWith(item.link)) ? (
+              group.items.some(
+                (item) =>
+                  location.pathname.substring(0, item.link.length) === item.link
+              ) ? (
                 <SidebarGroup
                   i={i}
                   group={group}
diff --git a/src/templates/Markdown/MarkdownList.jsx b/src/templates/Markdown/MarkdownList.jsx
index bcbfbcb3..fc38785e 100644
--- a/src/templates/Markdown/MarkdownList.jsx
+++ b/src/templates/Markdown/MarkdownList.jsx
@@ -2,9 +2,8 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import MarkdownTemplate from '../MarkdownTemplate'
 import sidebarStyles from '../../components/Sidebar.module.scss'
-import moduleStyles from '../../components/Sidebar.module.scss'
 import { generatedNestedObject } from './utils'
-import { navigate } from 'gatsby'
+import { navigate, graphql } from 'gatsby'
 import ContentWrapperTemplate from '../ContentWrapperTemplate'
 
 export default function MarkdownList({ data, location, pageContext }) {
@@ -41,7 +40,7 @@ export default function MarkdownList({ data, location, pageContext }) {
 
   const generateModuleListElement = (id, label) => {
     const className =
-      selectedModule.id === id ? moduleStyles.active : moduleStyles.link
+      selectedModule.id === id ? sidebarStyles.active : sidebarStyles.link
 
     return (
       <li key={id} id={id} style={{ cursor: 'pointer' }}>
@@ -94,7 +93,6 @@ export default function MarkdownList({ data, location, pageContext }) {
         toc={nestedSidebarList}
       >
         <MarkdownTemplate data={selectedModule} />
-
       </ContentWrapperTemplate>
     </>
   )
@@ -102,21 +100,20 @@ export default function MarkdownList({ data, location, pageContext }) {
 
 MarkdownList.propTypes = {
   pageContext: PropTypes.object.isRequired,
-  location: PropTypes.object.isRequired
+  location: PropTypes.object.isRequired,
+  data: PropTypes.object
 }
 
-
 export const MarkdownListQuery = graphql`
-      query {
-        allSectionsYaml {
-        edges {
+  query {
+    allSectionsYaml {
+      edges {
         node {
-        title
+          title
           description
-      link
+          link
         }
       }
     }
   }
-      `
-
+`