diff --git a/Screens/f155.sql b/Screens/f155.sql
index da76225..3d958ff 100644
--- a/Screens/f155.sql
+++ b/Screens/f155.sql
@@ -13,7 +13,7 @@ prompt  APPLICATION 155 - webmip
 -- Application Export:
 --   Application:     155
 --   Name:            webmip
---   Date and Time:   10:48 Wednesday April 30, 2008
+--   Date and Time:   16:52 Thursday May 1, 2008
 --   Exported By:     HARDYA
 --   Flashback:       0
 --   Export Type:     Application Export
@@ -26,12 +26,12 @@ prompt  APPLICATION 155 - webmip
  
 -- Application Statistics:
 --   Pages:                52
---     Items:             359
+--     Items:             361
 --     Computations:        5
 --     Validations:       285
 --     Processes:         121
 --     Regions:            77
---     Buttons:           114
+--     Buttons:           112
 --   Shared Components
 --     Breadcrumbs:         1
 --        Entries           1
@@ -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 => '20080429172723',
+  p_checksum_salt_last_reset => '20080501164018',
   p_home_link         => 'f?p=&APP_ID.:101',
   p_flow_language     => 'en-gb',
   p_flow_language_derived_from=> 'FLOW_PRIMARY_LANGUAGE',
@@ -194,7 +194,7 @@ wwv_flow_api.create_flow(
   p_substitution_string_04 => 'HELP_URL',
   p_substitution_value_04  => 'http://www.nationalgrid.com/corporate/legal/help.htm',
   p_last_updated_by => 'HARDYA',
-  p_last_upd_yyyymmddhh24miss=> '20080429172723',
+  p_last_upd_yyyymmddhh24miss=> '20080501164018',
   p_required_roles=> wwv_flow_utilities.string_to_table2(''));
  
  
@@ -6106,10 +6106,10 @@ s:=s||'select "ID", '||chr(10)||
 '"VALID_FROM",-- all'||chr(10)||
 '"VALID_TO",-- all'||chr(10)||
 '"COST_TYPE"-- all'||chr(10)||
-'from "#OW';
+'from "#OWNER#"."COSTS" '||chr(10)||
+'where ';
 
-s:=s||'NER#"."COSTS" '||chr(10)||
-'where "#OWNER#"."COSTS"."COST_TYPE" = nvl(:P18_REQUIRED_COST_TYPE,''LACO'')'||chr(10)||
+s:=s||'"#OWNER#"."COSTS"."COST_TYPE" = nvl(:P18_REQUIRED_COST_TYPE,''LACO'')'||chr(10)||
 '  '||chr(10)||
 '';
 
