diff --git a/Screens/f155.sql b/Screens/f155.sql
index 2e612bd..f5adcbf 100644
--- a/Screens/f155.sql
+++ b/Screens/f155.sql
@@ -13,8 +13,8 @@ prompt  APPLICATION 155 - webmip
 -- Application Export:
 --   Application:     155
 --   Name:            webmip
---   Date and Time:   10:45 Wednesday April 2, 2008
---   Exported By:     PRIESTJ
+--   Date and Time:   14:19 Wednesday April 2, 2008
+--   Exported By:     MULLENM
 --   Flashback:       0
 --   Export Type:     Application Export
 --   Version: 3.1.0.00.32
@@ -145,7 +145,7 @@ wwv_flow_api.create_flow(
   p_default_region_template=> 28038130488354430 + wwv_flow_api.g_id_offset,
   p_error_template    => 42209241448421762 + wwv_flow_api.g_id_offset,
   p_page_protection_enabled_y_n=> 'N',
-  p_checksum_salt_last_reset => '20080402104537',
+  p_checksum_salt_last_reset => '20080402141927',
   p_home_link         => 'f?p=&APP_ID.:101',
   p_flow_language     => 'en-gb',
   p_flow_language_derived_from=> 'FLOW_PRIMARY_LANGUAGE',
@@ -193,8 +193,8 @@ wwv_flow_api.create_flow(
   p_substitution_value_03  => 'http://www.nationalgrid.com/corporate/legal/privacy.htm',
   p_substitution_string_04 => 'HELP_URL',
   p_substitution_value_04  => 'http://www.nationalgrid.com/corporate/legal/help.htm',
-  p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss=> '20080402104537',
+  p_last_updated_by => 'MULLENM',
+  p_last_upd_yyyymmddhh24miss=> '20080402141927',
   p_required_roles=> wwv_flow_utilities.string_to_table2(''));
  
  
@@ -1578,27 +1578,27 @@ wwv_flow_api.create_list_of_values (
   p_id       => 19188714627694567 + wwv_flow_api.g_id_offset,
   p_flow_id  => wwv_flow.g_flow_id,
   p_lov_name => 'PRTY_ROLES',
-  p_lov_query=> 'begin'||chr(10)||
-'if mip_parties.get_user_role(:APP_USER) = ''MIPADMIN'' then'||chr(10)||
-'  if :P61_PRTY_TYPE = ''MKTP'' then'||chr(10)||
-'    return ''SELECT ''''Gas supplier'''' display_value, ''''SUPP'''' return_value'||chr(10)||
+  p_lov_query=> 'BEGIN'||chr(10)||
+'  IF mip_parties.get_user_role(:app_user) = ''MIPADMIN'' THEN'||chr(10)||
+'    IF :p61_prty_type = ''MKTP'' THEN'||chr(10)||
+'      RETURN ''SELECT ''''Gas supplier'''' display_value, ''''SUPP'''' return_value'||chr(10)||
 '          from dual'';'||chr(10)||
-'  elsif :P61_PRTY_TYPE = ''MANU'' then'||chr(10)||
-'    return ''SELECT ''''External organization'''' display_value, ''''EXTORG'''' return_value'||chr(10)||
+'    ELSIF :p61_prty_type = ''MANU'' THEN'||chr(10)||
+'      RETURN ''SELECT ''''External organization'''' display_value, ''''EXTORG'''' return_value'||chr(10)||
 '          from dual'';'||chr(10)||
-'  else'||chr(10)||
-'    return ''select DESCRIPTION display_value, CODE return_value '||chr(10)||
+'    ELSE'||chr(10)||
+'      RETURN ''select DESCRIPTION display_value, CODE return_value '||chr(10)||
 '              from ROLE_TYPES'||chr(10)||
 '             where upper(rt_type) = ''''PRT'''''||chr(10)||
+'             and not upper(code) in (''''EXTORG'''',''''SUPP'''')'||chr(10)||
 '             order by 1'';'||chr(10)||
-'  end if;'||chr(10)||
-'else'||chr(10)||
-'  return ''SELECT ''''Agent'''' display_value, ''''AGENT'''' return_value'||chr(10)||
+'    END IF;'||chr(10)||
+'  ELSE'||chr(10)||
+'    RETURN ''SELECT ''''Agent'''' display_value, ''''AGENT'''' return_value'||chr(10)||
 '          from dual'';'||chr(10)||
-'end if;'||chr(10)||
+'  END IF;'||chr(10)||
 ''||chr(10)||
-''||chr(10)||
-'end;');
+'END;');
  
 null;
  
@@ -11403,8 +11403,8 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_role => 16097609166220701+ wwv_flow_api.g_id_offset,
   p_required_patch=> null + wwv_flow_api.g_id_offset,
-  p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss => '20080331161953',
+  p_last_updated_by => 'DHARSHANIK',
+  p_last_upd_yyyymmddhh24miss => '20080402131632',
   p_page_is_public_y_n=> 'N',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -18051,7 +18051,7 @@ declare
     h varchar2(32767) := null;
 begin
 h := null;
