diff --git a/src/main/scala/code/snippet/ApiExplorer.scala b/src/main/scala/code/snippet/ApiExplorer.scala
index da9d6221..1a85fa71 100644
--- a/src/main/scala/code/snippet/ApiExplorer.scala
+++ b/src/main/scala/code/snippet/ApiExplorer.scala
@@ -29,6 +29,7 @@ import net.liftweb.json.Serialization.writePretty
 
 import code.lib.ObpAPI.{getResourceDocsJson, allBanks, allAccountsAtOneBank}
 
+import net.liftweb.http.CurrentReq
 
 
 /*
@@ -190,33 +191,41 @@ class ApiExplorer extends Loggable {
       responseBody
     }
 
+
+
+
+
+    val uri = CurrentReq.value.uri
+
+
+
     val banks = allBanks
 
     // TODO dehardcode the redirect path.
 
     def onBankChange (v: Any) = {
       logger.info("bank changed to " + v.toString)
-      S.redirectTo(s"index?bank_id=${v}")
+      S.redirectTo(s"$uri?bank_id=${v}")
     }
 
     def onAccountChange (v: Any) = {
       logger.info("account changed to " + v.toString)
-      S.redirectTo(s"index?bank_id=${presetBankId}&account_id=${v}")
+      S.redirectTo(s"$uri?bank_id=${presetBankId}&account_id=${v}")
     }
 
     def onViewChange (v: Any) = {
       logger.info("view changed to " + v.toString)
-      S.redirectTo(s"index?bank_id=${presetBankId}&account_id=${presetAccountId}&view_id=${v}")
+      S.redirectTo(s"$uri?bank_id=${presetBankId}&account_id=${presetAccountId}&view_id=${v}")
     }
 
     def onCounterpartyChange (v: Any) = {
       logger.info("counterparty changed to " + v.toString)
-      S.redirectTo(s"index?bank_id=${presetBankId}&account_id=${presetAccountId}&view_id=${presetViewId}&counterparty_id=${v}")
+      S.redirectTo(s"$uri?bank_id=${presetBankId}&account_id=${presetAccountId}&view_id=${presetViewId}&counterparty_id=${v}")
     }
 
     def onTransactionChange (v: Any) = {
       logger.info("transaction changed to " + v.toString)
-      S.redirectTo(s"index?bank_id=${presetBankId}&account_id=${presetAccountId}&view_id=${presetViewId}&counterparty_id=${presetCounterpartyId}&transaction_id=${v}")
+      S.redirectTo(s"$uri?bank_id=${presetBankId}&account_id=${presetAccountId}&view_id=${presetViewId}&counterparty_id=${presetCounterpartyId}&transaction_id=${v}")
     }
 
 
diff --git a/src/main/webapp/favicon.ico b/src/main/webapp/favicon.ico
index f8fb81e3..29e667ad 100644
Binary files a/src/main/webapp/favicon.ico and b/src/main/webapp/favicon.ico differ
diff --git a/src/main/webapp/list-accounts.html b/src/main/webapp/list-accounts.html
deleted file mode 100644
index 7cbaed4e..00000000
--- a/src/main/webapp/list-accounts.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--
-Open Bank Project - Transparency / Social Finance Web Application
-Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Email: contact@tesobe.com
-TESOBE / Music Pictures Ltd
-Osloerstrasse 16/17
-Berlin 13359, Germany
-
-  This product includes software developed at
-  TESOBE (http://www.tesobe.com/)
-  by
-  Simon Redfern : simon AT tesobe DOT com
-  Stefan Bethge : stefan AT tesobe DOT com
-  Everett Sochowski : everett AT tesobe DOT com
-  Ayoub Benali: ayoub AT tesobe DOT com
--->
-<div class="lift:surround?with=default;at=content">
-
-	<div class="account_header">Accounts management</div>
-	<!--<a id="add-permission" href="#" class="lift:PermissionManagement.addPermissionLink">Add Permission</a>-->
-	<div class="lift:AccountsOverview.authorisedAccountsWithManageLinks">
-		<table>
-			<tr class="">
-				<th>Account name</th>
-				<th class="manage"></th>
-			</tr>
-			<tr class="accountList">
-				<td><span class="user"><a class="accLink" href="">Account Name</a></span></td>
-				<td><input class="remove" type="button" value="Remove"></td>
-			</tr>
-		</table>
-
-		<script type="text/javascript">
-		  $('.remove').click(function () {
-			$(this).closest('.accountList').css('background-color', '#CC0000').fadeOut(1500, function() {$(this).remove();});
-		  });
-		</script>
-
-	</div>
-</div>
diff --git a/src/main/webapp/templates-hidden/_comment.html b/src/main/webapp/templates-hidden/_comment.html
deleted file mode 100644
index 1f88e3e1..00000000
--- a/src/main/webapp/templates-hidden/_comment.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<li class="comment">
-	<a id="" class="commentLink" href="#"># 123</a>
-    <span class="text">The comment goes here</span>
-    <br/><br/>
-    <span class="commentDate">2012/10/12 13:23</span>
-	<span class="userInfo">Commenter's email address goes here</span>
-</li>      
\ No newline at end of file
diff --git a/src/main/webapp/templates-hidden/_tag.html b/src/main/webapp/templates-hidden/_tag.html
deleted file mode 100644
index a5daa3b4..00000000
--- a/src/main/webapp/templates-hidden/_tag.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<span class="tag">
-	<span class="tagID" id="tagID">
-    	<span class="tagValue">The tag goes here</span>
-    	<span class="deleteTag">x</span>
-	</span>
-</span>      
\ No newline at end of file
diff --git a/src/main/webapp/templates-hidden/_transactionImage.html b/src/main/webapp/templates-hidden/_transactionImage.html
deleted file mode 100644
index f33825df..00000000
--- a/src/main/webapp/templates-hidden/_transactionImage.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="transaction-image">
-	<div class="deleteImage">x</div>
-	<img class="trans-image" src="#"></img>
-	<p class="image-description">A caption for the image</p>
-	<div>
-		<span class="postedBy">Bob</span> <br /> <span class="postedTime">sometime</span>.
-	</div>
-</div>
\ No newline at end of file
diff --git a/src/main/webapp/zz_index.html b/src/main/webapp/zz_index.html
deleted file mode 100755
index e1bd20fe..00000000
--- a/src/main/webapp/zz_index.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-Open Bank Project - Transparency / Social Finance Web Application
-Copyright (C) 2011, 2012, TESOBE / Music Pictures Ltd
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-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 Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see www.gnu.org/licenses/
-
-Email: contact@tesobe.com
-TESOBE / Music Pictures Ltd
-Osloerstrasse 16/17
-Berlin 13359, Germany
-
-  This product includes software developed at
-  TESOBE (http://www.tesobe.com/)
-  by
-  Simon Redfern : simon AT tesobe DOT com
-  Stefan Bethge : stefan AT tesobe DOT com
-  Everett Sochowski : everett AT tesobe DOT com
-  Ayoub Benali: ayoub AT tesobe DOT com
--->
-
-
-
-
-
-<div id="main" class="lift:surround?with=default;at=content">
-	<div id="homeContent">
-    	<div id="about_text">
-			<p>
-				Welcome to The Open Bank Project’s Social Finance application.
-			</p>
-			<br />
-
-            <!--
-			<p>
-				This application allows
-				bank account holders to choose with whom they would like to share their
-				transaction data. For instance, an individual might share their bank
-				account with their accountant; a company with their directors and/or
-				shareholders; an NGO or government department with the public.
-			</p>
-			<br />
-			<p>
-				Account holders can preserve privacy and commercial confidentiality
-				by using aliases to protect the real names.
-			</p>
-			<br />
-			<p>
-				Once connected, account holders can also benefit from other applications
-				that use the Open Bank Project API.
-			</p>
-			<br />
-			<p>
-				See the left panel for examples of organisations raising the bar of
-				financial transparency !
-			</p>
-			<br />
-			<p>
-				We are an <a href="http://github.com/OpenBankProject" title ="Open bank project on Github" >open source project</a> backed by
-				<a href="http://www.tesobe.com" title="TESOBE website">TESOBE</a>. More information is on our <a href="http://www.openbankproject.com/" title="Open Bank Project">home page</a>.
-
-			</p>
-			-->
-
-        </div>
-		<div id="public_accounts">
-			<h2 class="account_header">Public Accounts</h2>
-			<div class="lift:AccountsOverview.publicAccounts">
-				<ul class="accountList">
-					<li class="account"><a class="accLink" href="">Account Name</a>
-					</li>
-				</ul>
-			</div>
-		</div>
-		<div id="authorised_accounts">
-			<h2 class="account_header">Authorised Accounts</h2>
-			<div class="lift:AccountsOverview.authorisedAccounts">
-				<ul class="accountList">
-					<li class="account"><a class="accLink" href="">Account Name</a></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-</div>