diff --git a/website/doctype/web_page/templates/generators/web_page.html b/website/doctype/web_page/templates/generators/web_page.html
index e7439fd364..2804683f6b 100644
--- a/website/doctype/web_page/templates/generators/web_page.html
+++ b/website/doctype/web_page/templates/generators/web_page.html
@@ -13,6 +13,15 @@
 		<li class="active">{{ title }}</li>
 	</ul>
 	{%- endif %}
+	{%- endblock %}
+	
+	{% include "lib/website/doctype/website_slideshow/templates/includes/slideshow.html" %}
+	<div class="web-page-content" id="{{ name }}">
+	{{ main_section }}
+	</div>
+	
+	{# toc, parent, child, next sibling #}
+	{% block post_content -%}
 	{% if show_toc and toc_list -%}
 	<div class="well">
 		<h4>Contents</h4>
@@ -23,15 +32,6 @@
 		</ol>
 	</div>
 	{%- endif %}
-	{%- endblock %}
-	
-	{% include "lib/website/doctype/website_slideshow/templates/includes/slideshow.html" %}
-	<div class="web-page-content" id="{{ name }}">
-	{{ main_section }}
-	</div>
-	
-	{# parent, child, next sibling #}
-	{% block post_content -%}
 	{% if links and links.get("parent") -%}
 	<div class="btn-group pull-right" style="margin: 15px 0px;">
 		<a class='btn btn-default' href="{{ links.parent.page_name }}">
diff --git a/website/doctype/website_settings/website_settings.py b/website/doctype/website_settings/website_settings.py
index f847b54705..dd0b549570 100644
--- a/website/doctype/website_settings/website_settings.py
+++ b/website/doctype/website_settings/website_settings.py
@@ -4,11 +4,9 @@
 from __future__ import unicode_literals
 import webnotes
 from webnotes import _, msgprint
+from webnotes.model.controller import DocListController
 
-class DocType:
-	def __init__(self, d, dl):
-		self.doc, self.doclist = d, dl
-		
+class DocType(DocListController):
 	def validate(self):
 		self.validate_top_bar_items()
 		self.validate_footer_items()