diff --git a/tempjpwNow/IndivLendHome.html b/tempjpwNow/IndivLendHome.html
index b5c8d2232..1d52e796f 100644
--- a/tempjpwNow/IndivLendHome.html
+++ b/tempjpwNow/IndivLendHome.html
@@ -1411,52 +1411,7 @@
 </style>
 
 <div id="logonDiv"></div>
-<div id="container">
-	<div id="logowrapper">
-		<span style="float: left">
-			<img style="float:left; border: 0;" alt="" src="resources/mifos.jpg"/>
-		</span>
-	</div>
-	<div id="navwrapper">
-	<ul id="nav" class="floatleft">
-		<li><a href="unknown.html" onclick="showILClientListing();return false;">Clients</a></li>
-		<li><a href="unknown.html" onclick="showILUserAdmin();return false;">User Administration</a></li>
-		<li><a href="unknown.html" onclick="showILOrgAdmin();return false;">Organisation Administration</a></li>
-		<li><a href="unknown.html" onclick="showILReporting();return false;">Reports</a></li>
-	</ul>
-	<ul id="nav" class="floatright">
-		<li class="dmenu"><a href="#">Theme</a>
-			<ul>
-				<li><a href="?theme=default">smoothness</a></li>
-				<li><a href="?theme=ui-lightness">lightness</a></li>
-				<li><a href="?theme=redmond">redmond</a></li>
-			</ul>
-		</li>
-		<li class="dmenu"><a href="#">Culture</a>
-			<ul>
-				<li><a href="?lang=en">en</a></li>
-				<li><a href="?lang=fr">fr</a></li>
-				<li><a href="?lang=es">es</a></li>
-				<li><a href="?lang=pt">pt</a></li>
-				<li><a href="?lang=zh">zh</a></li>
-			</ul>
-		</li>
-		<li><a href="org/admin/settings" class="dmenu">mifos</a>
-			<ul>
-				<li><a href="org/admin/settings">Account Settings</a></li>
-			</ul>
-		</li>
-		<li><a href="signout">Sign out</a></li>
-	</ul>
-
-	<br class="clear">
-	</div><div style="float:none; clear:both;">
-		<div id="spacer" style="line-height: 15px;">&nbsp;</div>
-		<div id="content"></div>
-	</div>
-</div>
-
-
+<div id="container"></div>
 
 
 <script type="text/javascript" src="resources/jsrenderExtra.js"></script>
@@ -1464,11 +1419,6 @@
 <script>
 $(document).ready(function() {
 
-	//baseApiUrl = "https://localhost:8443/mifosng-provider/api/v1/";
-	baseApiUrl = "https://ec2-46-137-62-163.eu-west-1.compute.amazonaws.com:8443/mifosng-provider/api/v1/";
-	if (QueryParameters["baseApiUrl"]) baseApiUrl = QueryParameters["baseApiUrl"];
-
-
     	// default to 'en' culture - no need to import extra javascript files for globalize.js or datapicker
     	Globalize.culture('en');
     	
@@ -1485,6 +1435,13 @@ $(document).ready(function() {
 		});
 	
 	jsViewsRegisterHelpers();
+
+
+	showMainContainer("container");
+
+	//baseApiUrl = "https://localhost:8443/mifosng-provider/api/v1/";
+	baseApiUrl = "https://ec2-46-137-62-163.eu-west-1.compute.amazonaws.com:8443/mifosng-provider/api/v1/";
+	if (QueryParameters["baseApiUrl"]) baseApiUrl = QueryParameters["baseApiUrl"];
 	
 	showILLogon("logonDiv");
 });
