diff --git a/content/concepts/architecture.md b/content/concepts/architecture.md
index c143375d..4cdd8602 100644
--- a/content/concepts/architecture.md
+++ b/content/concepts/architecture.md
@@ -1,4 +1,3 @@
 ---
 title: Architecture
-sidebar: concepts
 ---
diff --git a/content/concepts/ecosystem.md b/content/concepts/ecosystem.md
index b4bf543d..362efcc8 100644
--- a/content/concepts/ecosystem.md
+++ b/content/concepts/ecosystem.md
@@ -1,4 +1,3 @@
 ---
 title: Ecosystem
-sidebar: concepts
 ---
diff --git a/content/concepts/introduction.md b/content/concepts/introduction.md
index 00e90997..cda8255c 100644
--- a/content/concepts/introduction.md
+++ b/content/concepts/introduction.md
@@ -1,6 +1,5 @@
 ---
 title: Introduction
-sidebar: concepts
 ---
 
 What is Ocean Protocol?
diff --git a/content/concepts/security.md b/content/concepts/security.md
index d5bebeb6..77350687 100644
--- a/content/concepts/security.md
+++ b/content/concepts/security.md
@@ -1,4 +1,3 @@
 ---
 title: Security
-sidebar: concepts
 ---
diff --git a/content/concepts/terminology.md b/content/concepts/terminology.md
index 5d23a14c..04fe91aa 100644
--- a/content/concepts/terminology.md
+++ b/content/concepts/terminology.md
@@ -1,6 +1,5 @@
 ---
 title: Terminology
-sidebar: concepts
 ---
 
 There is terminology specific to Ocean Protocol.
diff --git a/content/concepts/vulnerabilities.md b/content/concepts/vulnerabilities.md
index ae29d92b..e1c53f98 100644
--- a/content/concepts/vulnerabilities.md
+++ b/content/concepts/vulnerabilities.md
@@ -1,4 +1,3 @@
 ---
 title: Reporting vulnerabilities
-sidebar: concepts
 ---
diff --git a/src/components/Sidebar.jsx b/src/components/Sidebar.jsx
index e5ea074c..ed6429c1 100644
--- a/src/components/Sidebar.jsx
+++ b/src/components/Sidebar.jsx
@@ -38,7 +38,7 @@ const SidebarLink = ({ link, title, linkClasses }) => {
             )
         }
     } else {
-        return <>{this.props.title}</>
+        return title
     }
 }
 
@@ -72,6 +72,7 @@ export default class Sidebar extends Component {
 
     render() {
         const { sidebar, location } = this.props
+
         const sidebarfile = sidebar
             ? require(`../data/sidebars/${sidebar}.yml`) // eslint-disable-line
             : []
diff --git a/src/data/sidebars/tutorials.yml b/src/data/sidebars/tutorials.yml
index e69de29b..39cdd0de 100644
--- a/src/data/sidebars/tutorials.yml
+++ b/src/data/sidebars/tutorials.yml
@@ -0,0 +1 @@
+-
diff --git a/src/templates/Doc.jsx b/src/templates/Doc.jsx
index 3c877ac7..f97e224b 100644
--- a/src/templates/Doc.jsx
+++ b/src/templates/Doc.jsx
@@ -11,14 +11,13 @@ export default class DocTemplate extends Component {
     }
 
     render() {
+        const { location } = this.props
         const post = this.props.data.markdownRemark
+        const { section } = post.fields
 
         return (
-            <Layout location={this.props.location}>
-                <Sidebar
-                    location={this.props.location}
-                    sidebar={post.frontmatter.sidebar}
-                />
+            <Layout location={location}>
+                <Sidebar location={location} sidebar={section} />
 
                 <h1>{post.frontmatter.title}</h1>
                 <div dangerouslySetInnerHTML={{ __html: post.html }} />
@@ -40,7 +39,9 @@ export const pageQuery = graphql`
             html
             frontmatter {
                 title
-                sidebar
+            }
+            fields {
+                section
             }
         }
     }