diff --git a/.editorconfig b/.editorconfig
index d7f05924..17ae50dd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,7 +13,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 
 indent_style = space
-indent_size = 4
+indent_size = 2
 
 [Makefile]
 indent_style = tab
diff --git a/README.md b/README.md
index 6ffdabb1..7036e719 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# [Echo v3] (https://echo.labstack.com) [![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/labstack/echo) [![License](http://img.shields.io/badge/license-mit-blue.svg?style=flat-square)](https://raw.githubusercontent.com/labstack/echo/master/LICENSE) [![Build Status](http://img.shields.io/travis/labstack/echo.svg?style=flat-square)](https://travis-ci.org/labstack/echo) [![Coverage Status](http://img.shields.io/coveralls/labstack/echo.svg?style=flat-square)](https://coveralls.io/r/labstack/echo) [![Join the chat at https://gitter.im/labstack/echo](https://img.shields.io/badge/gitter-join%20chat-brightgreen.svg?style=flat-square)](https://gitter.im/labstack/echo) [![Twitter](https://img.shields.io/badge/twitter-@labstack-55acee.svg?style=flat-square)](https://twitter.com/labstack)
+# [Echo] (https://echo.labstack.com) [![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/labstack/echo) [![License](http://img.shields.io/badge/license-mit-blue.svg?style=flat-square)](https://raw.githubusercontent.com/labstack/echo/master/LICENSE) [![Build Status](http://img.shields.io/travis/labstack/echo.svg?style=flat-square)](https://travis-ci.org/labstack/echo) [![Coverage Status](http://img.shields.io/coveralls/labstack/echo.svg?style=flat-square)](https://coveralls.io/r/labstack/echo) [![Join the chat at https://gitter.im/labstack/echo](https://img.shields.io/badge/gitter-join%20chat-brightgreen.svg?style=flat-square)](https://gitter.im/labstack/echo) [![Twitter](https://img.shields.io/badge/twitter-@labstack-55acee.svg?style=flat-square)](https://twitter.com/labstack)
 
 ### Fast and unfancy HTTP server framework for Go (Golang).
 
diff --git a/website/content/support-echo.md b/website/content/support-echo.md
index e21027ba..3501d268 100644
--- a/website/content/support-echo.md
+++ b/website/content/support-echo.md
@@ -1,5 +1,5 @@
 +++
-title = "Support"
+title = "Support Echo"
 +++
 
 ## Support Echo Development
diff --git a/website/layouts/_default/single.html b/website/layouts/_default/single.html
index 059a88aa..a52b6e0b 100644
--- a/website/layouts/_default/single.html
+++ b/website/layouts/_default/single.html
@@ -13,20 +13,6 @@
             {{ .Content }}
           </section>
           <footer style="margin-top: 40px;">
-            <div id="disqus_thread"></div>
-            <script type="text/javascript">
-              /* * * CONFIGURATION VARIABLES * * */
-              var disqus_shortname = 'labstack';
-
-              /* * * DON'T EDIT BELOW THIS LINE * * */
-              (function() {
-                var dsq = document.createElement('script');
-                dsq.type = 'text/javascript';
-                dsq.async = true;
-                dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-              })();
-            </script>
           </footer>
         </article>
 			</div>
diff --git a/website/layouts/partials/footer.html b/website/layouts/partials/footer.html
index e091e8ec..e19018c1 100644
--- a/website/layouts/partials/footer.html
+++ b/website/layouts/partials/footer.html
@@ -31,12 +31,6 @@
     }
   });
 </script>
-<!-- <script src="//sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>
-<script>
-  ((window.gitter = {}).chat = {}).options = {
-    room: 'labstack/echo'
-  };
-</script> -->
 <script async defer id="github-bjs" src="//buttons.github.io/buttons.js"></script>
 <script src="https://cdn.labstack.com/scripts/prism.js"></script>
 <script src="https://cdn.labstack.com/scripts/doc.js"></script>
diff --git a/website/layouts/partials/head.html b/website/layouts/partials/head.html
index 0ccf0d22..2b5501b8 100644
--- a/website/layouts/partials/head.html
+++ b/website/layouts/partials/head.html
@@ -12,7 +12,7 @@
   <meta name="twitter:image" content="{{ .Site.Params.image }}">
   <meta property="og:title" content="{{ if ne .URL "/" }}{{ .Title }} | {{ end }}{{ .Site.Title }}">
   <meta property="og:site_name" content="echo">
-  <meta property="og:og:description" content="{{ if ne .URL "/" }}{{ .Description }}{{ else }}{{ .Site.Params.description }}{{ end }}">
+  <meta property="og:description" content="{{ if ne .URL "/" }}{{ .Description }}{{ else }}{{ .Site.Params.description }}{{ end }}">
   <meta property="og:url" content="{{ .Site.BaseURL }}">
   <meta property="og:image" content="{{ .Site.Params.image }}">
   <title>
diff --git a/website/layouts/partials/menu.html b/website/layouts/partials/menu.html
deleted file mode 100644
index c267c7fb..00000000
--- a/website/layouts/partials/menu.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<nav class="w3-sidenav">
-  {{ $currentNode := . }}
-  {{ range .Site.Menus.side }}
-    <h4>{{ .Pre }} {{ .Name }}</h4>
-      {{ range .Children }}
-        <a{{ if $currentNode.IsMenuCurrent "side" . }} class="w3-theme"{{ end }} href="{{ .URL }}">
-          {{ .Name }}
-        </a>
-        {{ if .HasChildren }}
-          {{ range .Children }}
-            <a {{ if $currentNode.IsMenuCurrent "side" . }} class="w3-theme"{{ end }} href="{{ .URL }}">
-              {{ .Name }}
-            </a>
-          {{ end }}
-        {{ end }}
-      {{ end }}
-  {{ end }}
-</nav>
diff --git a/website/layouts/partials/notice.html b/website/layouts/partials/notice.html
index 07e5fa45..50fa505e 100644
--- a/website/layouts/partials/notice.html
+++ b/website/layouts/partials/notice.html
@@ -1,8 +1,8 @@
-<div class="w3-panel w3-red notice">
+<div class="w3-panel w3-pale-red w3-leftbar w3-border-red">
   <h3>
     Check out our new project <a href="https://github.com/labstack/armor">Armor</a>
   </h3>
   <p>
-    Simple HTTP server, supports HTTP/2 and auto TLS, based on Echo v3.
+    Uncomplicated HTTP server, supports HTTP/2 and auto TLS
   </p>
 </div>
diff --git a/website/layouts/partials/sidenav.html b/website/layouts/partials/sidenav.html
index 9a1e3996..c6cea7a7 100644
--- a/website/layouts/partials/sidenav.html
+++ b/website/layouts/partials/sidenav.html
@@ -5,12 +5,6 @@
   <a class="support w3-btn w3-white w3-border w3-border-theme w3-round-xlarge" href="/support-echo">
     <i class="fa fa-heart" aria-hidden="true"></i> Support Echo
   </a>
-	<h4>
-		<select class="w3-select w3-border" onchange="version(this);">
-			<option value="/v2">v2</option>
-			<option value="/" selected>v3</option>
-    </select>
-	</h4>
   {{ $currentNode := . }}
   {{ range .Site.Menus.side }}
     <h3>{{ .Pre }} {{ .Name }}</h3>
diff --git a/website/static/scripts/main.js b/website/static/scripts/main.js
index 7a060b42..e69de29b 100644
--- a/website/static/scripts/main.js
+++ b/website/static/scripts/main.js
@@ -1,3 +0,0 @@
-function version(e) {
-	window.location = e.value;
-}