diff --git a/public/static/css/menu.css b/public/static/css/menu.css
index 965678c7..8ebd9325 100644
--- a/public/static/css/menu.css
+++ b/public/static/css/menu.css
@@ -141,6 +141,15 @@
     padding-bottom: 0.6em;
 }
 
+#top #cssmenu > ul > li .menu-divider {
+    border-top: 1px solid #943029;
+}
+
+.expand-container > .expand-toggle::after {
+    content: " \f0d7";
+    font-family: FontAwesome;
+}
+
 /* Narrow layout stage 2: hamburger menu, forum/twitter widgets disappear from
 the home page, intro pitch and your-code-here layed out vertically */
 @media only screen and (max-width:54em)
diff --git a/public/static/js/menu.js b/public/static/js/menu.js
index f981c6db..cee3297a 100644
--- a/public/static/js/menu.js
+++ b/public/static/js/menu.js
@@ -14,6 +14,10 @@ if (typeof cssmenu_no_js === 'undefined') {
         if (!isHamburger) {
             open_main_item = container.classList.contains('open') ? container: null;
         }
+
+		if (container.className.indexOf("expand-container")) {
+			return;
+		}
         e.stopPropagation();
         e.preventDefault();
     }
diff --git a/source/webinterface.d b/source/webinterface.d
index ec3854f5..9a1802d0 100644
--- a/source/webinterface.d
+++ b/source/webinterface.d
@@ -166,13 +166,87 @@ class WebInterface
 				toc, title, githubRepo, translations)();
 	}
 
+	private static auto buildDlangToc()
+	{
+		import std.typecons : Flag;
+		alias HasDivider = Flag!"hasDivider";
+		static struct TocSection
+		{
+			string title;
+			string url;
+			HasDivider hasDivider;
+		}
+		struct TocChapter
+		{
+			string title;
+			TocSection[] sections;
+			string url;
+			string chapterId = "not-selected-stub";
+		}
+
+		TocChapter documentation = {
+			title: "Documentation",
+			sections: [
+				TocSection("Language Reference", "https://dlang.org/spec/spec.html"),
+				TocSection("Library Reference", "https://dlang.org/phobos/index.html"),
+				TocSection("Command-line Reference", "https://dlang.org/dmd.html"),
+				TocSection("Feature Overview", "https://dlang.org/comparison.html", HasDivider.yes),
+				TocSection("Articles", "https://dlang.org/articles.html"),
+			]
+		};
+		TocChapter downloads = {
+			title: "Downloads",
+			url: "https://dlang.org/download.html"
+		};
+		TocChapter packages = {
+			title: "Packages",
+			url: "https://code.dlang.org"
+		};
+		TocChapter community = {
+			title: "Community",
+			sections: [
+				TocSection("Blog", "https://dlang.org/blog"),
+				TocSection("Orgs using D", "https://dlang.org/orgs-using-d.html"),
+				TocSection("Twitter", "https://twitter.com/search?q=%23dlang"),
+				TocSection("Forums", "https://forum.dlang.org", HasDivider.yes),
+				TocSection("IRC", "irc://irc.freenode.net/d"),
+				TocSection("Wiki", "https://wiki.dlang.org"),
+				TocSection("GitHub", "https://github.com/dlang", HasDivider.yes),
+				TocSection("Issues", "https://dlang.org/bugstats.php"),
+				TocSection("Foundation", "https://dlang.org/foundation.html", HasDivider.yes),
+				TocSection("Donate", "https://dlang.org/donate.html"),
+			]
+		};
+		TocChapter resources = {
+			title: "Resources",
+			sections: [
+				TocSection("Books", "https://wiki.dlang.org/Books"),
+				TocSection("Tutorials", "https://wiki.dlang.org/Tutorials"),
+				TocSection("Tools", "https://wiki.dlang.org/Development_tools", HasDivider.yes),
+				TocSection("Editors", "https://wiki.dlang.org/Editors"),
+				TocSection("IDEs", "https://wiki.dlang.org/IDEs"),
+				TocSection("VisualD", "http://rainers.github.io/visuald/visuald/StartPage.html"),
+				TocSection("Acknowledgments", "https://dlang.org/acknowledgements.html", HasDivider.yes),
+				TocSection("D Style", "https://dlang.org/dstyle.html"),
+				TocSection("Glossary", "https://dlang.org/glossary.html"),
+				TocSection("Sitemap", "https://dlang.org/sitemap.html"),
+			]
+		};
+		return [
+			documentation,
+			downloads,
+			packages,
+			community,
+			resources,
+		];
+	}
+
 	@path("/editor")
 	void getEditor(HTTPServerRequest req, HTTPServerResponse res)
 	{
 		import std.base64;
 		auto googleAnalyticsId = googleAnalyticsId_;
 		auto title = "Editor";
-		bool toc;
 		auto chapterId = "";
 		auto language = "en";
 		string sourceCode;
@@ -184,6 +258,8 @@ class WebInterface
 			auto sourceCodeRaw = "import std.stdio;\nvoid main(string[] args)\n{\n    writeln(\"Hello D\");\n}";
 			sourceCode = Base64.encode(cast(ubyte[]) sourceCodeRaw);
 		}
+
+		static immutable toc = buildDlangToc();
 		render!("editor.dt", googleAnalyticsId, title, toc, chapterId, language, sourceCode)();
 	}
 }
diff --git a/views/base.dt b/views/base.dt
index 27e83acf..a1b17b63 100644
--- a/views/base.dt
+++ b/views/base.dt
@@ -28,13 +28,27 @@ body(ng-app="DlangTourApp", class="ng-cloak")
 						ul
 							- foreach(ref tocItem; toc)
 								- auto active = chapterId == tocItem.chapterId;
-								li(class=(active ? "expand-container active" : "expand-container"))
-									a.expand-toggle(href="#")
+								- auto chapterUrl = "#";
+								- auto chapterClassName = active ? "expand-container active" : "expand-container";
+								- static if (__traits(compiles, tocItem.url))
+									- if (tocItem.url.length > 0)
+										- chapterUrl = tocItem.url;
+										- chapterClassName = "";
+								li(class=(chapterClassName))
+									a.expand-toggle(href=(chapterUrl))
 										span=tocItem.title
 									ul.expand-content
 										- foreach(ref sec; tocItem.sections)
-											li(class=(active ? "active" : ""))
-												a(href="/tour/#{language}/#{tocItem.chapterId}/#{sec.sectionId}")
+											- auto sectionClassName = active ? "active" : "";
+											- static if (__traits(compiles, sec.hasDivider))
+												- if (sec.hasDivider)
+													- sectionClassName ~= " menu-divider";
+											- static if (__traits(compiles, sec.url))
+												- auto sectionUrl = sec.url;
+											- else
+												- auto sectionUrl = "/tour/#{language}/#{tocItem.chapterId}/#{sec.sectionId}";
+											li(class=(sectionClassName))
+												a(href=(sectionUrl))
 													span=sec.title
 
 					#github_avatar