diff --git a/Makefile b/Makefile
index fa7c87d..c80cec3 100644
--- a/Makefile
+++ b/Makefile
@@ -6,4 +6,4 @@ clean:
 	rm -r output/en-GB/*
 
 serve:
-	cd output && python -m SimpleHTTPServer
+	./serve.py en-GB
diff --git a/generate-html.py b/generate-html.py
index 6ae4ff4..976abfd 100755
--- a/generate-html.py
+++ b/generate-html.py
@@ -46,12 +46,22 @@ select_overlays = []
 
 overlays_html = ''
 
-try:
-	os.mkdir('output')
-	os.mkdir('output/{}'.format(lang))
-	os.mkdir('output/{}/pinout'.format(lang))
-except OSError:
-	exit("Failed to create required directories!")
+
+if not os.path.isdir('output'):
+	try:
+		os.mkdir('output')
+	except OSError:
+		exit('Failed to create output dir')
+if not os.path.isdir('output/{}'.format(lang)):
+	try:
+		os.mkdir('output/{}'.format(lang))
+	except OSError:
+		exit('Failed to create output/{} dir'.format(lang))
+if not os.path.isdir('output/{}/pinout'.format(lang)):
+	try:
+		os.mkdir('output/{}/pinout'.format(lang))
+	except OSError:
+		exit('Failed to create output/{}/pinout dir'.format(lang))
 
 def cssify(value):
 	value = slugify(value);
diff --git a/src/en-GB/template/layout.html b/src/en-GB/template/layout.html
index 16fc209..b930020 100644
--- a/src/en-GB/template/layout.html
+++ b/src/en-GB/template/layout.html
@@ -53,6 +53,7 @@
 		<script type="text/javascript" src="http://cdn.jsdelivr.net/prettify/0.1/prettify.js"></script>
     	<script src='{{resource_url}}prettify/lang-ruby.js'></script>
     	<script src='{{resource_url}}prettify/lang-bash.js'></script>
+	<script src='{{resource_url}}gaat.js'></script>
 		<script src='{{resource_url}}pinout.js?v={{v}}'></script>
 </body>
 </html>