diff --git a/frappe/docs/current/api/utils/frappe.utils.html b/frappe/docs/current/api/utils/frappe.utils.html
index 2104d63a5d..38cf1185a1 100644
--- a/frappe/docs/current/api/utils/frappe.utils.html
+++ b/frappe/docs/current/api/utils/frappe.utils.html
@@ -300,7 +300,7 @@
 		frappe.utils.<b>get_formatted_email</b>
         <i class="text-muted">(user)</i>
     </p>
-	<div class="docs-attr-desc"><p>get email id of user formatted as: John Doe <a href="&#x6d;&#x61;i&#x6c;&#x74;&#x6f;&#58;&#x6a;&#x6f;h&#x6e;&#x64;&#111;&#101;&#x40;&#101;&#120;a&#x6d;p&#x6c;&#x65;&#x2e;c&#111;&#x6d;">&#x6a;&#x6f;h&#x6e;&#x64;&#111;&#101;&#x40;&#101;&#120;a&#x6d;p&#x6c;&#x65;&#x2e;c&#111;&#x6d;</a></p>
+	<div class="docs-attr-desc"><p>get email id of user formatted as: John Doe <a href="&#x6d;&#97;&#105;&#108;&#x74;&#111;&#x3a;&#x6a;&#111;&#x68;&#x6e;&#100;&#111;&#x65;&#64;&#x65;&#120;&#97;&#109;&#x70;&#x6c;&#101;&#46;&#x63;&#111;&#109;">&#x6a;&#111;&#x68;&#x6e;&#100;&#111;&#x65;&#64;&#x65;&#120;&#97;&#109;&#x70;&#x6c;&#101;&#46;&#x63;&#111;&#109;</a></p>
 </div>
 	<br>
 
diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css
index fc3943867d..98df9db47a 100644
--- a/frappe/public/css/docs.css
+++ b/frappe/public/css/docs.css
@@ -273,6 +273,39 @@ body {
 .splash .section {
   padding: 30px 0 0 0;
 }
+.page-container {
+  padding-top: 128px;
+  margin: 0 auto;
+  width: 870px;
+}
+.page-container .page-content {
+  width: 83%;
+  margin: 0 auto;
+}
+.page-container .webpage-content ol > li,
+.page-container .webpage-content ul > li {
+  margin: 26px auto;
+}
+.page-container .webpage-content ol > li li,
+.page-container .webpage-content ul > li li {
+  margin: 13px auto;
+}
+.page-container .webpage-content ol li ol {
+  list-style-type: disc;
+}
+.page-container .webpage-content ul,
+.page-container .webpage-content ol {
+  margin-bottom: 6px;
+}
+#page-index {
+  padding-top: 0;
+  width: 100%;
+  margin: 0;
+}
+#page-index .page-content {
+  width: 100%;
+  margin: 0;
+}
 code {
   color: #ff0000;
 }
diff --git a/frappe/public/less/docs.less b/frappe/public/less/docs.less
index e9a2c37e54..d79e751ebf 100644
--- a/frappe/public/less/docs.less
+++ b/frappe/public/less/docs.less
@@ -42,16 +42,54 @@ body {
     line-height: 1.4em;
    }
  }
- 
  .section{
    padding: 30px 0 0 0;
  }
 }
 
 
-  code{
-  color: #ff0000;
+.page-container{
+  padding-top:128px;
+  margin:0 auto;
+  width:870px;
+  
+  .page-content {
+   width:83%;
+   margin:0 auto;
+  }
+ 
+  .webpage-content{
+    ol > li, ul > li {
+     margin: 26px auto; 
+    }
+
+    ol > li li, ul > li li {
+     margin: 13px auto;
+    }
+
+    ol li ol {
+     list-style-type: disc;
+    }
+    ul, ol {
+     margin-bottom:26px;
+    }
+  }
+}
+
+#page-index {
+ padding-top:0;
+ width:100%;
+ margin:0;
+ 
+ .page-content {
+  width:100%;
+  margin:0;
  }
+}
+
+code{
+  color: #ff0000;
+}
 
 .navbar {
 	//background-color: @navbar-bg !important;
diff --git a/frappe/templates/autodoc/base_template.html b/frappe/templates/autodoc/base_template.html
index 777a7ba4f7..661a4ff32c 100644
--- a/frappe/templates/autodoc/base_template.html
+++ b/frappe/templates/autodoc/base_template.html
@@ -60,7 +60,7 @@
                     {%- endblock -%}
                     <div class="hero-and-content">
                         {% block content %}
-                            {{ content }}
+                               {{ content }}
                             <!-- edit-link -->
                             </div>
                         {% endblock %}