@@ -44925,7 +44925,7 @@ wwv_flow_api.create_page(
   p_step_template => 28031530009354416+ wwv_flow_api.g_id_offset,
   p_required_patch=> null + wwv_flow_api.g_id_offset,
   p_last_updated_by => 'HARDYA',
-  p_last_upd_yyyymmddhh24miss => '20080314145908',
+  p_last_upd_yyyymmddhh24miss => '20080501164018',
   p_page_is_public_y_n=> 'Y',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -44964,31 +44964,7 @@ end;
  
 begin
  
-wwv_flow_api.create_page_button(
-  p_id             => 17649720542858853 + wwv_flow_api.g_id_offset,
-  p_flow_id        => wwv_flow.g_flow_id,
-  p_flow_step_id   => 101,
-  p_button_sequence=> 10,
-  p_button_plug_id => 11076809493541525+wwv_flow_api.g_id_offset,
-  p_button_name    => 'NEW_PASSWORD',
-  p_button_image_alt=> 'New Password',
-  p_button_position=> 'BOTTOM',
-  p_button_alignment=> 'RIGHT',
-  p_required_patch => null + wwv_flow_api.g_id_offset);
- 
-wwv_flow_api.create_page_button(
-  p_id             => 17655729115880312 + wwv_flow_api.g_id_offset,
-  p_flow_id        => wwv_flow.g_flow_id,
-  p_flow_step_id   => 101,
-  p_button_sequence=> 20,
-  p_button_plug_id => 11076809493541525+wwv_flow_api.g_id_offset,
-  p_button_name    => 'FORGOTTEN_PASSWORD',
-  p_button_image_alt=> 'Forgotten Password',
-  p_button_position=> 'BOTTOM',
-  p_button_alignment=> 'RIGHT',
-  p_button_redirect_url=> 'f?p=&APP_ID.:103:&SESSION.::&DEBUG.:::',
-  p_required_patch => null + wwv_flow_api.g_id_offset);
- 
+null;
  
 end;
 /
@@ -44996,7 +44972,28 @@ end;
  
 begin
  
-null;
+wwv_flow_api.create_page_branch(
+  p_id=>10616515309019371 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_flow_step_id=> 101,
+  p_branch_action=> 'f?p=&APP_ID.:103:&SESSION.::&DEBUG.:::',
+  p_branch_point=> 'AFTER_PROCESSING',
+  p_branch_type=> 'REDIRECT_URL',
+  p_branch_when_button_id=>10615930368985923+ wwv_flow_api.g_id_offset,
+  p_branch_sequence=> 5,
+  p_branch_comment=> 'Created 01-MAY-2008 15:51 by HARDYA');
+ 
+wwv_flow_api.create_page_branch(
+  p_id=>10614014216931440 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_flow_step_id=> 101,
+  p_branch_action=> 'f?p=&APP_ID.:0:&SESSION.::&DEBUG.:::&success_msg=#SUCCESS_MSG#',
+  p_branch_point=> 'AFTER_PROCESSING',
+  p_branch_type=> 'REDIRECT_URL',
+  p_branch_when_button_id=>11077124657541526+ wwv_flow_api.g_id_offset,
+  p_branch_sequence=> 10,
+  p_branch_comment=> '');
+ 
  
 end;
 /
@@ -45028,7 +45025,7 @@ wwv_flow_api.create_page_item(
   p_cAttributes=> 'nowrap="nowrap"',
   p_begin_on_new_line => 'YES',
   p_begin_on_new_field=> 'YES',
-  p_colspan => 2,
+  p_colspan => 6,
   p_rowspan => 1,
   p_label_alignment  => 'ABOVE',
   p_field_alignment  => 'LEFT',
@@ -45045,6 +45042,83 @@ end;
 declare
     h varchar2(32767) := null;
 begin
+wwv_flow_api.create_page_item(
+  p_id=>10614820279954582 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_flow_step_id=> 101,
+  p_name=>'P101_NEW_PASSWORD',
+  p_data_type=> 'VARCHAR',
+  p_accept_processing=> 'REPLACE_EXISTING',
+  p_item_sequence=> 63,
+  p_item_plug_id => 11076809493541525+wwv_flow_api.g_id_offset,
+  p_use_cache_before_default=> 'NO',
+  p_item_default => 'NEW_PASSWORD',
+  p_prompt=>'New Password',
+  p_source=>'NEW_PASSWORD',
+  p_source_type=> 'STATIC',
+  p_display_as=> 'BUTTON',
+  p_lov_columns=> null,
+  p_lov_display_null=> 'NO',
+  p_lov_translated=> 'N',
+  p_cSize=> null,
+  p_cMaxlength=> 2000,
+  p_cHeight=> null,
+  p_begin_on_new_line => 'NO',
+  p_begin_on_new_field=> 'YES',
+  p_colspan => 1,
+  p_rowspan => 1,
+  p_label_alignment  => 'LEFT',
+  p_field_alignment  => 'LEFT',
+  p_is_persistent=> 'N',
+  p_item_comment => '');
+ 
+ 
+end;
+/
+
+declare
+    h varchar2(32767) := null;
+begin
+wwv_flow_api.create_page_item(
+  p_id=>10615930368985923 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_flow_step_id=> 101,
+  p_name=>'P101_FORGOTTEN_PASSWORD',
+  p_data_type=> 'VARCHAR',
+  p_accept_processing=> 'REPLACE_EXISTING',
+  p_item_sequence=> 73,
+  p_item_plug_id => 11076809493541525+wwv_flow_api.g_id_offset,
+  p_use_cache_before_default=> 'NO',
+  p_item_default => 'FORGOTTEN_PASSWORD',
+  p_prompt=>'Forgotten Password',
+  p_source=>'FORGOTTEN_PASSWORD',
+  p_source_type=> 'STATIC',
+  p_display_as=> 'BUTTON',
+  p_lov_columns=> null,
+  p_lov_display_null=> 'NO',
+  p_lov_translated=> 'N',
+  p_cSize=> null,
+  p_cMaxlength=> 2000,
+  p_cHeight=> null,
+  p_begin_on_new_line => 'NO',
+  p_begin_on_new_field=> 'YES',
+  p_colspan => 1,
+  p_rowspan => 1,
+  p_label_alignment  => 'LEFT',
+  p_field_alignment  => 'LEFT',
+  p_is_persistent=> 'N',
+  p_item_comment => '');
+ 
+ 
+end;
+/
+
+declare
+    h varchar2(32767) := null;
+begin
+h := null;
+h:=h||'Usernames are created by your Supplier Administrator.';
+
 wwv_flow_api.create_page_item(
   p_id=>11076900282541526 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
@@ -45062,12 +45136,12 @@ wwv_flow_api.create_page_item(
   p_lov_columns=> 1,
   p_lov_display_null=> 'NO',
   p_lov_translated=> 'N',
-  p_cSize=> 40,
+  p_cSize=> 44,
   p_cMaxlength=> 100,
   p_cHeight=> 1,
   p_begin_on_new_line => 'YES',
   p_begin_on_new_field=> 'YES',
-  p_colspan => 2,
+  p_colspan => 5,
   p_rowspan => 1,
   p_label_alignment  => 'RIGHT',
   p_field_alignment  => 'LEFT',
@@ -45075,6 +45149,7 @@ wwv_flow_api.create_page_item(
   p_is_persistent=> 'Y',
   p_lov_display_extra=>'NO',
   p_protection_level => 'N',
+  p_help_text   => h,
   p_item_comment => '');
  
  
@@ -45084,6 +45159,15 @@ end;
 declare
     h varchar2(32767) := null;
 begin
+h := null;
+h:=h||'Your password must conform to the following rules:'||chr(10)||
+'<ul>'||chr(10)||
+'<li>Have a minimum length of 8 characters</li>'||chr(10)||
+'<li>Contain a non-alphanumeric character e.g. %</li>'||chr(10)||
+'<li>Contain both upper case and lower case characters</li>'||chr(10)||
+'<li>Contain alpha and numeric characters</li>'||chr(10)||
+'</ul>';
+
 wwv_flow_api.create_page_item(
   p_id=>11077026616541526 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
@@ -45101,12 +45185,12 @@ wwv_flow_api.create_page_item(
   p_lov_columns=> 1,
   p_lov_display_null=> 'NO',
   p_lov_translated=> 'N',
-  p_cSize=> 40,
+  p_cSize=> 44,
   p_cMaxlength=> 100,
   p_cHeight=> 1,
   p_begin_on_new_line => 'YES',
   p_begin_on_new_field=> 'YES',
-  p_colspan => 1,
+  p_colspan => 5,
   p_rowspan => 1,
   p_label_alignment  => 'RIGHT',
   p_field_alignment  => 'LEFT',
@@ -45114,6 +45198,7 @@ wwv_flow_api.create_page_item(
   p_is_persistent=> 'Y',
   p_lov_display_extra=>'NO',
   p_protection_level => 'N',
+  p_help_text   => h,
   p_item_comment => '');
  
  
@@ -45145,7 +45230,7 @@ wwv_flow_api.create_page_item(
   p_cMaxlength=> null,
   p_cHeight=> null,
   p_tag_attributes  => 'id="login"',
-  p_begin_on_new_line => 'NO',
+  p_begin_on_new_line => 'YES',
   p_begin_on_new_field=> 'YES',
   p_colspan => 1,
   p_rowspan => 1,
@@ -45172,6 +45257,8 @@ wwv_flow_api.create_page_validation(
   p_validation2 => 'YES',
   p_validation_type => 'ITEM_IN_VALIDATION_EQ_STRING2',
   p_error_message => 'Terms and Conditions must be accepted before entering this site',
+  p_validation_condition=> 'FORGOTTEN_PASSWORD',
+  p_validation_condition_type=> 'REQUEST_NOT_EQUAL_CONDITION',
   p_associated_item=> 1181431450669473 + wwv_flow_api.g_id_offset,
   p_error_display_location=>'INLINE_IN_NOTIFICATION',
   p_validation_comment=> '');
@@ -45193,7 +45280,8 @@ wwv_flow_api.create_page_validation(
   p_validation => 'P101_USERNAME',
   p_validation_type => 'ITEM_NOT_NULL',
   p_error_message => 'Value must be specified.',
-  p_validation_condition_type=> 'NOT_DISPLAYING_INLINE_VALIDATION_ERRORS',
+  p_validation_condition=> 'FORGOTTEN_PASSWORD',
+  p_validation_condition_type=> 'REQUEST_NOT_EQUAL_CONDITION',
   p_associated_item=> 11076900282541526 + wwv_flow_api.g_id_offset,
   p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',
   p_validation_comment=> 'generated 12-DEC-2007 14:51');
@@ -45231,7 +45319,8 @@ wwv_flow_api.create_page_validation(
 'end;',
   p_validation_type => 'FUNC_BODY_RETURNING_BOOLEAN',
   p_error_message => 'Invalid username/password specified.',
-  p_validation_condition_type=> 'NOT_DISPLAYING_INLINE_VALIDATION_ERRORS',
+  p_validation_condition=> 'FORGOTTEN_PASSWORD',
+  p_validation_condition_type=> 'REQUEST_NOT_EQUAL_CONDITION',
   p_associated_item=> 11076900282541526 + wwv_flow_api.g_id_offset,
   p_error_display_location=>'INLINE_IN_NOTIFICATION',
   p_validation_comment=> '');
@@ -45253,7 +45342,8 @@ wwv_flow_api.create_page_validation(
   p_validation => 'P101_PASSWORD',
   p_validation_type => 'ITEM_NOT_NULL',
   p_error_message => 'Value must be specified.',
-  p_validation_condition_type=> 'NOT_DISPLAYING_INLINE_VALIDATION_ERRORS',
+  p_validation_condition=> 'FORGOTTEN_PASSWORD',
+  p_validation_condition_type=> 'REQUEST_NOT_EQUAL_CONDITION',
   p_associated_item=> 11077026616541526 + wwv_flow_api.g_id_offset,
   p_error_display_location=>'INLINE_WITH_FIELD_AND_NOTIFICATION',
   p_validation_comment=> 'generated 12-DEC-2007 14:51');
@@ -45317,10 +45407,10 @@ p:=p||'if #OWNER#.mip_parties.get_user_role(:P101_USERNAME)=''SUPPADMIN'' then'|
 '  mip_security.login('||chr(10)||
 '    P_UNAME       => :P101_USERNAME,'||chr(10)||
 '    P_PASSWORD    => :P101_PASSWORD,'||chr(10)||
-'    P_SESSION_ID  => v(''APP_SESSION''),'||chr(10)||
-'    P_FLOW_';
+'    P_SESSION_ID  => v(''APP_SESSION''),';
 
-p:=p||'PAGE   => :APP_ID ||'':30'''||chr(10)||
+p:=p||''||chr(10)||
+'    P_FLOW_PAGE   => :APP_ID ||'':30'''||chr(10)||
 '    );'||chr(10)||
 'end if;';
 
@@ -45334,8 +45424,8 @@ wwv_flow_api.create_page_process(
   p_process_name=> 'Login',
   p_process_sql_clob => p, 
   p_process_error_message=> '',
-  p_process_when=>'NEW_PASSWORD',
-  p_process_when_type=>'REQUEST_NOT_EQUAL_CONDITION',
+  p_process_when=>'NEW_PASSWORD:FORGOTTEN_PASSWORD',
+  p_process_when_type=>'REQUEST_NOT_IN_CONDITION',
   p_process_success_message=> '',
   p_process_is_stateful_y_n=>'N',
   p_process_comment=>'');
@@ -45370,7 +45460,7 @@ wwv_flow_api.create_page_process(
   p_process_name=> 'New_Password',
   p_process_sql_clob => p, 
   p_process_error_message=> '',
-  p_process_when_button_id=>17649720542858853 + wwv_flow_api.g_id_offset,
+  p_process_when_button_id=>10614820279954582 + wwv_flow_api.g_id_offset,
   p_process_success_message=> '',
   p_process_is_stateful_y_n=>'N',
   p_process_comment=>'');
@@ -46970,6 +47060,7 @@ wwv_flow_api.create_list_item (
   p_list_countclicks_y_n=> 'N',
   p_list_text_01=> '',
   p_list_item_current_type=> 'COLON_DELIMITED_PAGE_LIST',
+  p_list_item_current_for_pages=> '101',
   p_list_item_owner=> '');
  
 null;
@@ -47067,8 +47158,6 @@ c1:=c1||'>'||chr(10)||
 '  </div>'||chr(10)||
 ''||chr(10)||
 '  <div id="rowSiteNav">'||chr(10)||
-'    <p>I &amp; C Online Quotation System'||chr(10)||
-'    &SYSTEM_ENVIRONMENT.</p>'||chr(10)||
 '  </div>';
 
 c2:=c2||'<div id="rowFooter"><!-- bottom strip of info -->'||chr(10)||
@@ -47198,7 +47287,9 @@ c3:=c3||'<table summary="" cellpadding="0" width="100%" cellspacing="0" border="
 '<td width="100%" valign="top"><div class="t4messages">#SUCCESS_MESSAGE##NOTIFICATION_MESSAGE#</div>#BOX_BODY##REGION_POSITION_01##REGION_POSITION_02##REGION_POSITION_04##REGION_POSITION_05##REGION_POSITION_06##REGION_POSITION_07##REGION_POSITION_08#</td>'||chr(10)||
 '<td valign="top">#REGION_POSITION_03#<br /></td>'||chr(10)||
 '</tr>'||chr(10)||
-'</table>';
+'</tab';
+
+c3:=c3||'le>';
 
 wwv_flow_api.create_template(
   p_id=> 28032741339354418 + wwv_flow_api.g_id_offset,
@@ -47229,7 +47320,6 @@ wwv_flow_api.create_template(
   p_region_table_cattributes=> ' summary="" cellpadding="0" border="0" cellspacing="0" width="100%"',
   p_theme_id  => 101,
   p_theme_class_id => 4,
-  p_translate_this_template => 'N',
   p_template_comment => '');
 end;
  
@@ -47270,9 +47360,9 @@ c3:=c3||'<table summary="" cellpadding="0" width="100%" cellspacing="0" border="
 '<table summary="" cellpadding="0" width="100%" cellspacing="0" border="0">'||chr(10)||
 '<tr>'||chr(10)||
 '<td width="100%" valign="top">'||chr(10)||
-'<div style="border:1px solid black;">#SUCCESS_MESSAG';
+'<div style="border:1px solid black;">#SUCCE';
 
-c3:=c3||'E##NOTIFICATION_MESSAGE#</div>'||chr(10)||
+c3:=c3||'SS_MESSAGE##NOTIFICATION_MESSAGE#</div>'||chr(10)||
 '#BOX_BODY##REGION_POSITION_04#</td>'||chr(10)||
 '<td valign="top">#REGION_POSITION_03#<br /></td>'||chr(10)||
 '</tr>'||chr(10)||
@@ -47310,7 +47400,6 @@ wwv_flow_api.create_template(
   p_region_table_cattributes=> ' summary="" cellpadding="0" border="0" cellspacing="0" width="100%"',
   p_theme_id  => 101,
   p_theme_class_id => 5,
-  p_translate_this_template => 'N',
   p_template_comment => '3');
 end;
  
@@ -47354,7 +47443,6 @@ c1:=c1||' out of the system" accesskey="2">Logout</a>&nbsp;|&nbsp;<!--a href="/g
 '</div>'||chr(10)||
 '</div>'||chr(10)||
 '<div id="rowSiteNav">'||chr(10)||
-'<p>I &amp; C Online Quotation System &SYSTEM_ENVIRONMENT.</p> '||chr(10)||
 '</div>'||chr(10)||
 ''||chr(10)||
 '<script type="text/javascript">'||chr(10)||
@@ -47362,12 +47450,12 @@ c1:=c1||' out of the system" accesskey="2">Logout</a>&nbsp;|&nbsp;<!--a href="/g
 'function MyErrorPage(p_err_item,p_err_process)'||chr(10)||
 '{'||chr(10)||
 ''||chr(10)||
-' var vElementList = nul';
-
-c1:=c1||'l;'||chr(10)||
+' var vElementList = null;'||chr(10)||
 ' var vElement     = null;'||chr(10)||
 ' var vErrorStack  = null;'||chr(10)||
-' var vOraErrorStack = null;'||chr(10)||
+' var v';
+
+c1:=c1||'OraErrorStack = null;'||chr(10)||
 ' var vOraError    = null;'||chr(10)||
 ' var vOraCode     = null;'||chr(10)||
 ' var vAjaxRequest = null;'||chr(10)||
@@ -47381,13 +47469,13 @@ c1:=c1||'l;'||chr(10)||
 ' return;'||chr(10)||
 ''||chr(10)||
 ' vElementList = window.document.getElementsByTagName("div");'||chr(10)||
-' for (i=0; i < vElementList.len';
-
-c1:=c1||'gth; i++)'||chr(10)||
+' for (i=0; i < vElementList.length; i++)'||chr(10)||
 ' {'||chr(10)||
 '  vElement = vElementList[i];'||chr(10)||
 ' '||chr(10)||
-'  if (vElement.className == "ErrorPageMessage")'||chr(10)||
+'  if (vElement.';
+
+c1:=c1||'className == "ErrorPageMessage")'||chr(10)||
 '  {'||chr(10)||
 '    vErrorStack = (vErrorStack ==null?"":vErrorStack)+vElement.innerHTML;'||chr(10)||
 '    vOraErrorStack = vErrorStack.split("ORA-");'||chr(10)||
@@ -47395,9 +47483,9 @@ c1:=c1||'gth; i++)'||chr(10)||
 '      vElement.innerHTML = ''''; '||chr(10)||
 '      for(var j=1; j < vOraErrorStack.length; j++) {'||chr(10)||
 '        vOraError = vOraErrorStack[j];'||chr(10)||
-'        ';
+'        vAjaxRequest = new htmldb_Get(null,&APP_ID.,''APPLICATION_PROCESS';
 
-c1:=c1||'vAjaxRequest = new htmldb_Get(null,&APP_ID.,''APPLICATION_PROCESS=''+p_err_process,0);'||chr(10)||
+c1:=c1||'=''+p_err_process,0);'||chr(10)||
 '        vAjaxRequest.add(p_err_item,vOraError);'||chr(10)||
 '        vAjaxResult = vAjaxRequest.get();'||chr(10)||
 '        if (vAjaxResult) {'||chr(10)||
@@ -47407,20 +47495,20 @@ c1:=c1||'vAjaxRequest = new htmldb_Get(null,&APP_ID.,''APPLICATION_PROCESS=''+p_
 '        }'||chr(10)||
 '      }'||chr(10)||
 '    }'||chr(10)||
-'if (document.getElementById && document.createElement ';
+'if (document.getElementById && document.createElement && vMyMsg.length > 0) {'||chr(10)||
+'   var divA = document.getElementById(''';
 
-c1:=c1||'&& vMyMsg.length > 0) {'||chr(10)||
-'   var divA = document.getElementById(''ErrorOutputDiv'');'||chr(10)||
+c1:=c1||'ErrorOutputDiv'');'||chr(10)||
 '   var oH = document.createElement(''h1'');'||chr(10)||
 '   oH.appendChild(document.createTextNode(''Validation failed because:''));'||chr(10)||
 '   var oP = document.createElement(''p'');'||chr(10)||
 '   oP.id = ''FriendlyError'';'||chr(10)||
 '   oP.appendChild(document.createTextNode(vMyMsg));'||chr(10)||
 '   // Insert the heading as the first child of the element'||chr(10)||
-'   divA.insertB';
+'   divA.insertBefore(oP, divA.firstChild);'||chr(10)||
+'   divA.insertBefore(oH, divA.first';
 
-c1:=c1||'efore(oP, divA.firstChild);'||chr(10)||
-'   divA.insertBefore(oH, divA.firstChild);'||chr(10)||
+c1:=c1||'Child);'||chr(10)||
 '   }'||chr(10)||
 '  }'||chr(10)||
 ' }'||chr(10)||
@@ -47634,9 +47722,9 @@ t:=t||'<h1 class="regionheader">#TITLE#<a name="#REGION_STATIC_ID#"> </a></h1>'|
 '</tr>'||chr(10)||
 '-->'||chr(10)||
 '<tr>'||chr(10)||
-'<td class="t4RegionBody">#BODY#';
+'<td class="t4RegionBody">#BODY#<img alt=';
 
-t:=t||'<img alt="" src="#IMAGE_PREFIX#themes/theme_4/1px_trans.gif" style="display:block;" width="600" height="1" /></td>'||chr(10)||
+t:=t||'"" src="#IMAGE_PREFIX#themes/theme_4/1px_trans.gif" style="display:block;" width="600" height="1" /></td>'||chr(10)||
 '</tr>'||chr(10)||
 '</table>';
 
@@ -47651,6 +47739,7 @@ wwv_flow_api.create_plug_template (
   p_theme_class_id => 8,
   p_plug_heading_bgcolor => '#f7f7e7',
   p_plug_font_size => '-1',
+  p_translate_this_template => 'N',
   p_template_comment       => '');
 end;
 null;
diff --git a/Screens/f155_theme_101.sql b/Screens/f155_theme_101.sql
index 3f76ef6..d80dd3b 100644
--- a/Screens/f155_theme_101.sql
+++ b/Screens/f155_theme_101.sql
@@ -148,8 +148,6 @@ c1:=c1||'>'||chr(10)||
 '  </div>'||chr(10)||
 ''||chr(10)||
 '  <div id="rowSiteNav">'||chr(10)||
-'    <p>I &amp; C Online Quotation System'||chr(10)||
-'    &SYSTEM_ENVIRONMENT.</p>'||chr(10)||
 '  </div>';
 
 c2:=c2||'<div id="rowFooter"><!-- bottom strip of info -->'||chr(10)||
@@ -279,7 +277,9 @@ c3:=c3||'<table summary="" cellpadding="0" width="100%" cellspacing="0" border="
 '<td width="100%" valign="top"><div class="t4messages">#SUCCESS_MESSAGE##NOTIFICATION_MESSAGE#</div>#BOX_BODY##REGION_POSITION_01##REGION_POSITION_02##REGION_POSITION_04##REGION_POSITION_05##REGION_POSITION_06##REGION_POSITION_07##REGION_POSITION_08#</td>'||chr(10)||
 '<td valign="top">#REGION_POSITION_03#<br /></td>'||chr(10)||
 '</tr>'||chr(10)||
-'</table>';
+'</tab';
+
+c3:=c3||'le>';
 
 wwv_flow_api.create_template(
   p_id=> 28032741339354418 + wwv_flow_api.g_id_offset,
@@ -310,7 +310,6 @@ wwv_flow_api.create_template(
   p_region_table_cattributes=> ' summary="" cellpadding="0" border="0" cellspacing="0" width="100%"',
   p_theme_id  => wwv_flow.g_flow_theme_id,
   p_theme_class_id => 4,
-  p_translate_this_template => 'N',
   p_template_comment => '');
 end;
  
@@ -351,9 +350,9 @@ c3:=c3||'<table summary="" cellpadding="0" width="100%" cellspacing="0" border="
 '<table summary="" cellpadding="0" width="100%" cellspacing="0" border="0">'||chr(10)||
 '<tr>'||chr(10)||
 '<td width="100%" valign="top">'||chr(10)||
-'<div style="border:1px solid black;">#SUCCESS_MESSAG';
+'<div style="border:1px solid black;">#SUCCE';
 
-c3:=c3||'E##NOTIFICATION_MESSAGE#</div>'||chr(10)||
+c3:=c3||'SS_MESSAGE##NOTIFICATION_MESSAGE#</div>'||chr(10)||
 '#BOX_BODY##REGION_POSITION_04#</td>'||chr(10)||
 '<td valign="top">#REGION_POSITION_03#<br /></td>'||chr(10)||
 '</tr>'||chr(10)||
@@ -391,7 +390,6 @@ wwv_flow_api.create_template(
   p_region_table_cattributes=> ' summary="" cellpadding="0" border="0" cellspacing="0" width="100%"',
   p_theme_id  => wwv_flow.g_flow_theme_id,
   p_theme_class_id => 5,
-  p_translate_this_template => 'N',
   p_template_comment => '3');
 end;
  
@@ -435,7 +433,6 @@ c1:=c1||' out of the system" accesskey="2">Logout</a>&nbsp;|&nbsp;<!--a href="/g
 '</div>'||chr(10)||
 '</div>'||chr(10)||
 '<div id="rowSiteNav">'||chr(10)||
-'<p>I &amp; C Online Quotation System &SYSTEM_ENVIRONMENT.</p> '||chr(10)||
 '</div>'||chr(10)||
 ''||chr(10)||
 '<script type="text/javascript">'||chr(10)||
@@ -443,12 +440,12 @@ c1:=c1||' out of the system" accesskey="2">Logout</a>&nbsp;|&nbsp;<!--a href="/g
 'function MyErrorPage(p_err_item,p_err_process)'||chr(10)||
 '{'||chr(10)||
 ''||chr(10)||
-' var vElementList = nul';
-
-c1:=c1||'l;'||chr(10)||
+' var vElementList = null;'||chr(10)||
 ' var vElement     = null;'||chr(10)||
 ' var vErrorStack  = null;'||chr(10)||
-' var vOraErrorStack = null;'||chr(10)||
+' var v';
+
+c1:=c1||'OraErrorStack = null;'||chr(10)||
 ' var vOraError    = null;'||chr(10)||
 ' var vOraCode     = null;'||chr(10)||
 ' var vAjaxRequest = null;'||chr(10)||
@@ -462,13 +459,13 @@ c1:=c1||'l;'||chr(10)||
 ' return;'||chr(10)||
 ''||chr(10)||
 ' vElementList = window.document.getElementsByTagName("div");'||chr(10)||
-' for (i=0; i < vElementList.len';
-
-c1:=c1||'gth; i++)'||chr(10)||
+' for (i=0; i < vElementList.length; i++)'||chr(10)||
 ' {'||chr(10)||
 '  vElement = vElementList[i];'||chr(10)||
 ' '||chr(10)||
-'  if (vElement.className == "ErrorPageMessage")'||chr(10)||
+'  if (vElement.';
+
+c1:=c1||'className == "ErrorPageMessage")'||chr(10)||
 '  {'||chr(10)||
 '    vErrorStack = (vErrorStack ==null?"":vErrorStack)+vElement.innerHTML;'||chr(10)||
 '    vOraErrorStack = vErrorStack.split("ORA-");'||chr(10)||
@@ -476,9 +473,9 @@ c1:=c1||'gth; i++)'||chr(10)||
 '      vElement.innerHTML = ''''; '||chr(10)||
 '      for(var j=1; j < vOraErrorStack.length; j++) {'||chr(10)||
 '        vOraError = vOraErrorStack[j];'||chr(10)||
-'        ';
+'        vAjaxRequest = new htmldb_Get(null,&APP_ID.,''APPLICATION_PROCESS';
 
-c1:=c1||'vAjaxRequest = new htmldb_Get(null,&APP_ID.,''APPLICATION_PROCESS=''+p_err_process,0);'||chr(10)||
+c1:=c1||'=''+p_err_process,0);'||chr(10)||
 '        vAjaxRequest.add(p_err_item,vOraError);'||chr(10)||
 '        vAjaxResult = vAjaxRequest.get();'||chr(10)||
 '        if (vAjaxResult) {'||chr(10)||
@@ -488,20 +485,20 @@ c1:=c1||'vAjaxRequest = new htmldb_Get(null,&APP_ID.,''APPLICATION_PROCESS=''+p_
 '        }'||chr(10)||
 '      }'||chr(10)||
 '    }'||chr(10)||
-'if (document.getElementById && document.createElement ';
+'if (document.getElementById && document.createElement && vMyMsg.length > 0) {'||chr(10)||
+'   var divA = document.getElementById(''';
 
-c1:=c1||'&& vMyMsg.length > 0) {'||chr(10)||
-'   var divA = document.getElementById(''ErrorOutputDiv'');'||chr(10)||
+c1:=c1||'ErrorOutputDiv'');'||chr(10)||
 '   var oH = document.createElement(''h1'');'||chr(10)||
 '   oH.appendChild(document.createTextNode(''Validation failed because:''));'||chr(10)||
 '   var oP = document.createElement(''p'');'||chr(10)||
 '   oP.id = ''FriendlyError'';'||chr(10)||
 '   oP.appendChild(document.createTextNode(vMyMsg));'||chr(10)||
 '   // Insert the heading as the first child of the element'||chr(10)||
-'   divA.insertB';
+'   divA.insertBefore(oP, divA.firstChild);'||chr(10)||
+'   divA.insertBefore(oH, divA.first';
 
-c1:=c1||'efore(oP, divA.firstChild);'||chr(10)||
-'   divA.insertBefore(oH, divA.firstChild);'||chr(10)||
+c1:=c1||'Child);'||chr(10)||
 '   }'||chr(10)||
 '  }'||chr(10)||
 ' }'||chr(10)||
@@ -715,9 +712,9 @@ t:=t||'<h1 class="regionheader">#TITLE#<a name="#REGION_STATIC_ID#"> </a></h1>'|
 '</tr>'||chr(10)||
 '-->'||chr(10)||
 '<tr>'||chr(10)||
-'<td class="t4RegionBody">#BODY#';
+'<td class="t4RegionBody">#BODY#<img alt=';
 
-t:=t||'<img alt="" src="#IMAGE_PREFIX#themes/theme_4/1px_trans.gif" style="display:block;" width="600" height="1" /></td>'||chr(10)||
+t:=t||'"" src="#IMAGE_PREFIX#themes/theme_4/1px_trans.gif" style="display:block;" width="600" height="1" /></td>'||chr(10)||
 '</tr>'||chr(10)||
 '</table>';
 
@@ -732,6 +729,7 @@ wwv_flow_api.create_plug_template (
   p_theme_class_id => 8,
   p_plug_heading_bgcolor => '#f7f7e7',
   p_plug_font_size => '-1',
+  p_translate_this_template => 'N',
   p_template_comment       => '');
 end;
 null;