diff --git a/_index.html b/_index.html
deleted file mode 100644
index ebff57f..0000000
--- a/_index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-    <head>
-        <title>My wonderful page</title>
-        <script src="jdataview.js"></script>
-        <script src="jsspeccy-core.min.js"></script>
-        <script src="jquery-1.7.2.min.js"></script>
-
-        <script>
-            $(function() {
-                var jsspeccy = JSSpeccy('speccy', {
-                    'autostart': false,
-                    'autoload': true,
-                    'scaleFactor': 2,
-                    'loadFile': 'scroller1.tap'
-                });
-            });
-        </script>
-    </head>
-    <body>
-        <div id="speccy"></div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/index.html b/scroller1.html
similarity index 82%
rename from index.html
rename to scroller1.html
index c6c2b02..8d2e61c 100644
--- a/index.html
+++ b/scroller1.html
@@ -69,15 +69,6 @@
 					container: 'jsspeccy',
 					controller: jsspeccy
 				});
-				$('#example-games').change(function() {
-					var filename = $(this).val();
-					if (filename) {
-						jsspeccy.loadFromUrl(
-							'http://jsspeccy.zxdemo.org/games/' + filename,
-							{'autoload': true}
-						);
-					}
-				})
 			});
 		</script>
 	</head>
@@ -88,7 +79,6 @@
 				<li><button class="stop-start" title="Stop / start">stop / start</button></li>
 				<li><button class="reset" title="Reset the Spectrum">reset</button></li>
 				<li><button class="audio" title="Audio on/off">audio on/off</button></li>
-				<li><button class="open" title="Open file">open file</button></li>
 				<li><button class="about" title="About JSSpeccy">about</button></li>
 				<li>
 					<div>
@@ -100,22 +90,6 @@
 				</li>
 			</ul>
 
-			<div class="panel open-file">
-				<button class="close">close</button>
-
-				<h2>Load from disk: <span class="note">.tap, .tzx, .sna, .z80 files supported</span></h2><input type="file">
-
-				<h2>Load from web:</h2><input type="url"><button class="open-url">Open URL</button>
-
-				<h2>Search World Of Spectrum:</h2>
-				<form class="search-wos">
-					<input type="search">
-					<input type="submit" value="Search title">
-				</form>
-				<select style="width: 250px" size="8" class="wos-matches"></select>
-				<select style="width: 250px" size="8" class="wos-downloads"></select>
-				<button class="open-from-wos">Open file</button>
-			</div>
 			<div class="panel about">
 				<button class="close">close</button>
 
