diff --git a/Screens/f155.sql b/Screens/f155.sql
index 7f8beda..cda404a 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:   14:27 Thursday February 28, 2008
+--   Date and Time:   16:15 Thursday February 28, 2008
 --   Exported By:     PRIESTJ
 --   Flashback:       0
 --   Export Type:     Application Export
@@ -29,7 +29,7 @@ prompt  APPLICATION 155 - webmip
 --     Items:             344
 --     Computations:        1
 --     Validations:       260
---     Processes:          93
+--     Processes:          94
 --     Regions:            78
 --     Buttons:           118
 --   Shared Components
@@ -145,7 +145,7 @@ wwv_flow_api.create_flow(
   p_default_region_template=> 24740611526526770 + wwv_flow_api.g_id_offset,
   p_error_template    => 38911722486594102 + wwv_flow_api.g_id_offset,
   p_page_protection_enabled_y_n=> 'N',
-  p_checksum_salt_last_reset => '20080228142748',
+  p_checksum_salt_last_reset => '20080228161551',
   p_home_link         => 'f?p=&APP_ID.:1',
   p_box_width         => '98%',
   p_flow_language     => 'en-gb',
@@ -187,7 +187,7 @@ wwv_flow_api.create_flow(
   p_substitution_string_01 => 'SYSTEM_ENVIRONMENT',
   p_substitution_value_01  => '(Development)',
   p_last_updated_by => 'PRIESTJ',
-  p_last_upd_yyyymmddhh24miss=> '20080228142748',
+  p_last_upd_yyyymmddhh24miss=> '20080228161551',
   p_required_roles=> wwv_flow_utilities.string_to_table2(''));
  
  
@@ -2546,6 +2546,19 @@ wwv_flow_api.create_app_comments (
   p_app_version=>'');
 end;
 /
+begin
+wwv_flow_api.create_app_comments (
+  p_id=>45002917124768922 + wwv_flow_api.g_id_offset,
+  p_flow_id=>wwv_flow.g_flow_id,
+  p_pages=>'32',
+  p_app_comment=>'Added Branch for the cancel button that clears the cache and attempts to reload the current enquiry by passing the current id.  For ticket #275',
+  p_updated_on=>'2008.02.28.16:15:37',
+  p_updated_by=>'PRIESTJ',
+  p_created_on=>'2008.02.28.16:15:37',
+  p_created_by=>'PRIESTJ',
+  p_app_version=>'');
+end;
+/
  
 --application/pages/page_00000
 prompt  ...PAGE 0: system
@@ -9880,8 +9893,8 @@ wwv_flow_api.create_page(
   p_html_page_header => '',
   p_step_template => '',
   p_required_patch=> null + wwv_flow_api.g_id_offset,
-  p_last_updated_by => 'MULLENM',
-  p_last_upd_yyyymmddhh24miss => '20080222095313',
+  p_last_updated_by => 'HARDYA',
+  p_last_upd_yyyymmddhh24miss => '20080228161115',
   p_page_is_public_y_n=> 'N',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -10777,6 +10790,37 @@ end;
 /
 
  
+begin
+ 
+declare
+  p varchar2(32767) := null;
+  l_clob clob;
+  l_length number := 1;
+begin
+p:=p||'reset_pagination';
+
+wwv_flow_api.create_page_process(
+  p_id     => 44998830930744577 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_flow_step_id => 30,
+  p_process_sequence=> 10,
+  p_process_point=> 'AFTER_SUBMIT',
+  p_process_type=> 'RESET_PAGINATION',
+  p_process_name=> 'Reset Pagination',
+  p_process_sql_clob => p, 
+  p_process_error_message=> '',
+  p_process_when_button_id=>15913501633649970 + wwv_flow_api.g_id_offset,
+  p_process_success_message=> '',
+  p_process_is_stateful_y_n=>'N',
+  p_required_patch=>null + wwv_flow_api.g_id_offset,
+  p_process_comment=>'');
+end;
+null;
+ 
+end;
+/
+
+ 
 begin
  
 ---------------------------------------
@@ -11306,7 +11350,7 @@ wwv_flow_api.create_page(
   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 => '20080228140218',
+  p_last_upd_yyyymmddhh24miss => '20080228161158',
   p_page_is_public_y_n=> 'N',
   p_protection_level=> 'C',
   p_page_comment  => '');
@@ -12021,6 +12065,17 @@ wwv_flow_api.create_page_branch(
   p_branch_sequence=> 120,
   p_branch_comment=> '');
  
+wwv_flow_api.create_page_branch(
+  p_id=>44999506127746877 + wwv_flow_api.g_id_offset,
+  p_flow_id=> wwv_flow.g_flow_id,
+  p_flow_step_id=> 32,
+  p_branch_action=> 'f?p=&APP_ID.:32:&SESSION.::&DEBUG.:32:P32_ID:&P32_ID.',
+  p_branch_point=> 'AFTER_PROCESSING',
+  p_branch_type=> 'REDIRECT_URL',
+  p_branch_when_button_id=>26599921946798258+ wwv_flow_api.g_id_offset,
+  p_branch_sequence=> 130,
+  p_branch_comment=> 'Created 28-FEB-2008 16:11 by PRIESTJ');
+ 
 wwv_flow_api.create_page_branch(
   p_id=>26619827768798275 + wwv_flow_api.g_id_offset,
   p_flow_id=> wwv_flow.g_flow_id,
@@ -12031,16 +12086,6 @@ wwv_flow_api.create_page_branch(
   p_branch_sequence=> 500,
   p_branch_comment=> '');
  
-wwv_flow_api.create_page_branch(
-  p_id=>40943215953201689 + wwv_flow_api.g_id_offset,
-  p_flow_id=> wwv_flow.g_flow_id,
-  p_flow_step_id=> 32,
-  p_branch_action=> 'f?p=155:32:&SESSION.#jobinfo',
-  p_branch_point=> 'AFTER_PROCESSING',
-  p_branch_type=> 'REDIRECT_URL',
-  p_branch_sequence=> 510,
-  p_branch_comment=> 'Created 21-FEB-2008 16:00 by PRIESTJ');
- 
  
 end;
 /
@@ -16711,7 +16756,7 @@ wwv_flow_api.create_page_validation(
   p_validation => '#OWNER#.mip_security.page_authorization(v(''APP_USER''),v(''APP_PAGE_ID''),''A'') and not #OWNER#.mip_security.page_authorization(v(''APP_USER''),v(''APP_PAGE_ID''),''R'')',
   p_validation_type => 'PLSQL_EXPRESSION',
   p_error_message => 'Sorry you do not have authorization to save or update this page',
-  p_error_display_location=>'ON_ERROR_PAGE',
+  p_error_display_location=>'INLINE_IN_NOTIFICATION',
   p_validation_comment=> '');
  
 null;
@@ -16733,7 +16778,7 @@ wwv_flow_api.create_page_validation(
   p_error_message => 'Sorry you do not have authorization to save or update this page',
   p_validation_condition=> '#OWNER#.mip_parties.get_user_role(v(''APP_USER'')) = ''AGENT''',
   p_validation_condition_type=> 'PLSQL_EXPRESSION',
-  p_error_display_location=>'ON_ERROR_PAGE',
+  p_error_display_location=>'INLINE_IN_NOTIFICATION',
   p_validation_comment=> '');
  
 null;
@@ -19450,7 +19495,7 @@ wwv_flow_api.create_page_process(
   p_process_type=> 'PLSQL',
   p_process_name=> 'delete enquiry',
   p_process_sql_clob => p, 
-  p_process_error_message=> 'Unable to delete enquiry, quote may exists for this enquiry',
+  p_process_error_message=> 'Unable to delete enquiry, quote may exist for this enquiry',
   p_process_when_button_id=>31354104183698139 + wwv_flow_api.g_id_offset,
   p_process_when=>':P32_ID is not null and #OWNER#.mip_security.component_authorization(v(''APP_USER''),''sysadmin'')',
   p_process_when_type=>'PLSQL_EXPRESSION',
@@ -34352,7 +34397,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 => '20080228142713',
+  p_last_upd_yyyymmddhh24miss => '20080228143222',
   p_page_is_public_y_n=> 'N',
   p_page_comment  => '');
  
@@ -44748,9 +44793,9 @@ c1:=c1||'://www.nationalgrid.com/"><img src="/i/ng_logo_group_medium.gif" alt="N
 '</div>'||chr(10)||
 '<div id="navHousekeep" class="hskpcol2">'||chr(10)||
 '<div class="margin5">'||chr(10)||
-'<a href="this is the url for the holding page for the ICOMQ system" class="hskpnav" title="Return to the Metering Online Quotations Home Page" accesskey="1">Home</a>&nbsp;|&nbsp;<a href="&LOGOUT_URL." c';
+'<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 ';
 
-c1:=c1||'lass="hskpnav" title="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)||
+c1:=c1||'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)||
@@ -45543,9 +45588,9 @@ c1:=c1||'l1">'||chr(10)||
 '</div>'||chr(10)||
 '<div id="navHousekeep" class="hskpcol2">'||chr(10)||
 '<div class="margin5">'||chr(10)||
-'<a href="this is the url for the holding page for the ICOMQ system" class="hskpnav" title="Return to the Metering Online Quotations Home Page" accesskey="1">Home</a>&nbsp;|&nbsp;<a href="&LOGOUT_URL." class=';
+'<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 th';
 
-c1:=c1||'"hskpnav" title="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)||
+c1:=c1||'e 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)||
@@ -45558,10 +45603,10 @@ c1:=c1||'"hskpnav" title="Log out of the system" accesskey="2">Logout</a>&nbsp;|
 'function MyErrorPage(p_err_item,p_err_process)'||chr(10)||
 '{'||chr(10)||
 ''||chr(10)||
-' va';
+' var vElementList = null;'||chr(10)||
+' var v';
 
-c1:=c1||'r vElementList = null;'||chr(10)||
-' var vElement     = null;'||chr(10)||
+c1:=c1||'Element     = null;'||chr(10)||
 ' var vErrorStack  = null;'||chr(10)||
 ' var vOraErrorStack = null;'||chr(10)||
 ' var vOraError    = null;'||chr(10)||
@@ -45577,9 +45622,9 @@ c1:=c1||'r vElementList = null;'||chr(10)||
 ' return;'||chr(10)||
 ''||chr(10)||
 ' vElementList = window.document.getElementsByTagName("div");'||chr(10)||
-' for (i=0; ';
+' for (i=0; i < vElementList.length; i++)';
 
-c1:=c1||'i < vElementList.length; i++)'||chr(10)||
+c1:=c1||''||chr(10)||
 ' {'||chr(10)||
 '  vElement = vElementList[i];'||chr(10)||
 ' '||chr(10)||
@@ -45588,33 +45633,35 @@ c1:=c1||'i < vElementList.length; i++)'||chr(10)||
 '    vErrorStack = (vErrorStack ==null?"":vErrorStack)+vElement.innerHTML;'||chr(10)||
 '    vElement.innerHTML = '''';'||chr(10)||
 '    vOraErrorStack = vErrorStack.split("ORA-");'||chr(10)||
-'    for(var j=1; j < vOraErrorStack.length; j++) {'||chr(10)||
-'      vOraError = vOraErrorStack[j];'||chr(10)||
-'      vAjaxRequest = new htmldb_G';
+'    if vOraErrorStack.length > 0 {'||chr(10)||
+'      for(var j=1; j < vOraErrorStack.length; j++) {'||chr(10)||
+'        vOraError = vOraErrorStack[j];'||chr(10)||
+'        vAjaxRequest = ';
 
-c1:=c1||'et(null,&APP_ID.,''APPLICATION_PROCESS=''+p_err_process,0);'||chr(10)||
-'      vAjaxRequest.add(p_err_item,vOraError);'||chr(10)||
-'      vAjaxResult = vAjaxRequest.get();'||chr(10)||
-'      if (vAjaxResult) {'||chr(10)||
-'        vMyMsg = vMyMsg + vAjaxResult;'||chr(10)||
-'      } else {'||chr(10)||
-'        vMyMsg = vMyMsg + vOraError.substring(0);'||chr(10)||
+c1:=c1||'new htmldb_Get(null,&APP_ID.,''APPLICATION_PROCESS=''+p_err_process,0);'||chr(10)||
+'        vAjaxRequest.add(p_err_item,vOraError);'||chr(10)||
+'        vAjaxResult = vAjaxRequest.get();'||chr(10)||
+'        if (vAjaxResult) {'||chr(10)||
+'          vMyMsg = vMyMsg + vAjaxResult;'||chr(10)||
+'        } else {'||chr(10)||
+'          vMyMsg = vMyMsg + vOraError.substring(0);'||chr(10)||
+'        }'||chr(10)||
 '      }'||chr(10)||
 '    }'||chr(10)||
-'if (document.getElementById && document.createElement) {'||chr(10)||
-'   var divA = document.getElementById(''ErrorOu';
+'if (document.getElementById && document.createElement) && vMyMsg.leng';
 
-c1:=c1||'tputDiv'');'||chr(10)||
+c1:=c1||'th > 0 {'||chr(10)||
+'   var divA = document.getElementById(''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.insertBefore(oP, divA.firstChild);'||chr(10)||
-'   divA.insertBefore(oH, divA.firstChild);';
+'   divA.insertBefore(oP, divA.';
 
-c1:=c1||''||chr(10)||
+c1:=c1||'firstChild);'||chr(10)||
+'   divA.insertBefore(oH, divA.firstChild);'||chr(10)||
 '   }'||chr(10)||
 '  }'||chr(10)||
 ' }'||chr(10)||
@@ -45643,6 +45690,7 @@ c2:=c2||'<div id="rowFooter"><!-- bottom strip of info -->'||chr(10)||
 c2:=c2||'			<a href="thetermsandconditions.htm">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)||
 '		</div>'||chr(10)||
 '	</div>'||chr(10)||
 '	'||chr(10)||