diff --git a/Repositories/otago_eprints/otago_eprints/cfg/static/en/index.xpage b/Repositories/otago_eprints/otago_eprints/cfg/static/en/index.xpage
index f4d0e4a..b8598d4 100755
--- a/Repositories/otago_eprints/otago_eprints/cfg/static/en/index.xpage
+++ b/Repositories/otago_eprints/otago_eprints/cfg/static/en/index.xpage
@@ -20,7 +20,7 @@
 				
 				<td width="70%" class="frontsectiontext">
 					<p></p>
-					<form method="get" accept-charset="utf-8" action="http://ou075110.otago.ac.nz:8008/perl/search">
+					<form method="get" accept-charset="utf-8" action="&base_url;/perl/search">
 						<table class="frontsearch" cellspacing="0" cellpadding="4">
 							<tr>
 								<td align="right">Items:</td>
@@ -32,7 +32,7 @@
 							</tr>
 							<tr>
 								<td> </td>
-								<td><a href="http://ou075110.otago.ac.nz:8008/perl/search">More options</a> | <a href="http://ou075110.otago.ac.nz:8008/perl/advsearch">Advanced search</a></td>
+								<td><a href="&base_url;/perl/search">More options</a> | <a href="&base_url;/perl/advsearch">Advanced search</a></td>
 								<td align="right"><input class="actionbutton" value="Search" type="submit" name="_action_search" /></td>
 							</tr>
 						</table>
@@ -45,16 +45,16 @@
 	
 			<tr>
 				<td class="frontsectionlabel">
-					<h3 class="noborder"><a href="http://ou075110.otago.ac.nz:8008/view/">Browse</a></h3>
+					<h3 class="noborder"><a href="&base_url;/view/">Browse</a></h3>
 				</td>
 				<td class="frontsectiontext">
-					<p>By <a href="http://ou075110.otago.ac.nz:8008/view/subjects/">subject</a>, <a href="http://ou075110.otago.ac.nz:8008/view/year/">year</a>, <a href="http://ou075110.otago.ac.nz:8008/view/type/">publication type</a> or <a href="http://ou075110.otago.ac.nz:8008/view/affiliations/">organisational unit within the University</a>.</p>
+					<p>By <a href="&base_url;/view/subjects/">subject</a>, <a href="&base_url;/view/year/">year</a>, <a href="&base_url;/view/type/">publication type</a> or <a href="&base_url;/view/affiliations/">organisational unit within the University</a>.</p>
 				</td>
 			</tr>
 	
 			<tr>
 				<td class="frontsectionlabel">
-					<h3 class="noborder"><a href="http://ou075110.otago.ac.nz:8008/perl/latest_local">Latest Additions</a></h3>
+					<h3 class="noborder"><a href="&base_url;/perl/latest_local">Latest Additions</a></h3>
 				</td>
 			
 				<td class="frontsectiontext">
@@ -64,19 +64,19 @@
 	
 			<tr>
 				<td class="frontsectionlabel">
-					<h3 class="noborder"><a href="http://ou075110.otago.ac.nz:8008/perl/users/home_local">Registered Users Area</a></h3>
+					<h3 class="noborder"><a href="&base_url;/perl/users/home_local">Registered Users Area</a></h3>
 				</td>
 			
 				<td class="frontsectiontext">
 					<p>Only registered users may submit items to the repository. Web registration is currently disabled until we work out policy issues.</p>
 					
-					<p><a href="http://ou075110.otago.ac.nz:8008/perl/set_password">Forgotten your password?</a></p>
+					<p><a href="&base_url;/perl/set_password">Forgotten your password?</a></p>
 				</td>
 			</tr>
 	
 			<tr>
 				<td class="frontsectionlabel">
-					<h3 class="noborder"><a href="http://ou075110.otago.ac.nz:8008/es">Repository Usage Statistics</a></h3>
+					<h3 class="noborder"><a href="&base_url;/es">Repository Usage Statistics</a></h3>
 				</td>
 				
 				<td class="frontsectiontext">
@@ -85,7 +85,7 @@
 			</tr>
 
 			<tr>
-				<td class="frontsectiontext" align="center"><a href="http://www.eprints.org/"><img src="http://ou075110.otago.ac.nz:8008/images/eprintslogo.gif" width="154" height="57" border="0" alt="EPrints.org" /></a></td>
+				<td class="frontsectiontext" align="center"><a href="http://www.eprints.org/"><img src="&base_url;/images/eprintslogo.gif" width="154" height="57" border="0" alt="EPrints.org" /></a></td>
 				<td class="frontsectiontext">
 				
 					<p>University of Otago School of Business Pilot Repository is running on <em>GNU EPrints</em> repository-creating software, which generates eprints repositories that are compliant with the <a href="http://www.openarchives.org">Open Archives Protocol for Metadata Harvesting OAI 1.1 and 2.0</a>.</p>