diff --git a/scroller2.html b/scroller2.html
new file mode 100644
index 0000000..e04e642
--- /dev/null
+++ b/scroller2.html
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML>
+<html>
+	<head>
+		<title>jsspeccy</title>
+		<link rel="stylesheet" href="jsspeccy.css">
+		<script src="js/jdataview.js"></script>
+		<script src="js/jsspeccy-core.min.js"></script>
+		
+		<script src="js/jquery-1.7.2.min.js"></script>
+		<script src="js/ui.js"></script>
+
+		<style>
+			body {
+				margin: 0;
+				padding: 0;
+				font-family: Helvetica, Arial, sans-serif;
+				background-color: #222;
+				color: #ddd;
+			}
+			h1, h2 {
+				padding: 0; margin: 0;
+			}
+			a:link {
+				color: #77f;
+			}
+			a:visited {
+				color: #97f;
+			}
+			a:hover, a:active {
+				color: #99f;
+			}
+			#jsspeccy {
+				margin: 10px;
+				padding-right: 10px;
+				float: left;
+			}
+
+			.commentary {
+				float: left;
+				width: 350px;
+				padding-top: 10px;
+			}
+			.commentary h1 {
+				background-image: url('images/spectrum48k.png');
+				line-height: 100px;
+				padding-left: 138px;
+				background-repeat: no-repeat;
+			}
+			.commentary .version {
+				font-size: 0.4em;
+			}
+			.commentary h2 {
+				font-size: 12pt;
+			}
+			.commentary small {
+				font-size: 0.8em;
+				color: #ccc;
+			}
+		</style>
+		<script>
+			$(function() {
+				var jsspeccy = JSSpeccy('jsspeccy-viewport', {
+                    'autostart': true,
+                    'autoload': true,
+                    'loadFile': 'scroller2.tap'
+                });
+                
+				JSSpeccy.UI({
+					container: 'jsspeccy',
+					controller: jsspeccy
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<div id="jsspeccy">
+			<div id="jsspeccy-viewport"></div>
+			<ul class="toolbar">
+				<li><button class="stop-start" title="Stop / start">stop / start</button></li>
+				<li><button class="reset" title="Reset the Spectrum">reset</button></li>
+				<li><button class="audio" title="Audio on/off">audio on/off</button></li>
+				<li><button class="about" title="About JSSpeccy">about</button></li>
+				<li>
+					<div>
+						<select class="select-model"></select>
+					</div>
+					<div>
+						<label><input type="checkbox" class="autoload-tapes" checked="checked"> Autoload tapes</label>
+					</div>
+				</li>
+			</ul>
+
+			<div class="panel about">
+				<button class="close">close</button>
+
+				<h1>JSSpeccy</h1>
+				<h2>a ZX Spectrum emulator in Javascript</h2>
+				<p>By <a href="http://matt.west.co.tt/">Matt Westcott</a></p>
+
+				<p>Sound routines by Darren Coles</p>
+
+				<p><a href="http://matt.west.co.tt/category/javascript/jsspeccy/">JSSpeccy homepage</a> (including downloads and source code)</p>
+				<p>Based on <a href="http://fuse-emulator.sourceforge.net/">Fuse</a> by Philip Kendall et al. Icons from <a href="http://www.icon-king.com/projects/nuvola/">Nuvola</a> by David Vignoni.</p>
+				<div class="licence">
+					<p>This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</p><p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.</p><p>You should have received a copy of the GNU General Public License along with this program.  If not, see &lt;<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.</p>
+				</div>
+			</div>
+		</div>
+		<div class="commentary">
+			<h1>JSSpeccy <span class="version">v2.2.1</span></h1>
+			<h2>A ZX Spectrum emulator in Javascript</h2>
+			<p>This is a (mostly) accurate recreation of the 48K and 128K Spectrums. Features currently unsupported are:</p>
+			<ul>
+				<li>Custom tape loaders</li>
+				<li>Some particularly complex multicolour tricks</li>
+			</ul>
+			<p>Tested on Chrome 32, Firefox 26 and Safari 7.0.1.</p>
+			<small>
+				<p>Grab the <a href="https://github.com/gasman/jsspeccy2">source code on Github</a>. Want to include JSSpeccy on your website? <a href="https://github.com/gasman/jsspeccy2/blob/master/Embedding.txt">Embedding instructions</a></p>
+				<p>Created by <a href="http://matt.west.co.tt/">Matt Westcott</a>. <a href="https://twitter.com/gasmanic">Follow me on Twitter</a></p>
+				<p><a href="http://en.wikipedia.org/wiki/File:ZXSpectrum48k.jpg">Spectrum photo</a> by Bill Bertram</p>
+			</small>
+		</div>
+	</body>
+</html>
diff --git a/zx-brainfuck.html b/zx-brainfuck.html
new file mode 100644
index 0000000..8f8bf74
--- /dev/null
+++ b/zx-brainfuck.html
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML>
+<html>
+	<head>
+		<title>jsspeccy</title>
+		<link rel="stylesheet" href="jsspeccy.css">
+		<script src="js/jdataview.js"></script>
+		<script src="js/jsspeccy-core.min.js"></script>
+		
+		<script src="js/jquery-1.7.2.min.js"></script>
+		<script src="js/ui.js"></script>
+
+		<style>
+			body {
+				margin: 0;
+				padding: 0;
+				font-family: Helvetica, Arial, sans-serif;
+				background-color: #222;
+				color: #ddd;
+			}
+			h1, h2 {
+				padding: 0; margin: 0;
+			}
+			a:link {
+				color: #77f;
+			}
+			a:visited {
+				color: #97f;
+			}
+			a:hover, a:active {
+				color: #99f;
+			}
+			#jsspeccy {
+				margin: 10px;
+				padding-right: 10px;
+				float: left;
+			}
+
+			.commentary {
+				float: left;
+				width: 350px;
+				padding-top: 10px;
+			}
+			.commentary h1 {
+				background-image: url('images/spectrum48k.png');
+				line-height: 100px;
+				padding-left: 138px;
+				background-repeat: no-repeat;
+			}
+			.commentary .version {
+				font-size: 0.4em;
+			}
+			.commentary h2 {
+				font-size: 12pt;
+			}
+			.commentary small {
+				font-size: 0.8em;
+				color: #ccc;
+			}
+		</style>
+		<script>
+			$(function() {
+				var jsspeccy = JSSpeccy('jsspeccy-viewport', {
+                    'autostart': true,
+                    'autoload': true,
+                    'loadFile': 'zx-brainfuck.tap'
+                });
+                
+				JSSpeccy.UI({
+					container: 'jsspeccy',
+					controller: jsspeccy
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<div id="jsspeccy">
+			<div id="jsspeccy-viewport"></div>
+			<ul class="toolbar">
+				<li><button class="stop-start" title="Stop / start">stop / start</button></li>
+				<li><button class="reset" title="Reset the Spectrum">reset</button></li>
+				<li><button class="audio" title="Audio on/off">audio on/off</button></li>
+				<li><button class="about" title="About JSSpeccy">about</button></li>
+				<li>
+					<div>
+						<select class="select-model"></select>
+					</div>
+					<div>
+						<label><input type="checkbox" class="autoload-tapes" checked="checked"> Autoload tapes</label>
+					</div>
+				</li>
+			</ul>
+
+			<div class="panel about">
+				<button class="close">close</button>
+
+				<h1>JSSpeccy</h1>
+				<h2>a ZX Spectrum emulator in Javascript</h2>
+				<p>By <a href="http://matt.west.co.tt/">Matt Westcott</a></p>
+
+				<p>Sound routines by Darren Coles</p>
+
+				<p><a href="http://matt.west.co.tt/category/javascript/jsspeccy/">JSSpeccy homepage</a> (including downloads and source code)</p>
+				<p>Based on <a href="http://fuse-emulator.sourceforge.net/">Fuse</a> by Philip Kendall et al. Icons from <a href="http://www.icon-king.com/projects/nuvola/">Nuvola</a> by David Vignoni.</p>
+				<div class="licence">
+					<p>This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</p><p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.</p><p>You should have received a copy of the GNU General Public License along with this program.  If not, see &lt;<a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.</p>
+				</div>
+			</div>
+		</div>
+		<div class="commentary">
+			<h1>JSSpeccy <span class="version">v2.2.1</span></h1>
+			<h2>A ZX Spectrum emulator in Javascript</h2>
+			<p>This is a (mostly) accurate recreation of the 48K and 128K Spectrums. Features currently unsupported are:</p>
+			<ul>
+				<li>Custom tape loaders</li>
+				<li>Some particularly complex multicolour tricks</li>
+			</ul>
+			<p>Tested on Chrome 32, Firefox 26 and Safari 7.0.1.</p>
+			<small>
+				<p>Grab the <a href="https://github.com/gasman/jsspeccy2">source code on Github</a>. Want to include JSSpeccy on your website? <a href="https://github.com/gasman/jsspeccy2/blob/master/Embedding.txt">Embedding instructions</a></p>
+				<p>Created by <a href="http://matt.west.co.tt/">Matt Westcott</a>. <a href="https://twitter.com/gasmanic">Follow me on Twitter</a></p>
+				<p><a href="http://en.wikipedia.org/wiki/File:ZXSpectrum48k.jpg">Spectrum photo</a> by Bill Bertram</p>
+			</small>
+		</div>
+	</body>
+</html>
