diff --git a/docs/06_extend-cli.md b/docs/06_extend-cli.md
index 09cf34d..1631518 100644
--- a/docs/06_extend-cli.md
+++ b/docs/06_extend-cli.md
@@ -91,7 +91,7 @@
 ```
 Now you're good to go to write your new pipeline element :tada: :tada: :tada:
 
-> **HINT for extensions**: Use our [Maven archetypes](https://streampipes.apache.org/docs/docs/dev-guide-archetype/) to setup a project skeleton and use your IDE of choice for development. However, we do recommend using IntelliJ.
+> **HINT for extensions**: Use our [Maven archetypes](https://streampipes.apache.org/docs/docs/extend-archetypes/) to setup a project skeleton and use your IDE of choice for development. However, we do recommend using IntelliJ.
 
 > **HINT for core**: To work on `backend` or `ui` features you need to set the template to `backend` and clone the core repository [streampipes](https://github.com/apache/streampipes) - check the prerequisites there for more information.
 
diff --git a/docs/06_extend-sdk-event-model.md b/docs/06_extend-sdk-event-model.md
index 5a21d9c..42cc8d4 100644
--- a/docs/06_extend-sdk-event-model.md
+++ b/docs/06_extend-sdk-event-model.md
@@ -10,11 +10,11 @@
 
 ## Prerequisites
 
-This guide assumes that you are already familiar with the basic setup of [data processors](dev-guide-processor-sdk.md) and [data sinks](dev-guide-sink-sdk.md).
+This guide assumes that you are already familiar with the basic setup of [data processors](06_extend-first-processor.md).
 
 ### Property Selectors
 
-In most cases, fields that are subject to be transformed by pipeline elements are provided by the assigned ``MappingProperty`` (see the guide on [static properties](dev-guide-static-properties.md)).
+In most cases, fields that are subject to be transformed by pipeline elements are provided by the assigned ``MappingProperty`` (see the guide on [static properties](extend-sdk-static-properties)).
 
 Mapping properties return a ``PropertySelector`` that identifies a field based on (i) the **streamIndex** and (ii) the runtime name of the field.
 Let's assume we have an event with the following structure:
@@ -41,7 +41,7 @@
 
 ``s0`` identifies the stream (in this case, only one input streams exist, but as data processors might require more than one input stream, a stream identifier is required), while the appendix identifies the runtime name.
 
-Note: If you add a new field to an input event, you don't need to provide the selector, you can just assign the runtime name as defined by the [output strategy](dev-guide-output-strategies.md).
+Note: If you add a new field to an input event, you don't need to provide the selector, you can just assign the runtime name as defined by the [output strategy](extend-sdk-output-strategies).
 
 ### Reading Fields
 
diff --git a/website-v2/src/components/PageHeader.tsx b/website-v2/src/components/PageHeader.tsx
index c44ee07..fedaa5d 100644
--- a/website-v2/src/components/PageHeader.tsx
+++ b/website-v2/src/components/PageHeader.tsx
@@ -7,7 +7,7 @@
         <div className="row h-100 align-items-center">
           <div className="col-12">
             <div className="page-banner-content">
-              <h2>
+              <h2 className={"thick-border-left"}>
                 {props.title}
               </h2>
             </div>
diff --git a/website-v2/src/css/customTheme.css b/website-v2/src/css/customTheme.css
index 0d6a3c9..f8b2184 100644
--- a/website-v2/src/css/customTheme.css
+++ b/website-v2/src/css/customTheme.css
@@ -44,3 +44,34 @@
     width: auto;
     display: inline-block;
 }
+
+/*
+ *  Styling Sidebar's Version dropdown
+ */
+
+#sidebarCssSelector > div {
+    padding-top: 0 !important;
+}
+aside div div:has(nav.menu) {
+    padding-top: 0 !important;
+}
+aside .custom-sidebar-version {
+    margin-top: var(--ifm-navbar-height);
+    padding: 0.5rem 0 0 0.5rem;
+}
+
+aside .custom-sidebar-inner {
+    align-items: center;
+    border: 1px solid #eee;
+    border-radius: 0.5rem;
+    box-shadow: 0 1px 2px 0 rgba(0,0,0,.03);
+    display: flex;
+    margin: 1rem;
+    padding: 4px 1rem;
+}
+
+aside .custom-sidebar-version p {
+    margin-bottom: 0;
+    font-size: var(--fbc-font-size: 13px;);
+    padding: var(--ifm-menu-link-padding-vertical) var(--ifm-menu-link-padding-horizontal);
+}
diff --git a/website-v2/src/navbar/navbar.js b/website-v2/src/navbar/navbar.js
index b95c925..cd18680 100644
--- a/website-v2/src/navbar/navbar.js
+++ b/website-v2/src/navbar/navbar.js
@@ -108,11 +108,5 @@
         label: "Thanks"
       }
     ]
-  },
-  {
-    type: 'docsVersionDropdown',
-    position: 'left',
-    dropdownItemsAfter: [{to: '/versions', label: 'All versions'}],
-    dropdownActiveClassDisabled: true,
   }
 ];
diff --git a/website-v2/src/theme/DocSidebar/index.js b/website-v2/src/theme/DocSidebar/index.js
new file mode 100644
index 0000000..e86652b
--- /dev/null
+++ b/website-v2/src/theme/DocSidebar/index.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import DocSidebar from '@theme-original/DocSidebar';
+import DocsVersionDropdownNavbarItem from '@theme-original/NavbarItem/DocsVersionDropdownNavbarItem';
+
+export default function DocSidebarWrapper(props) {
+  return (
+      <>
+
+        <div className="custom-sidebar-version">
+          <div className={"custom-sidebar-inner"}><span style={{ "display": "inline-block" }}>Version</span> <DocsVersionDropdownNavbarItem dropdownItemsBefore={[]} dropdownItemsAfter={[]} /></div>
+        </div>
+        <div id="sidebarCssSelector">
+          <DocSidebar {...props} />
+        </div>
+      </>
+  );
+}
diff --git a/website-v2/static/css/custom.css b/website-v2/static/css/custom.css
index 70fe9ff..f54fcea 100644
--- a/website-v2/static/css/custom.css
+++ b/website-v2/static/css/custom.css
@@ -465,3 +465,10 @@
     box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
     margin: 10px;
 }
+
+.thick-border-left {
+    text-decoration: underline;
+    padding-left: 10px;
+    text-decoration-style: solid;
+    text-underline-offset: 15px;
+}
diff --git a/website-v2/static/css/page-banner.css b/website-v2/static/css/page-banner.css
index 7b0f560..825f567 100644
--- a/website-v2/static/css/page-banner.css
+++ b/website-v2/static/css/page-banner.css
@@ -23,6 +23,8 @@
     z-index: 1;
     //background: linear-gradient(0deg,rgba(57, 181, 74, 0.8),rgba(57, 181, 74, 0.8)), url('/img/bg-img/bg-index.jpg');
     background-size:cover;
+    background: #fcfcfc;
+    border-bottom: 1px solid #cecece;
     color:var(--color-accent);
 }