diff --git a/_includes/page.html b/_includes/page.html
new file mode 100644
index 00000000..8b7570e9
--- /dev/null
+++ b/_includes/page.html
@@ -0,0 +1,9 @@
+<div class="edit-page-btn">
+	<a href="https://github.com/thelounge/thelounge.github.io/edit/master/{{ page.path }}">
+		Edit this page
+	</a>
+</div>
+
+<h1>{{ page.title }}</h1>
+
+{{ content }}
diff --git a/_layouts/default.html b/_layouts/default.html
index 86b7c04d..3f7c2d3e 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -54,10 +54,10 @@ <h1>Search results</h1>
 		<div id="accessible-search-summary" aria-live="assertive" class="sr-only"></div>
 	</div>
 
-
 	<div id="content">
 		{{ content }}
 	</div>
+
 	<footer id="footer">
 		<div class="container">
 			<div class="row">
diff --git a/_layouts/documentation.html b/_layouts/documentation.html
index a18b9f94..0135fcf8 100644
--- a/_layouts/documentation.html
+++ b/_layouts/documentation.html
@@ -2,17 +2,13 @@
 layout: default
 ---
 
-<div id="docs">
-	<div id="main" class="container">
-		<div class="row">
-			<aside id="sidebar" class="col-sm-3">
-				{% include menu.html %}
-			</aside>
-			<div class="col-sm-9 content">
-				<h1>{{ page.title }}</h1>
-
-				{{ content }}
-			</div>
+<div id="main" class="container">
+	<div class="row">
+		<aside class="col-sm-3">
+			{% include menu.html %}
+		</aside>
+		<div class="col-sm-9">
+			{% include page.html %}
 		</div>
 	</div>
 </div>
diff --git a/_layouts/fullwidth.html b/_layouts/fullwidth.html
new file mode 100644
index 00000000..0cd3aae7
--- /dev/null
+++ b/_layouts/fullwidth.html
@@ -0,0 +1,7 @@
+---
+layout: default
+---
+
+<div id="main" class="container">
+	{% include page.html %}
+</div>
diff --git a/css/style.css b/css/style.css
index 76f72a7d..7b6aa9a9 100644
--- a/css/style.css
+++ b/css/style.css
@@ -50,12 +50,12 @@ body {
 	margin-bottom: 100px;
 }
 a {
-	color: inherit;
+	color: #84ce88;
+	font-weight: bold;
 }
 a:hover,
 a:focus {
-	color: inherit;
-	text-decoration: none;
+	color: #84ce88;
 	outline: 0;
 }
 h2 {
@@ -65,15 +65,6 @@ h2 {
 p {
 	line-height: 1.5;
 }
-li a,
-p a {
-	color: #84ce88;
-	font-weight: bold;
-}
-li a:hover,
-p a:hover {
-	color: #77ca7b;
-}
 li {
 	line-height: 1.5;
 	margin: 6px 0;
@@ -282,19 +273,13 @@ img {
 #features .feature {
 	padding-bottom: 20px;
 }
-#docs {
-	padding-top: 40px;
-}
-#main h1:first-child,
-#main p {
-	margin-top: 0;
-}
 #main h1,
 #main h2,
 #main h3 {
 	margin: 1.3em 0 .5em;
 }
 #main h1 {
+	margin-top: 0;
 	font-size: 2.5em;
 }
 #main h2 {
@@ -304,15 +289,16 @@ img {
 #main h3 {
 	margin-bottom: 13px;
 }
-#menu,
-#main .content {
+#main {
 	margin-bottom: 60px;
 }
 #menu {
+	margin-top: 35px;
 	line-height: 2;
 }
-#menu a,
-#menu strong {
+#menu a {
+	color: inherit;
+	font-weight: normal;
 	display: block;
 }
 #menu a:hover,
@@ -409,6 +395,7 @@ img {
 
 h2 a.link-anchor,
 h3 a.link-anchor {
+	color: inherit;
 	opacity: 0;
 	transition: opacity .2s;
 }
@@ -477,6 +464,14 @@ a.link-anchor {
 	font-weight: bold;
 }
 
+/* "Edit on GitHub" button */
+
+.edit-page-btn {
+	text-align: right;
+	margin-top: 15px;
+	font-size: .9em;
+}
+
 /* Rouge syntax highlighting - Igorpro theme */
 .highlight table td { padding: 5px; }
 .highlight table pre { margin: 0; }