diff --git a/Screens/f155_theme_101.sql b/Screens/f155_theme_101.sql
index 8771668..4ffc6ea 100644
--- a/Screens/f155_theme_101.sql
+++ b/Screens/f155_theme_101.sql
@@ -180,15 +180,15 @@ c1:=c1||'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"'||chr(10
 '<body #ONLOAD#>#FORM_OPEN#'||chr(10)||
 '<div id="rowHd">'||chr(10)||
 '<div id="logo" class="hskpcol1">'||chr(10)||
-'<a href="http://www.nation';
+'<a href="http:/';
 
-c1:=c1||'algrid.com/"><img src="#IMAGE_PREFIX#ng_logo_group_medium.gif" alt="National Grid Metering" width="200" height="43"/></a>'||chr(10)||
+c1:=c1||'/www.nationalgrid.com/"><img src="#IMAGE_PREFIX#ng_logo_group_medium.gif" alt="National Grid Metering" width="200" height="43"/></a>'||chr(10)||
 '</div>'||chr(10)||
 '<div id="navHousekeep" class="hskpcol2">'||chr(10)||
 '<div class="margin5">'||chr(10)||
-'<a href="holdingpagefortheICOQsystem" class="hskpnav" title="Return to the Metering Online Quotations Home Page" accesskey="1">Home</a>&nbsp;|&nbsp;<a href="&LOGOUT_URL." class="hskpnav" title="Log out of the';
+'<a href="holdingpagefortheICOQsystem" class="hskpnav" title="Return to the Metering Online Quotations Home Page" accesskey="1">Home</a>&nbsp;|&nbsp;<a href="&LOGOUT_URL." class="hskpnav" title=';
 
-c1:=c1||' system" accesskey="2">Logout</a>&nbsp;|&nbsp;<!--a href="/group/help" class="hskpnav">Help</a>&nbsp;|&nbsp;--><span>You are logged in as:&APP_USER.</span>'||chr(10)||
+c1:=c1||'"Log out of the system" accesskey="2">Logout</a>&nbsp;|&nbsp;<!--a href="/group/help" class="hskpnav">Help</a>&nbsp;|&nbsp;--><span>You are logged in as:&APP_USER.</span>'||chr(10)||
 '</div>'||chr(10)||
 '</div>'||chr(10)||
 '</div>'||chr(10)||
@@ -203,15 +203,15 @@ c2:=c2||'<div id="rowFooter"><!-- bottom strip of info -->'||chr(10)||
 ''||chr(10)||
 '	'||chr(10)||
 '	<div class="hskpcol1"><!-- copyright box -->'||chr(10)||
-'		<div id="copyright">Copyright &copy; <!--2006--><span id="Pagefooter_lblYear">2007</span> National Grid</div>'||chr(10)||
+'		<div id="copyright">Copyright &copy; <!--2006--><span id="Pagefooter_lblYear">2008</span> National Grid</div>'||chr(10)||
 '	</div>'||chr(10)||
 '	'||chr(10)||
 '	<div class="hskpcol2">'||chr(10)||
 '		<div id="navFooter">'||chr(10)||
 '                        <a href="thehelp.htm">Help</a> | '||chr(10)||
-'			<a href="t';
+'';
 
-c2:=c2||'hetermsandconditions.htm">Terms &amp; conditions</a>'||chr(10)||
+c2:=c2||'			<a href="&T_AND_C_URL." target="blank">Terms &amp; conditions</a>'||chr(10)||
 ''||chr(10)||
 '			| <a href="theprivacypolicy.htm">Privacy policy</a>'||chr(10)||
 '                        | <span style="color:#0067c6; text-decoration:none" id="app_version">#APP_VERSION#</span>'||chr(10)||
@@ -240,9 +240,9 @@ c3:=c3||'<div id="UKSubNav" class="reg">'||chr(10)||
 '#REGION_POSITION_04#'||chr(10)||
 '</div>'||chr(10)||
 '<div id="colRight">'||chr(10)||
-'<h1 class="podTitle"><img src="#WORKSPACE_IMAGES#exclaim.gif" alt="" width="23" height="23"/>Important Messages</';
+'<h1 class="podTitle"><img src="#WORKSPACE_IMAGES#exclaim.gif" alt="" width="23" height="23"/>Impo';
 
-c3:=c3||'h1>'||chr(10)||
+c3:=c3||'rtant Messages</h1>'||chr(10)||
 '<div class="t4messages">#GLOBAL_NOTIFICATION##SUCCESS_MESSAGE##NOTIFICATION_MESSAGE#</div>'||chr(10)||
 '</div>'||chr(10)||
 '</div>'||chr(10)||
@@ -282,7 +282,6 @@ wwv_flow_api.create_template(
   p_breadcrumb_def_reg_pos => 'REGION_POSITION_01',
   p_theme_id  => wwv_flow.g_flow_theme_id,
   p_theme_class_id => 3,
-  p_translate_this_template => 'N',
   p_template_comment => '');
 end;
  
@@ -1073,7 +1072,7 @@ c2:=c2||'<div id="rowFooter"><!-- bottom strip of info -->'||chr(10)||
 '                        <a href="thehelp.htm">Help</a> | '||chr(10)||
 '';
 
-c2:=c2||'			<a href="thetermsandconditions.htm">Terms &amp; conditions</a>'||chr(10)||
+c2:=c2||'			<a href="&T_AND_C_URL." target="blank">Terms &amp; conditions</a>'||chr(10)||
 ''||chr(10)||
 '			| <a href="theprivacypolicy.htm">Privacy policy</a>'||chr(10)||
 '                        | <span style="color:#0067c6; text-decoration:none" id="app_version">#APP_VERSION#</span>'||chr(10)||
@@ -3992,7 +3991,7 @@ wwv_flow_api.create_popup_lov_template (
 '',
   p_page_body_attr=>'onload="first_field()" style="background-color:#FFFFFF;margin:0;"',
   p_before_field_text=>'<div class="t4PopupHead">',
-  p_page_heading_text=>'',
+  p_page_heading_text=>'Use some wildcardy search thingy',
   p_page_footer_text =>'',
   p_filter_width     =>'20',
   p_filter_max_width =>'100',
@@ -4019,7 +4018,6 @@ wwv_flow_api.create_popup_lov_template (
   p_before_result_set=>'<div class="t4PopupBody">',
   p_theme_id  => wwv_flow.g_flow_theme_id,
   p_theme_class_id => 1,
-  p_translate_this_template => 'N',
   p_after_result_set   =>'</div>');
 end;
 null;
