diff --git a/build.py b/build.py
index baf1f63e..1645b0ac 100755
--- a/build.py
+++ b/build.py
@@ -464,17 +464,16 @@ for header in fileStruct:
 
 	parent = GetParent(fileStruct, pageNumber)
 
-	# Make the 'Previous' & 'Next' content
+	# Make the 'Previous', 'Up' & 'Next' content
 	nLink = ''
 	pLink = ''
 	uLink = ''
 
-
 	if pageNumber > 0:
-		pLink = '<li><a title="' + fileStruct[pageNumber - 1]['title'] + '" href="/' + fileStruct[pageNumber - 1]['filename'] + '/" class="previous"> &larr; Previous </a></li>'
+		pLink = '<li class="previous"><a title="' + fileStruct[pageNumber - 1]['title'] + '" href="/' + fileStruct[pageNumber - 1]['filename'] + '/" class="previous"> &larr; Previous </a></li>'
 
 	if pageNumber < len(fileStruct) - 1:
-		nLink = '<li><a title="' + fileStruct[pageNumber + 1]['title'] + '" href="/' + fileStruct[pageNumber + 1]['filename'] + '/" class="next"> Next &rarr; </a></li>'
+		nLink = '<li class="next"><a title="' + fileStruct[pageNumber + 1]['title'] + '" href="/' + fileStruct[pageNumber + 1]['filename'] + '/" class="next"> Next &rarr; </a></li>'
 
 	if level > 0:
 		uLink = '<li><a title="' + fileStruct[parent]['title'] + '" href="/' + fileStruct[parent]['filename'] + '/" class="active"> &uarr; Up </a></li>'
@@ -493,11 +492,11 @@ for header in fileStruct:
 	# Chapters, subchapters, sections & subsections can all have content,
 	# but the basic fundamental organizing unit WRT content is still the
 	# chapter.
-	githublink = ''
+	githubedit = ''
 	if level > 0:
 		if 'include' in header:
 			srcFile = open('include/' + header['include'])
-			githublink = '<div style="float:right;"><a title="Edit in GitHub" href="' + githuburl + header['include'] + '"><img src="/images/github.png"></a></div>'
+			githubedit = '<span style="float:right;"><a title="Edit in GitHub" href="' + githuburl + header['include'] + '"><img src="/images/github.png"></a></span>'
 			content = srcFile.read()
 			srcFile.close()
 
@@ -538,7 +537,7 @@ for header in fileStruct:
 	page = page.replace('{{ page.title }}', header['title'])
 	page = page.replace('{% tree %}', sidebar)
 	page = page.replace('{% prevnext %}', prevnext)
-	page = page.replace('{% githublink %}', githublink)
+	page = page.replace('{% githubedit %}', githubedit)
 	page = page.replace('{% breadcrumbs %}', breadcrumbs)
 	page = page.replace('{{ content }}', content + more)
 
@@ -563,6 +562,7 @@ page = page.replace('{{ page.title }}', 'Ardour Table of Contents')
 page = page.replace('{% tree %}', sidebar)
 page = page.replace('{{ content }}', toc)
 page = page.replace('{% prevnext %}', '')
+page = page.replace('{% githubedit %}', '')
 page = page.replace('{% breadcrumbs %}', '')
 
 os.mkdir(siteDir + 'toc', 0o775)
diff --git a/page-template.txt b/page-template.txt
index 50a96b42..6967a973 100644
--- a/page-template.txt
+++ b/page-template.txt
@@ -48,17 +48,17 @@
 	<div class="span12" id="content">
     {% breadcrumbs %}
 		<div id="content-main">
-		<h1 class="title">{{ page.title }}</h1>
-
-{{ content }}
-{% githublink %}
-{% prevnext %}
+			{% githubedit %}
+			<h1 class="title">{{ page.title }}</h1>
 
+			{{ content }}
+			{% prevnext %}
 
 		</div>
 	</div>
 </div></div>
 
+
 <script type="text/javascript">
 // I'll go to hell for this
 var isA = function(regex) { return navigator.userAgent.match(regex) };