-h:=h||'Please select the exisiting meter model from the drop down menu.  If you are unsure of the meter model, or if the existing model is not listed, please select ''other''.  If you select ''other'', you will not be able to generate an automatic quotation.  A manual quote will be generated off-line and uploaded back onto the system within the normal SLA.'||chr(10)||
+h:=h||''||chr(10)||
 '';
 
 wwv_flow_api.create_page_item(
@@ -32618,7 +32618,7 @@ wwv_flow_api.create_page(
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'MULLENM',
-  p_last_upd_yyyymmddhh24miss => '20080310173707',
+  p_last_upd_yyyymmddhh24miss => '20080402141612',
   p_page_is_public_y_n=> 'N',
   p_protection_level=> 'N',
   p_page_comment  => '');
@@ -32932,27 +32932,27 @@ wwv_flow_api.create_page_item(
   p_source_type=> 'STATIC',
   p_display_as=> 'COMBOBOX_WITH_SUBMIT',
   p_named_lov=> 'PRTY_ROLES',
-  p_lov => 'begin'||chr(10)||
-'if mip_parties.get_user_role(:APP_USER) = ''MIPADMIN'' then'||chr(10)||
-'  if :P61_PRTY_TYPE = ''MKTP'' then'||chr(10)||
-'    return ''SELECT ''''Gas supplier'''' display_value, ''''SUPP'''' return_value'||chr(10)||
+  p_lov => 'BEGIN'||chr(10)||
+'  IF mip_parties.get_user_role(:app_user) = ''MIPADMIN'' THEN'||chr(10)||
+'    IF :p61_prty_type = ''MKTP'' THEN'||chr(10)||
+'      RETURN ''SELECT ''''Gas supplier'''' display_value, ''''SUPP'''' return_value'||chr(10)||
 '          from dual'';'||chr(10)||
-'  elsif :P61_PRTY_TYPE = ''MANU'' then'||chr(10)||
-'    return ''SELECT ''''External organization'''' display_value, ''''EXTORG'''' return_value'||chr(10)||
+'    ELSIF :p61_prty_type = ''MANU'' THEN'||chr(10)||
+'      RETURN ''SELECT ''''External organization'''' display_value, ''''EXTORG'''' return_value'||chr(10)||
 '          from dual'';'||chr(10)||
-'  else'||chr(10)||
-'    return ''select DESCRIPTION display_value, CODE return_value '||chr(10)||
+'    ELSE'||chr(10)||
+'      RETURN ''select DESCRIPTION display_value, CODE return_value '||chr(10)||
 '              from ROLE_TYPES'||chr(10)||
 '             where upper(rt_type) = ''''PRT'''''||chr(10)||
+'             and not upper(code) in (''''EXTORG'''',''''SUPP'''')'||chr(10)||
 '             order by 1'';'||chr(10)||
-'  end if;'||chr(10)||
-'else'||chr(10)||
-'  return ''SELECT ''''Agent'''' display_value, ''''AGENT'''' return_value'||chr(10)||
+'    END IF;'||chr(10)||
+'  ELSE'||chr(10)||
+'    RETURN ''SELECT ''''Agent'''' display_value, ''''AGENT'''' return_value'||chr(10)||
 '          from dual'';'||chr(10)||
-'end if;'||chr(10)||
+'  END IF;'||chr(10)||
 ''||chr(10)||
-''||chr(10)||
-'end;',
+'END;',
   p_lov_columns=> 1,
   p_lov_display_null=> 'YES',
   p_lov_translated=> 'N',
@@ -47659,10 +47659,10 @@ c1:=c1||''||chr(10)||
 c1:=c1||'"'||chr(10)||
 '             title='||chr(10)||
 '             "Return to the Metering Online Quotations Home Page"'||chr(10)||
-'             accesskey="1">Home</a> | <a href="&LOGOUT_URL."'||chr(10)||
+'             accesskey="1">Home</a> | <a href="&LOGOUT_URL."'||chr(10)||
 '             class="hskpnav"'||chr(10)||
 '             title="Log out of the system"'||chr(10)||
-'             accesskey="2">Logout</a> | '||chr(10)||
+'             accesskey="2">Logout</a> | '||chr(10)||
 '             <!--a href="/group/help" class="hskpnav">Help</a>&nbsp;|&nbsp;--><span>'||chr(10)||
 '        You are logged in as:&APP_USER.</span';
 
@@ -47683,15 +47683,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">2008</span> National Grid</div>'||chr(10)||
+'		<div id="copyright">Copyright &copy; <!--2006--><span id="Pagefooter_lblYear">2008</span> National Grid, Copyright &copy; 2008 Advantica Ltd.</div>'||chr(10)||
 '	</div>'||chr(10)||
 '	'||chr(10)||
 '	<div class="hskpcol2">'||chr(10)||
 '		<div id="navFooter">'||chr(10)||
-'                        <a href="&HELP_URL.">Help</a> | '||chr(10)||
-'	';
+'                     ';
 
-c2:=c2||'		<a href="&T_AND_C_URL." target="blank">Terms &amp; conditions</a>'||chr(10)||
+c2:=c2||'   <a href="&HELP_URL.">Help</a> | '||chr(10)||
+'			<a href="&T_AND_C_URL." target="blank">Terms &amp; conditions</a>'||chr(10)||
 ''||chr(10)||
 '			| <a href="&PRIVACY_URL.">Privacy policy</a>'||chr(10)||
 '                        | <span style="color:#0067c6; text-decoration:none" id="app_version">#APP_VERSION#</span>'||chr(10)||