diff --git a/_includes/themes/zeppelin/default.html b/_includes/themes/zeppelin/default.html
index 29c2be27457..25d2d6376ae 100644
--- a/_includes/themes/zeppelin/default.html
+++ b/_includes/themes/zeppelin/default.html
@@ -39,7 +39,7 @@
     
     {% include themes/zeppelin/_navigation.html %}
 
-    <div class="container">
+    <div class="content">
       {{ content }}
       <hr>
       <footer>
diff --git a/assets/themes/zeppelin/css/style.css b/assets/themes/zeppelin/css/style.css
index 74cfdab1578..e318805651d 100644
--- a/assets/themes/zeppelin/css/style.css
+++ b/assets/themes/zeppelin/css/style.css
@@ -1,53 +1,131 @@
 /* Move down content because we have a fixed navbar that is 50px tall */
 @import url(//fonts.googleapis.com/css?family=Patua+One);
+@import url(//fonts.googleapis.com/css?family=Open+Sans);
 
 body {
   padding-top: 50px;
   padding-bottom: 20px;
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  line-height: 1.6;
+  color: #4c555a;
+  letter-spacing: .2px;
 }
 
 .jumbotron {
-    background-color: #3071a9;
+  background-color: #3071a9;
+}
+
+.jumbotron h1,
+.jumbotron p {
+  color: #fff;
+}
+
+.jumbotron p {
+  font-size: 19px; 
+}
+
+.jumbotron .btn {
+  font-size: 16px;
+}
+
+.jumbotron .thumbnail {
+  margin-top: 0;
+}
+
+.jumbotron.small {
+  padding: 0 0 0 0;
+  color: #ffffff;
+}
+
+.jumbotron.small .title{
+  float: left;
+  font-weight: bold;
+  font-size: 20px;
+  height: 30px;
+  margin-right: 20px;
+}
+
+.jumbotron.small .subtitle{
+  font-size: 14px;
+  height: 30px;
+  vertical-align: text-bottom;
+  padding-top: 7px;
+}
+
+.jumbotron.small .description{
+  margin-top: 7px;
+}
+
+.jumbotron h1 {
+  font-family: 'Patua One', cursive;
+
+.jumbotron h1 {
+  font-family: 'Patua One', cursive;
+}
+
+.jumbotron small {
+  font-size: 60%;
+  color: #FFF;
+}
+}
+
+.jumbotron small {
+  font-size: 60%;
+  color: #FFF;
 }
 
 .navbar-brand {
-  padding: 12px 12px;
-  padding-top: 15px;
+  padding-top: 10px;
   padding-bottom: 10px;
 }
 
+.navbar-brand img {
+  margin: 0;
+}
+
 .navbar {
- background-color:#3071a9;
- border-bottom:0px;
- height: 50px;
+  background: #3071a9;
+  border-bottom: 0px;
+  height: 50px;
 }
 
 .navbar-inverse .navbar-nav > li > a {
- color: #ffffff;
- background-color:#3071a9;
+  color: white;
+  background: #3071a9;
 }
 
 .navbar-inverse .navbar-nav > li > a:hover,
 .navbar-inverse .navbar-nav > li > a:focus {
-  color: #ffffff;
-  background-color: #2C6094;
+  color: white !important;
+  background: #2C6094 !important;
+}
+
+.navbar-inverse .navbar-collapse.in .navbar-nav .dropdown-menu > li > a:hover,
+.navbar-inverse .navbar-collapse.in .navbar-nav .dropdown-menu > li > a:focus {
+  color: white !important;
+  background: #2C6094 !important;
+}
+
+.navbar-inverse .navbar-collapse.in .navbar-nav .dropdown-menu > li > a {
+  color: white !important;
+}
+
+.navbar-inverse .navbar-collapse.in .navbar-nav .divider {
+  background: #286090;
 }
+
 .navbar-inverse .navbar-nav > li > a.active:hover,
 .navbar-inverse .navbar-nav > li > a.active:focus {
   text-decoration: none;
-  background-color: #265380;
+  background: #265380;
 }
 
 .navbar-inverse .navbar-nav > li > a.active {
-  background-color: #265380;
-}
-
-.navbar-inverse .navbar-brand:hover,
-.navbar-inverse .navbar-brand:focus {
+  background: #265380;
 }
 
 .navbar-inverse .navbar-brand {
-  color: #fff;
+  color: white;
   text-decoration: none;
   font-size: 32px;
 }
@@ -55,12 +133,12 @@ body {
 .navbar-inverse .navbar-collapse,
 .navbar-inverse .navbar-form {
   border-color: #265380;
-  background-color: #3071a9;
+  background: #3071a9;
 }
 
 @media (max-width: 768px) {
   .navbar-collapse.in {
-    box-shadow: 0px 2px 5px 0px rgba(0, 0, 0, 0.4);
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.4);
   }
 
   .bigFingerButton {
@@ -72,7 +150,7 @@ body {
 }
 
 .bigFingerButton {
-    margin-right: 10px;
+  margin-right: 10px;
 }
 
 .navbar-inverse .navbar-toggle {
@@ -82,14 +160,13 @@ body {
 .navbar-inverse .navbar-toggle:hover,
 .navbar-inverse .navbar-toggle:focus {
   border-color: #265380;
-  background-color: #265380;
+  background: #265380;
 }
 
 .navbar-inverse .navbar-toggle:focus {
-  outline-width: 0px;
+  outline-width: 0;
 }
 
-
 /* CUSTOMIZE THE CAROUSEL
 -------------------------------------------------- */
 
@@ -107,6 +184,7 @@ body {
 .carousel .item {
   height: 300px;
 }
+
 .carousel-control {
   background-image: none !important;
 }
@@ -118,10 +196,12 @@ body {
   min-width: 100%;
   height: 300px;
 }
+
 .carousel-indicators {
-  margin-top:30px;
-  margin-bottom:0px;
+  margin-top: 30px;
+  margin-bottom: 0;
 }
+
 @media screen and (min-width: 768px) {
   .carousel-indicators {
     margin-bottom: -60px;
@@ -131,145 +211,264 @@ body {
   }
 }
 
+/* screenshot img inside of doc */
+.screenshot {
+  width: 800px;
+}
 
-.jumbotron h1,
-.jumbotron p  {
-  color: #fff;
+.rotate270 {
+  width: 15px;
+  padding: 10px 0 0 0;
+  -webkit-transform: rotate(270deg);
+  -moz-transform: rotate(270deg);
+  -ms-transform: rotate(270deg);
+  -o-transform: rotate(270deg);
+  transform: rotate(270deg);
 }
-.jumbotron .thumbnail {
+
+/* Custom container */
+.content {
+  word-wrap: break-word;
+}
+.content :first-child {
   margin-top: 0;
 }
-.jumbotron.small {
-    padding: 0 0 0 0;
-    color : #ffffff;
+
+@media screen and (min-width: 64em) {
+  .content {
+    max-width: 64em;
+    padding: 2rem 6rem;
+    margin: 0 auto;
+  }
 }
-.jumbotron.small .title{
-    float : left;
-    font-weight : bold;
-    font-size : 20px;
-    height : 30px;
-    margin-right: 20px;
+@media screen and (min-width: 42em) and (max-width: 64em) {
+  .content {
+    padding: 2rem 4rem;
+  }
 }
-
-.jumbotron.small .subtitle{
-    font-size : 14px;
-    height : 30px;
-    vertical-align:text-bottom;
-    padding-top:7px;
+@media screen and (max-width: 42em) {
+  .content {
+    padding: 2rem 1rem;
+  }
 }
 
-.jumbotron.small .description{
-    margin-top: 7px;
+/* <a> */
+.content a {
+  color: #4183C4;
 }
-
-
-
-/* screenshot img inside of doc */
-.screenshot {
-    width : 800px;
+a.absent {
+  color: #cc0000;
 }
-
-/* Table on the index page */
-.table-container {
-    position: absolute;
+a.anchor {
+  display: block;
+  padding-left: 30px;
+  margin-left: -30px;
+  cursor: pointer;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0; 
 }
 
-.table-stack {
-/*    border: 1px solid #6371a9;*/
-    width:200px; padding: 5px 5px 5px 5px;
+/* <hn> */
+.content h1, h2, h3, h4, h5, h6 {
+  font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  margin-top: 3rem;
+  margin-bottom: 1rem;
+  font-weight: bold;
+  color: rgba(21,21,21,0.8);
 }
-
-.table-stack table {
-    width:100%
+.content h1 {
+  font-size: 30px;
+  color: black;
 }
-
-.table-stack tr td{
-    border: 1px solid #FFFFFF;
-    height : 40px;
-    background-color : #6371a9;
-    color : #FFFFFF;
+.content h2 {
+  font-size: 28px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  border-bottom: 1px solid #E5E5E5;
 }
-
-.table-stack .gray {
-    background-color:#DDDDDD;
-    color:#777777;
+.content h3 {
+  font-size: 22px;
+  padding-top: 5px;
+  padding-bottom: 5px;
 }
-
-/* Table for property */
-.table-configuration {
-    width : 800px;
-    border : 1px solid gray;
+.content h4 {
+  font-size: 18px;
 }
-.table-configuration tr td {
-    border : 1px solid gray;
-    padding : 5px 5px 5px 5px;
+.content h5 {
+  font-size: 14px;
 }
-.table-configuration tr th {
-    border : 1px solid gray;
-    padding : 5px 5px 5px 5px;
-    background-color: #B0C4DE;
+.content h6 {
+  font-size: 14px;
+  color: #777777;
 }
 
-
-.rotate270 {
-    width:15px;padding:10px 0px 0px 0px;
-    -webkit-transform: rotate(270deg);
-    -moz-transform: rotate(270deg);
-    -ms-transform: rotate(270deg);
-    -o-transform: rotate(270deg);
-    transform: rotate(270deg);
+.content img {
+  max-width: 100%;
 }
 
+/* <li, ul, ol> */
+.content li {
+  margin: 0;
+}
+.content li p.first {
+  display: inline-block;
+}
+.content ul :first-child, ol :first-child {
+  margin-top: 0px;
+}
 
+.content .nav-tabs {
+  margin-bottom: 10px;
+}
 
+/* <code> */
+.content code {
+  padding: 2px 4px;
+  font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  font-size: 90%;
+  color: #567482;
+  background-color: #f3f6fa;
+  border-radius: 0.3rem;
+}
 
-
-
-
-
-
-/* Custom container */
-.container-narrow {
-  margin: 0 auto;
-/*  max-width: 960px; */
+/* <pre> */
+.content pre {
+  padding: 0.8rem;
+  margin-top: 0;
+  margin-bottom: 1rem;
+  font: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  font-size: 90%;
+  color: #567482;
+  word-wrap: normal;
+  background-color: #f3f6fa;
+  border: solid 1px #dce6f0;
+  border-radius: 0.3rem;
+}
+.content pre > code {
+  padding: 0;
+  margin: 0;
+  font-size: 95%;
+  color: #567482;
+  word-break: normal;
+  white-space: pre;
+  background: transparent;
+  border: 0;
+}
+.content .highlight {
+  margin-bottom: 1rem;
+}
+.content .highlight pre {
+  margin-bottom: 0;
+  word-break: normal;
+}
+.content .highlight pre,
+.content pre {
+  padding: 0.8rem;
+  overflow: auto;
+  font-size: 90%;
+  line-height: 1.45;
+  border-radius: 0.3rem;
+  -webkit-overflow-scrolling: touch;
+}
+.content pre code,
+.content pre tt {
+  display: inline;
+  max-width: initial;
+  padding: 0;
+  margin: 0;
+  overflow: initial;
+  line-height: inherit;
+  word-wrap: normal;
+  background-color: transparent;
+  border: 0;
+}
+.content pre code:before, .main-content pre code:after,
+.content pre tt:before,
+.content pre tt:after {
+  content: normal;
+}
+
+/* <blockquotes> */
+.content blockquote {
+  padding: 0 1rem;
+  margin-left: 0;
+  color: #819198;
+  border-left: 0.3rem solid #dce6f0;
+}
+.content blockquote > :first-child {
+  margin-top: 0;
+}
+.content blockquote > :last-child {
+  margin-bottom: 0;
+}
+.content blockquote p {
+  font-size: 14px;
 }
 
-.container-narrow > hr {
-  margin: 30px 0; }
+/* <table> */
+.content table {
+  display: block;
+  width: 100%;
+  overflow: auto;
+  word-break: normal;
+  word-break: keep-all;
+  -webkit-overflow-scrolling: touch;
+  font-size: 90%;
+}
+.content table th {
+  font-weight: bold;
+  text-align: center;
+  background-color: rgba(91, 138, 179, 0.10);
+}
+.content table th,
+.content table td {
+  padding: 0.5rem 1rem;
+  border: 1px solid #e9ebec;
+}
 
 /* posts index */
 .post > h3.title {
   position: relative;
-  padding-top: 10px; }
+  padding-top: 10px;
+}
 
 .post > h3.title span.date {
   position: absolute;
   right: 0;
-  font-size: 0.9em; }
+  font-size: 0.9em;
+}
 
 .post > .more {
   margin: 10px 0;
-  text-align: left; }
+  text-align: left;
+}
 
 /* post-full*/
 .post-full .date {
   margin-bottom: 20px;
-  font-weight: bold; }
+  font-weight: bold;
+}
 
 /* tag_box */
 .tag_box {
   list-style: none;
   margin: 0;
-  overflow: hidden; }
+  overflow: hidden;
+}
 
 .tag_box li {
-  line-height: 28px; }
+  line-height: 28px;
+}
 
 .tag_box li i {
-  opacity: 0.9; }
+  opacity: 0.9;
+}
 
 .tag_box.inline li {
-  float: left; }
+  float: left;
+}
 
 .tag_box a {
   padding: 3px 6px;
@@ -278,96 +477,108 @@ body {
   color: #555;
   border-radius: 3px;
   text-decoration: none;
-  border: 1px dashed #cccccc; }
+  border: 1px dashed #cccccc;
+}
 
 .tag_box a span {
   vertical-align: super;
-  font-size: 0.8em; }
+  font-size: 0.8em;
+}
 
 .tag_box a:hover {
-  background-color: #e5e5e5; }
+  background: #e5e5e5;
+}
 
 .tag_box a.active {
   background: #57A957;
   border: 1px solid #4c964d;
-  color: #FFF; }
-
-
-.jumbotron h1 {
-  font-family: 'Patua One', cursive; }
-
-.jumbotron small {
-    font-size: 60%;
-    color: #FFF;}
+  color: white;
+}
 
 .navbar-brand {
-    font-family: 'Patua One', cursive;
+  font-family: 'Patua One', cursive;
 }
 
 .navbar-brand small {
-    font-size: 60%;
-    color: #FFF; }
+  font-size: 14px;
+  font-family: 'Helvetica Neue', Helvetica;
+  color: white;
+}
 
 .navbar-collapse.collapse {
-    max-height: 50px;}
+  max-height: 50px;
+}
 
 .navbar-inverse .navbar-nav a .caret,
 .navbar-inverse .navbar-nav a:hover .caret {
-    margin-left: 4px;
-    border-top-color: #FFF;
-    border-bottom-color: #FFF;
+  margin-left: 4px;
+  border-top-color: white;
+  border-bottom-color: white;
 }
 
 .navbar-inverse .navbar-nav > .open > a,
 .navbar-inverse .navbar-nav > .open > a:hover,
 .navbar-inverse .navbar-nav > .open > a:focus {
-  color: #ffffff;
-  background-color: #286090;
+  color: white;
+  background: #286090;
 }
 
 /* Custom, iPhone Retina */
-@media only screen and (max-width : 480px) {
+@media only screen and (max-width: 480px) {
   .jumbotron h1 {
     display: none;
   }
   .navbar-brand small {
-      display: none;
-      color: #FFF;
+    display: none;
+    color: white;
   }
 }
 
-@media only screen and (max-width : 768px) {
+@media only screen and (max-width: 768px) {
   .navbar .navbar-brand {
-      padding-bottom: 0;
+    padding-bottom: 0;
   }
 }
 
 @media only screen
-and (min-width : 768px)
-and (max-width : 1024px) {
+and (min-width: 768px)
+and (max-width: 1024px) {
   .navbar-brand small {
-      display: none;
+    display: none;
   }
+
   .navbar-collapse.collapse {
-      padding-right: 0;
+    padding-right: 0;
   }
 }
 
+/* master branch docs dropdown menu */
+#menu .dropdown-menu li span {
+  padding: 3px 10px 10px 10px;
+  font-size: 13px;
+}
 
+#menu .caret {
+  border-top-color: white;
+  border-bottom-color: white;
+}
 
+#menu .open .caret {
+  border-top-color: #428bca;
+  border-bottom-color: #428bca;
+}
 
-/* docs dropdown menu */
-#docs {
-
+#menu .navbar-brand {
+  margin-right: 50px;
 }
 
+/* gh-pages branch docs dropdown menu */
 #docs .dropdown-menu {
   left: 0;
   right: auto;
 }
 
 #docs .dropdown-menu li span {
-  padding : 3px 10px 10px 10px;
+  padding: 3px 10px 10px 10px;
   font-size: 13px;
-
 }
diff --git a/community.md b/community.md
index 5d92369a912..0d30a082cda 100644
--- a/community.md
+++ b/community.md
@@ -24,9 +24,9 @@ limitations under the License.
 
 Get help using Apache Zeppelin or contribute to the project on our mailing lists:
 
-* [users@zeppelin.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-zeppelin-users/) is for usage questions, help, and announcements. [subscribe](mailto:users-subscribe@zeppelin.apache.org?subject=send this email to subscribe),     [unsubscribe](mailto:users-unsubscribe@zeppelin.apache.org?subject=send this email to unsubscribe), [archives](http://mail-archives.apache.org/mod_mbox/zeppelin-users/)
+* [users@zeppelin.apache.org](http://mail-archives.apache.org/mod_mbox/zeppelin-users/) is for usage questions, help, and announcements. [subscribe](mailto:users-subscribe@zeppelin.apache.org?subject=send this email to subscribe),     [unsubscribe](mailto:users-unsubscribe@zeppelin.apache.org?subject=send this email to unsubscribe), [archives](http://mail-archives.apache.org/mod_mbox/zeppelin-users/)
 * [dev@zeppelin.apache.org](http://mail-archives.apache.org/mod_mbox/zeppelin-dev/) is for people who want to contribute code to Zeppelin. [subscribe](mailto:dev-subscribe@zeppelin.apache.org?subject=send this email to subscribe), [unsubscribe](mailto:dev-unsubscribe@zeppelin.apache.org?subject=send this email to unsubscribe), [archives](http://mail-archives.apache.org/mod_mbox/zeppelin-dev/)
-* [commits@zeppelin.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-zeppelin-commits/) is for commit messages and patches to Zeppelin. [subscribe](mailto:commits-subscribe@zeppelin.apache.org?subject=send this email to subscribe), [unsubscribe](mailto:commits-unsubscribe@zeppelin.apache.org?subject=send this email to unsubscribe), [archives](http://mail-archives.apache.org/mod_mbox/zeppelin-commits/)
+* [commits@zeppelin.apache.org](http://mail-archives.apache.org/mod_mbox/zeppelin-commits/) is for commit messages and patches to Zeppelin. [subscribe](mailto:commits-subscribe@zeppelin.apache.org?subject=send this email to subscribe), [unsubscribe](mailto:commits-unsubscribe@zeppelin.apache.org?subject=send this email to unsubscribe), [archives](http://mail-archives.apache.org/mod_mbox/zeppelin-commits/)
 
 ### Issue tracker
 
diff --git a/download.md b/download.md
index f50b8170407..863a7603460 100644
--- a/download.md
+++ b/download.md
@@ -67,10 +67,10 @@ For developers, to get latest *0.6.0-incubating-SNAPSHOT* check [README](https:/
      [md5](http://archive.apache.org/dist/incubator/zeppelin/0.5.5-incubating/zeppelin-0.5.5-incubating-bin-all.tgz.md5),
      [sha](http://archive.apache.org/dist/incubator/zeppelin/0.5.5-incubating/zeppelin-0.5.5-incubating-bin-all.tgz.sha512))
 
+<p />
 
   - 0.5.0-incubating released on July 23, 2015 ([release notes](./releases/zeppelin-release-0.5.0-incubating.html)) ([git tag](https://git-wip-us.apache.org/repos/asf?p=incubator-zeppelin.git;a=tag;h=refs/tags/v0.5.0))
 
-
     * Source:
     <a style="cursor:pointer" onclick="ga('send', 'event', 'download', 'zeppelin-src', '0.5.0-incubating'); window.location.href='http://archive.apache.org/dist/incubator/zeppelin/0.5.0-incubating/zeppelin-0.5.0-incubating.tgz'">zeppelin-0.5.0-incubating.tgz</a>
     ([pgp](http://archive.apache.org/dist/incubator/zeppelin/0.5.0-incubating/zeppelin-0.5.0-incubating.tgz.asc),
diff --git a/index.md b/index.md
index 8439ed96a79..cad4079f1e4 100644
--- a/index.md
+++ b/index.md
@@ -19,7 +19,7 @@ limitations under the License.
 {% include JB/setup %}
 
 <div class="row">
- <div class="col-md-5">
+ <div class="col-md-6">
 <h2>Multi-purpose Notebook</h2>
 
 <p style="font-size:16px; color:#555555;font-style:italic;margin-bottom: 15px;">
@@ -33,7 +33,7 @@ limitations under the License.
 </ul>
 
  </div>
- <div class="col-md-7"><img class="img-responsive" style="border: 1px solid #ecf0f1;" height="auto" src="assets/themes/zeppelin/img/notebook.png" /></div>
+ <div class="col-md-6"><img class="img-responsive" style="border: 1px solid #ecf0f1;" height="auto" src="assets/themes/zeppelin/img/notebook.png" /></div>
 </div>