diff --git a/tempjpwNow/resources/jsrenderExtra.js b/tempjpwNow/resources/jsrenderExtra.js
index 18e55bb9a..6965ed861 100644
--- a/tempjpwNow/resources/jsrenderExtra.js
+++ b/tempjpwNow/resources/jsrenderExtra.js
@@ -1,7 +1,6 @@
 QueryParameters = (function()
 {
     var result = {};
-
     if (window.location.search)
     {
         // split up the query string and store in an associative array
@@ -12,7 +11,6 @@ QueryParameters = (function()
             result[tmp[0]] = unescape(tmp[1]);
         }
     }
-
     return result;
 }());
 
@@ -62,6 +60,57 @@ function doI18N(xlateStr, params) {
 }
 
 
+
+// load html functions
+function showMainContainer(containerDivName) {
+
+	var htmlVar = '<div id="logowrapper">';
+	htmlVar += '	<span style="float: left">';
+	htmlVar += '		<img style="float:left; border: 0;" alt="" src="resources/mifos.jpg"/>';
+	htmlVar += '	</span>';
+	htmlVar += '</div>';
+	htmlVar += '<div id="navwrapper">';
+	htmlVar += '<ul id="nav" class="floatleft">';
+	htmlVar += '	<li><a href="unknown.html" onclick="showILClientListing();return false;">' + doI18N("link.topnav.clients") + '</a></li>';
+	htmlVar += '	<li><a href="unknown.html" onclick="showILUserAdmin();return false;">' + doI18N("link.topnav.users") + '</a></li>';
+	htmlVar += '	<li><a href="unknown.html" onclick="showILOrgAdmin();return false;">' + doI18N("link.topnav.organisation") + '</a></li>';
+	htmlVar += '	<li><a href="unknown.html" onclick="showILReporting();return false;">' + doI18N("link.reports") + '</a></li>';
+	htmlVar += '</ul>';
+	htmlVar += '<ul id="nav" class="floatright">';
+	htmlVar += '	<li class="dmenu"><a href="#">' + doI18N("link.topnav.theme") + '</a>';
+	htmlVar += '		<ul>';
+	htmlVar += '			<li><a href="?theme=default">smoothness</a></li>';
+	htmlVar += '			<li><a href="?theme=ui-lightness">lightness</a></li>';
+	htmlVar += '			<li><a href="?theme=redmond">redmond</a></li>';
+	htmlVar += '		</ul>';
+	htmlVar += '	</li>';
+	htmlVar += '	<li class="dmenu"><a href="#">' + doI18N("link.topnav.culture") + '</a>';
+	htmlVar += '		<ul>';
+	htmlVar += '			<li><a href="?lang=en">en</a></li>';
+	htmlVar += '			<li><a href="?lang=fr">fr</a></li>';
+	htmlVar += '			<li><a href="?lang=es">es</a></li>';
+	htmlVar += '			<li><a href="?lang=pt">pt</a></li>';
+	htmlVar += '			<li><a href="?lang=zh">zh</a></li>';
+	htmlVar += '		</ul>';
+	htmlVar += '	</li>';
+	htmlVar += '	<li><a href="org/admin/settings" class="dmenu">xxxxxxxxmifos</a>';
+	htmlVar += '		<ul>';
+	htmlVar += '			<li><a href="org/admin/settings">' + doI18N("link.topnav.account.settings") + '</a></li>';
+	htmlVar += '		</ul>';
+	htmlVar += '	</li>';
+	htmlVar += '	<li><a href="signout">' + doI18N("link.signout") + '</a></li>';
+	htmlVar += '</ul>';
+	htmlVar += '<br class="clear">';
+	htmlVar += '</div><div style="float:none; clear:both;">';
+	htmlVar += '	<div id="spacer" style="line-height: 15px;">&nbsp;</div>';
+	htmlVar += '	<div id="content"></div>';
+	htmlVar += '</div>';
+
+	$("#" + containerDivName).html(htmlVar);
+}
+
+
+
 function showILLogon(logonDivName) {
 
 	var htmlVar = '<form name = "logonform"><table><tr><td>User Name:</td><td><input type="text" name="username"></td></tr>';