Update src/streamlit_app.py

src/streamlit_app.py

@@ -37,7 +37,7 @@ else:  # Linux/Mac (HF Spaces uses Linux)
     pass
 
 # Page configuration
-st.set_page_config(page_title="Remittance Data Viewer", layout="wide")
+st.set_page_config(page_title="Invoice Data Viewer", layout="wide")
 
 # Custom CSS
 st.markdown("""
@@ -141,10 +141,34 @@ def load_jsonl(file):
             data.append(json.loads(line))
     return data
 
+def reorder_record_fields(record):
+    """Reorder record fields to put file_name/file_names first, then gt_parse, then others"""
+    ordered_record = {}
+    
+    # First: Add file_name or file_names
+    if 'file_name' in record:
+        ordered_record['file_name'] = record['file_name']
+    if 'file_names' in record:
+        ordered_record['file_names'] = record['file_names']
+    
+    # Second: Add gt_parse
+    if 'gt_parse' in record:
+        ordered_record['gt_parse'] = record['gt_parse']
+    
+    # Third: Add any remaining fields
+    for key, value in record.items():
+        if key not in ordered_record:
+            ordered_record[key] = value
+    
+    return ordered_record
+
 def save_to_jsonl(data):
-    """Convert data list to JSONL format"""
-    jsonl_content = '\n'.join([json.dumps(record) for record in data])
-    return jsonl_content
+    """Convert data list to JSONL format with proper field ordering"""
+    jsonl_lines = []
+    for record in data:
+        ordered_record = reorder_record_fields(record)
+        jsonl_lines.append(json.dumps(ordered_record))
+    return '\n'.join(jsonl_lines)
 
 def pdf_to_images(pdf_file):
     """Convert PDF to list of PIL Images (one per page)"""
@@ -155,8 +179,6 @@ def pdf_to_images(pdf_file):
         
         for page_num in range(pdf_document.page_count):
             page = pdf_document[page_num]
-            # Render page to an image (higher DPI for better quality)
-            # Using 3x zoom (300 DPI equivalent) for much better clarity
             pix = page.get_pixmap(matrix=fitz.Matrix(3, 3), alpha=False)
             img_data = pix.tobytes("png")
             img = Image.open(io.BytesIO(img_data))
@@ -182,7 +204,6 @@ def perform_ocr(image, bbox):
 
 def scale_image_to_fixed_size(image, max_width=900, max_height=1100):
     """Scale image to fit within max dimensions while maintaining aspect ratio - NO PADDING"""
-    # Convert to RGB with proper handling
     if image.mode not in ('RGB', 'RGBA'):
         image = image.convert('RGB')
     elif image.mode == 'RGBA':
@@ -190,7 +211,6 @@ def scale_image_to_fixed_size(image, max_width=900, max_height=1100):
         background.paste(image, mask=image.split()[3])
         image = background
     
-    # Calculate scaling ratio
     width_ratio = max_width / image.width
     height_ratio = max_height / image.height
     ratio = min(width_ratio, height_ratio)
@@ -198,34 +218,47 @@ def scale_image_to_fixed_size(image, max_width=900, max_height=1100):
     new_width = int(image.width * ratio)
     new_height = int(image.height * ratio)
     
-    # Always use LANCZOS for highest quality resampling
     resized_image = image.resize((new_width, new_height), Image.Resampling.LANCZOS)
     
-    # Return without padding - image takes only the space it needs
     return resized_image, ratio, 0, 0
 
-def swap_customer_supplier_details(index):
-    """Swap customer and supplier details"""
+def get_base_filename(record):
+    """Get base filename from record, handling both file_name and file_names"""
+    # Check for file_names (plural) first
+    if 'file_names' in record and record['file_names']:
+        if isinstance(record['file_names'], list) and len(record['file_names']) > 0:
+            # Extract base name from first file (remove _pageN.png suffix)
+            first_file = record['file_names'][0]
+            # Remove .png extension
+            base = first_file.rsplit('.png', 1)[0]
+            # Remove _pageN suffix if exists
+            if '_page' in base:
+                base = base.rsplit('_page', 1)[0]
+            return base
+        return record['file_names']
+    
+    # Fall back to file_name (singular)
+    return record.get('file_name', '')
+
+def swap_sender_recipient_details(index):
+    """Swap sender and recipient details"""
     gt_parse = st.session_state.edited_data[index].get('gt_parse', {})
-    customer_supplier = gt_parse.get('Customer_supplier_details', {})
+    header = gt_parse.get('header', {})
     
-    # Store customer values
-    temp_customer_name = customer_supplier.get('Customer_name', '')
-    temp_customer_address = customer_supplier.get('Customer_address', '')
-    temp_customer_contact = customer_supplier.get('Customer_contact_info', '')
+    # Store sender values
+    temp_sender_name = header.get('sender_name', '')
+    temp_sender_addr = header.get('sender_addr', '')
     
-    # Swap: Customer ← Supplier
-    customer_supplier['Customer_name'] = customer_supplier.get('Supplier_name', '')
-    customer_supplier['Customer_address'] = customer_supplier.get('Supplier_address', '')
-    customer_supplier['Customer_contact_info'] = customer_supplier.get('Supplier_contact_info', '')
+    # Swap: Sender ← Recipient
+    header['sender_name'] = header.get('rcpt_name', '')
+    header['sender_addr'] = header.get('rcpt_addr', '')
     
-    # Swap: Supplier ← Customer (from temp)
-    customer_supplier['Supplier_name'] = temp_customer_name
-    customer_supplier['Supplier_address'] = temp_customer_address
-    customer_supplier['Supplier_contact_info'] = temp_customer_contact
+    # Swap: Recipient ← Sender (from temp)
+    header['rcpt_name'] = temp_sender_name
+    header['rcpt_addr'] = temp_sender_addr
     
     # Update session state
-    gt_parse['Customer_supplier_details'] = customer_supplier
+    gt_parse['header'] = header
     st.session_state.edited_data[index]['gt_parse'] = gt_parse
     st.session_state.modified_indices.add(index)
 
@@ -241,9 +274,9 @@ if 'page' not in st.session_state:
 if 'images' not in st.session_state:
     st.session_state.images = {}
 if 'pdf_metadata' not in st.session_state:
-    st.session_state.pdf_metadata = {}  # Store {filename: {'pages': [images], 'current_page': 0}}
+    st.session_state.pdf_metadata = {}
 if 'current_page_num' not in st.session_state:
-    st.session_state.current_page_num = {}  # Track current page for each file
+    st.session_state.current_page_num = {}
 if 'modified_indices' not in st.session_state:
     st.session_state.modified_indices = set()
 if 'ocr_active_section' not in st.session_state:
@@ -254,8 +287,6 @@ if 'ocr_line_item_row' not in st.session_state:
     st.session_state.ocr_line_item_row = None
 if 'canvas_key' not in st.session_state:
     st.session_state.canvas_key = 0
-if 'line_items_temp' not in st.session_state:
-    st.session_state.line_items_temp = []
 if 'button_clicked' not in st.session_state:
     st.session_state.button_clicked = False
 if 'save_message' not in st.session_state:
@@ -272,15 +303,63 @@ if 'navigating_page' not in st.session_state:
 def auto_save(index):
     """Automatically save changes to session state and mark as modified"""
     if st.session_state.edited_data:
+        # Get current record
+        current_record = st.session_state.edited_data[index]
+        
+        # Get base filename using the helper function
+        base_file_name = get_base_filename(current_record)
+        
+        if not base_file_name:
+            st.warning("Cannot save: No file name found in record")
+            return
+        
+        # Find the actual file name in uploaded files
+        actual_file_name = None
+        if base_file_name in st.session_state.images:
+            actual_file_name = base_file_name
+        else:
+            # Try with extensions
+            for ext in ['.pdf', '.png', '.jpg', '.jpeg', '.tiff', '.tif', '.bmp']:
+                if base_file_name + ext in st.session_state.images:
+                    actual_file_name = base_file_name + ext
+                    break
+            
+            # Try matching base name
+            if not actual_file_name:
+                for uploaded_name in st.session_state.images.keys():
+                    uploaded_base = uploaded_name.rsplit('.', 1)[0]
+                    if uploaded_base == base_file_name:
+                        actual_file_name = uploaded_name
+                        break
+        
+        # Check if it's a PDF and update file_name accordingly
+        if actual_file_name and actual_file_name in st.session_state.pdf_metadata:
+            # It's a PDF - get page count
+            pdf_meta = st.session_state.pdf_metadata[actual_file_name]
+            total_pages = pdf_meta['total_pages']
+            
+            # Get base name without extension
+            base_name = actual_file_name.rsplit('.', 1)[0]
+            
+            if total_pages > 1:
+                # Multi-page PDF: use file_names array
+                file_names_array = [f"{base_name}_page{i+1}.png" for i in range(total_pages)]
+                st.session_state.edited_data[index]['file_names'] = file_names_array
+                # Remove old file_name field if it exists
+                if 'file_name' in st.session_state.edited_data[index]:
+                    del st.session_state.edited_data[index]['file_name']
+            else:
+                # Single-page PDF: use file_name string
+                st.session_state.edited_data[index]['file_name'] = f"{base_name}.png"
+                # Remove old file_names field if it exists
+                if 'file_names' in st.session_state.edited_data[index]:
+                    del st.session_state.edited_data[index]['file_names']
+        
         st.session_state.data = st.session_state.edited_data.copy()
         st.session_state.modified_indices.add(index)
 
 def activate_ocr_field(section, field, row_idx=None):
-    """Activate OCR for a specific field.
-       Toggle behavior: if the same field is already active, deactivate it to avoid repeated activations/looping.
-       Also ensures the line-item expander stays expanded when OCR is requested.
-    """
-    # If the requested field is already active, deactivate it (toggle off)
+    """Activate OCR for a specific field"""
     if (st.session_state.ocr_active_section == section and 
         st.session_state.ocr_active_field == field and 
         st.session_state.ocr_line_item_row == row_idx):
@@ -288,18 +367,15 @@ def activate_ocr_field(section, field, row_idx=None):
         st.session_state.ocr_active_field = None
         st.session_state.ocr_line_item_row = None
     else:
-        # Activate new OCR target
         st.session_state.ocr_active_section = section
         st.session_state.ocr_active_field = field
         st.session_state.ocr_line_item_row = row_idx
 
-        # If it's a line-item, mark that expander as expanded so it remains open after rerun
-        if section == 'Line_items' and row_idx is not None:
+        if section == 'items' and row_idx is not None:
             current_idx = st.session_state.get('current_index', 0)
             expander_key = f"line_item_expander_{current_idx}_{row_idx}"
             st.session_state[expander_key] = True
 
-    # Bump canvas_key to ensure canvas is refreshed/cleared when toggling OCR
     st.session_state.canvas_key += 1
     st.rerun()
 
@@ -311,7 +387,7 @@ def is_ocr_active(section, field, row_idx=None):
 
 # PAGE 1: Upload Page
 if st.session_state.page == 'upload':
-    st.title("📤 Remittance Data Viewer with OCR")
+    st.title("📤 Invoice Data Viewer with OCR")
     st.markdown("### Upload your files to begin")
     
     st.markdown("**Step 1: Upload JSONL File**")
@@ -344,20 +420,15 @@ if st.session_state.page == 'upload':
                 file_ext = file.name.lower().split('.')[-1]
                 
                 if file_ext == 'pdf':
-                    # Convert PDF to images
                     pdf_images = pdf_to_images(file)
                     if pdf_images:
-                        # Store first page as the main image
                         images_dict[file.name] = pdf_images[0]
-                        # Store all pages in metadata
                         pdf_metadata[file.name] = {
                             'pages': pdf_images,
                             'total_pages': len(pdf_images),
                             'current_page': 0
                         }
-                        #st.info(f"📄 Converted PDF '{file.name}' ({len(pdf_images)} pages)")
                 else:
-                    # Handle regular images
                     image = Image.open(file)
                     images_dict[file.name] = image
                     
@@ -367,26 +438,27 @@ if st.session_state.page == 'upload':
         st.session_state.images = images_dict
         st.session_state.pdf_metadata = pdf_metadata
         
-        # Initialize current page tracking
         for filename in pdf_metadata.keys():
             if filename not in st.session_state.current_page_num:
                 st.session_state.current_page_num[filename] = 0
         
         if st.session_state.data is not None:
-            gt_file_names = [rec.get('file_name', '') for rec in st.session_state.data]
+            gt_file_names = []
+            for rec in st.session_state.data:
+                base_fname = get_base_filename(rec)
+                if base_fname:
+                    gt_file_names.append(base_fname)
+            
             matched_images = set()
             unmatched_gt_files = []
             
-            # Try to match with and without extensions
             for fname in gt_file_names:
                 if not fname:
                     continue
                 
-                # Try exact match first
                 if fname in images_dict:
                     matched_images.add(fname)
                 else:
-                    # Try adding common extensions
                     found = False
                     for ext in ['.pdf', '.png', '.jpg', '.jpeg', '.tiff', '.tif', '.bmp']:
                         if fname + ext in images_dict:
@@ -394,7 +466,6 @@ if st.session_state.page == 'upload':
                             found = True
                             break
                     
-                    # Try matching filename without extension from uploaded files
                     if not found:
                         for uploaded_name in images_dict.keys():
                             uploaded_base = uploaded_name.rsplit('.', 1)[0]
@@ -458,7 +529,7 @@ elif st.session_state.page == 'viewer':
             st.download_button(
                 label=f"⬇️ Download Modified ({len(modified_data)})",
                 data=jsonl_modified,
-                file_name=f"modified_remittance_data_{today_date}.jsonl",
+                file_name=f"modified_invoice_data_{today_date}.jsonl",
                 mime="application/jsonl",
                 type="primary",
                 use_container_width=True
@@ -474,7 +545,7 @@ elif st.session_state.page == 'viewer':
             st.download_button(
                 label=f"⬇️ Download Unmodified ({len(unmodified_data)})",
                 data=jsonl_unmodified,
-                file_name=f"unmodified_remittance_data_{today_date}.jsonl",
+                file_name=f"unmodified_invoice_data_{today_date}.jsonl",
                 mime="application/jsonl",
                 use_container_width=True
             )
@@ -486,29 +557,28 @@ elif st.session_state.page == 'viewer':
         st.download_button(
             label=f"⬇️ Download All ({len(st.session_state.edited_data)})",
             data=jsonl_all,
-            file_name=f"all_remittance_data_{today_date}.jsonl",
+            file_name=f"all_invoice_data_{today_date}.jsonl",
             mime="application/jsonl",
             use_container_width=True
         )
     
-    file_names = [record.get('file_name', f'Record {i}') for i, record in enumerate(st.session_state.data or [])]
+    # Build file names list for dropdown using helper function
+    file_names = []
+    for i, record in enumerate(st.session_state.data or []):
+        base_name = get_base_filename(record)
+        file_names.append(base_name if base_name else f'Record {i}')
 
-    # Guard: no records at all
     if not file_names:
         st.error("No records loaded. Please upload a JSONL file on the Upload page.")
         if st.button("← Back to Upload"):
             st.session_state.page = 'upload'
             st.rerun()
     else:
-        # Build options (list is safer than range for length checks)
         options = list(range(len(file_names)))
 
-        # Ensure edited_data exists and has consistent length
         if not st.session_state.edited_data or len(st.session_state.edited_data) != len(file_names):
-            # try to sync edited_data to data
             st.session_state.edited_data = (st.session_state.data or []).copy()
 
-        # Clamp current_index into valid range
         cur_idx = st.session_state.get('current_index', 0)
         try:
             cur_idx = int(cur_idx)
@@ -519,7 +589,6 @@ elif st.session_state.page == 'viewer':
         if cur_idx >= len(options):
             cur_idx = len(options) - 1
 
-        # Show selectbox with a safe index
         selected_file = st.selectbox(
             "Select a file to view:",
             options=options,
@@ -527,10 +596,7 @@ elif st.session_state.page == 'viewer':
             index=cur_idx
         )
 
-        # Persist chosen index
         st.session_state.current_index = selected_file
-
-        # Safe access to the current record
         current_record = st.session_state.edited_data[selected_file]
     
     left_col, right_col = st.columns([1.6, 1.0], gap="small")
@@ -538,21 +604,19 @@ elif st.session_state.page == 'viewer':
     # LEFT SIDE: Image Display with OCR Canvas
     with left_col:
         with st.container(height=700, border=False):
-            file_name = current_record.get('file_name', '')
+            # Use helper function to get base file name
+            file_name = get_base_filename(current_record)
             
             if file_name:
-                # Find the actual file name (handle cases where extension is missing)
                 actual_file_name = None
                 if file_name in st.session_state.images:
                     actual_file_name = file_name
                 else:
-                    # Try adding common extensions
                     for ext in ['.pdf', '.png', '.jpg', '.jpeg', '.tiff', '.tif', '.bmp']:
                         if file_name + ext in st.session_state.images:
                             actual_file_name = file_name + ext
                             break
                     
-                    # Try matching without extension
                     if not actual_file_name:
                         for uploaded_name in st.session_state.images.keys():
                             uploaded_base = uploaded_name.rsplit('.', 1)[0]
@@ -561,7 +625,6 @@ elif st.session_state.page == 'viewer':
                                 break
                 
                 if actual_file_name:
-                    # Check if this is a PDF with multiple pages
                     is_pdf = actual_file_name in st.session_state.pdf_metadata
                     
                     if is_pdf:
@@ -569,7 +632,6 @@ elif st.session_state.page == 'viewer':
                         total_pages = pdf_meta['total_pages']
                         current_page = st.session_state.current_page_num.get(actual_file_name, 0)
                         
-                        # PDF Navigation Header
                         col_prev, col_info, col_next = st.columns([1, 2, 1])
                         
                         with col_prev:
@@ -583,7 +645,6 @@ elif st.session_state.page == 'viewer':
                             next_clicked = st.button("Next ➡️", key=f"next_page_{selected_file}_{actual_file_name}",
                                        disabled=(current_page >= total_pages - 1), use_container_width=True)
                         
-                        # Handle navigation only if not already navigating
                         if not st.session_state.navigating_page:
                             if prev_clicked:
                                 st.session_state.navigating_page = True
@@ -600,15 +661,12 @@ elif st.session_state.page == 'viewer':
                                 st.session_state.ocr_active_field = None
                                 st.rerun()
                         else:
-                            # Reset the flag after rerun
                             st.session_state.navigating_page = False
                 
                 if actual_file_name:
-                    # Determine if PDF and get the appropriate image
                     is_pdf = actual_file_name in st.session_state.pdf_metadata
                     
                     if is_pdf:
-                        # Get the current page image
                         current_page = st.session_state.current_page_num.get(actual_file_name, 0)
                         pdf_meta = st.session_state.pdf_metadata[actual_file_name]
                         current_image = pdf_meta['pages'][current_page]
@@ -622,12 +680,11 @@ elif st.session_state.page == 'viewer':
                             st.text(f"  • {img_name}")
                         if len(st.session_state.images) > 20:
                             st.text(f"  ... and {len(st.session_state.images) - 20} more")
+                    current_image = None
                 
                 if current_image:
-                    # Scale to a reasonable size so canvas doesn't become excessively large
                     scaled_image, scale_ratio, paste_x, paste_y = scale_image_to_fixed_size(current_image)
                     
-                    # Render the canvas. Its internal canvas will be constrained by the wrapper due to CSS above.
                     canvas_result = st_canvas(
                         fill_color="rgba(255, 165, 0, 0.3)",
                         stroke_width=2,
@@ -640,7 +697,6 @@ elif st.session_state.page == 'viewer':
                         key=f"canvas_{selected_file}_{st.session_state.canvas_key}",
                     )
                     
-                    # Only attempt OCR if there's an active OCR target AND the user has drawn something (objects exist)
                     if canvas_result.json_data is not None and st.session_state.ocr_active_field:
                         objects = canvas_result.json_data.get("objects", [])
                         if len(objects) > 0:
@@ -661,14 +717,13 @@ elif st.session_state.page == 'viewer':
                                 
                                 gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
                                 
-                                if st.session_state.ocr_active_section == 'Line_items':
-                                    line_items = gt_parse.get('Line_items', [])
+                                if st.session_state.ocr_active_section == 'items':
+                                    items = gt_parse.get('items', [])
                                     row_idx = st.session_state.ocr_line_item_row
-                                    if row_idx is not None and row_idx < len(line_items):
-                                        line_items[row_idx][st.session_state.ocr_active_field] = ocr_text
-                                        gt_parse['Line_items'] = line_items
+                                    if row_idx is not None and row_idx < len(items):
+                                        items[row_idx][st.session_state.ocr_active_field] = ocr_text
+                                        gt_parse['items'] = items
 
-                                        # ensure expander stays open for this row after OCR
                                         expander_key = f"line_item_expander_{selected_file}_{row_idx}"
                                         st.session_state[expander_key] = True
                                 else:
@@ -681,10 +736,6 @@ elif st.session_state.page == 'viewer':
                                 st.session_state.edited_data[selected_file]['gt_parse'] = gt_parse
                                 st.session_state.modified_indices.add(selected_file)
                                 
-                                # Keep the OCR field active so user can draw multiple rectangles for the same field
-                                # Field will only change when user clicks a different OCR button
-                                
-                                # Clear canvas for next OCR by bumping canvas_key then rerun
                                 st.session_state.canvas_key += 1
                                 st.rerun()
                             else:
@@ -695,322 +746,366 @@ elif st.session_state.page == 'viewer':
     # RIGHT SIDE: Editable Details
     with right_col:
         with st.container(height=700, border=False):
-            st.markdown("### 📝 Document Details")
+            st.markdown("### 📝 Invoice Details")
             
             gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
             
             tab1, tab2, tab3, tab4 = st.tabs([
-                "📄 Remittance Details", 
+                "📄 Invoice Details", 
                 "👥 Party Details", 
                 "🏦 Bank Details", 
                 "📋 Line Items"
             ])
             
-            # TAB 1: Remittance Details
+            # TAB 1: Header (includes invoice details + summary fields)
             with tab1:
-                remittance = gt_parse.get('Remittance_details', {})
+                header = gt_parse.get('header', {})
+                summary = gt_parse.get('summary', {})
                 
-                # Each field with OCR button
+                st.markdown("**Invoice Information**")
+                
+                # Invoice No
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    remittance['Remittance_adv_no'] = st.text_input(
-                        "Remittance Advice No", 
-                        value=remittance.get('Remittance_adv_no', ''),
-                        key=f"rem_adv_no_{selected_file}"
+                    header['invoice_no'] = st.text_input(
+                        "Invoice No", 
+                        value=header.get('invoice_no', ''),
+                        key=f"invoice_no_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_rem_adv_no_{selected_file}", 
-                               type="primary" if is_ocr_active('Remittance_details', 'Remittance_adv_no') else "secondary"):
-                        activate_ocr_field('Remittance_details', 'Remittance_adv_no')
+                    if st.button("🔍", key=f"ocr_invoice_no_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'invoice_no') else "secondary"):
+                        activate_ocr_field('header', 'invoice_no')
                 
+                # Invoice Date
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    remittance['Remittance_adv_date'] = st.text_input(
-                        "Remittance Advice Date", 
-                        value=remittance.get('Remittance_adv_date', ''),
-                        key=f"rem_adv_date_{selected_file}"
+                    header['invoice_date'] = st.text_input(
+                        "Invoice Date", 
+                        value=header.get('invoice_date', ''),
+                        key=f"invoice_date_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_rem_adv_date_{selected_file}", 
-                               type="primary" if is_ocr_active('Remittance_details', 'Remittance_adv_date') else "secondary"):
-                        activate_ocr_field('Remittance_details', 'Remittance_adv_date')
+                    if st.button("🔍", key=f"ocr_invoice_date_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'invoice_date') else "secondary"):
+                        activate_ocr_field('header', 'invoice_date')
                 
+                # Due Date
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    remittance['Payment_method'] = st.text_input(
-                        "Payment Method", 
-                        value=remittance.get('Payment_method', ''),
-                        key=f"payment_method_{selected_file}"
+                    header['due_date'] = st.text_input(
+                        "Due Date", 
+                        value=header.get('due_date', ''),
+                        key=f"due_date_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_payment_method_{selected_file}", 
-                               type="primary" if is_ocr_active('Remittance_details', 'Payment_method') else "secondary"):
-                        activate_ocr_field('Remittance_details', 'Payment_method')
+                    if st.button("🔍", key=f"ocr_due_date_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'due_date') else "secondary"):
+                        activate_ocr_field('header', 'due_date')
+                
+                st.markdown("**Financial Summary**")
                 
+                # Subtotal
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    remittance['FCY'] = st.text_input(
-                        "FCY (Foreign Currency)", 
-                        value=remittance.get('FCY', ''),
-                        key=f"fcy_{selected_file}"
+                    summary['subtotal'] = st.text_input(
+                        "Subtotal", 
+                        value=summary.get('subtotal', ''),
+                        key=f"subtotal_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_fcy_{selected_file}", 
-                               type="primary" if is_ocr_active('Remittance_details', 'FCY') else "secondary"):
-                        activate_ocr_field('Remittance_details', 'FCY')
+                    if st.button("🔍", key=f"ocr_subtotal_{selected_file}", 
+                               type="primary" if is_ocr_active('summary', 'subtotal') else "secondary"):
+                        activate_ocr_field('summary', 'subtotal')
                 
+                # Tax Rate
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    remittance['Total_payment_amt_FCY'] = st.text_input(
-                        "Total Payment Amount (FCY)", 
-                        value=remittance.get('Total_payment_amt_FCY', ''),
-                        key=f"total_payment_{selected_file}"
+                    summary['tax_rate'] = st.text_input(
+                        "Tax Rate", 
+                        value=summary.get('tax_rate', ''),
+                        key=f"tax_rate_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_total_payment_{selected_file}", 
-                               type="primary" if is_ocr_active('Remittance_details', 'Total_payment_amt_FCY') else "secondary"):
-                        activate_ocr_field('Remittance_details', 'Total_payment_amt_FCY')
+                    if st.button("🔍", key=f"ocr_tax_rate_{selected_file}", 
+                               type="primary" if is_ocr_active('summary', 'tax_rate') else "secondary"):
+                        activate_ocr_field('summary', 'tax_rate')
                 
+                # Tax Amount
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    remittance['Payment_date'] = st.text_input(
-                        "Payment Date", 
-                        value=remittance.get('Payment_date', ''),
-                        key=f"payment_date_{selected_file}"
+                    summary['tax_amount'] = st.text_input(
+                        "Tax Amount", 
+                        value=summary.get('tax_amount', ''),
+                        key=f"tax_amount_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_payment_date_{selected_file}", 
-                               type="primary" if is_ocr_active('Remittance_details', 'Payment_date') else "secondary"):
-                        activate_ocr_field('Remittance_details', 'Payment_date')
+                    if st.button("🔍", key=f"ocr_tax_amount_{selected_file}", 
+                               type="primary" if is_ocr_active('summary', 'tax_amount') else "secondary"):
+                        activate_ocr_field('summary', 'tax_amount')
                 
+                # Total Amount
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    remittance['Payment_ref_no'] = st.text_input(
-                        "Payment Reference No", 
-                        value=remittance.get('Payment_ref_no', ''),
-                        key=f"payment_ref_{selected_file}"
+                    summary['total_amount'] = st.text_input(
+                        "Total Amount", 
+                        value=summary.get('total_amount', ''),
+                        key=f"total_amount_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_payment_ref_{selected_file}", 
-                               type="primary" if is_ocr_active('Remittance_details', 'Payment_ref_no') else "secondary"):
-                        activate_ocr_field('Remittance_details', 'Payment_ref_no')
+                    if st.button("🔍", key=f"ocr_total_amount_{selected_file}", 
+                               type="primary" if is_ocr_active('summary', 'total_amount') else "secondary"):
+                        activate_ocr_field('summary', 'total_amount')
                 
-                gt_parse['Remittance_details'] = remittance
+                # Currency
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    summary['currency'] = st.text_input(
+                        "Currency", 
+                        value=summary.get('currency', ''),
+                        key=f"currency_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_currency_{selected_file}", 
+                               type="primary" if is_ocr_active('summary', 'currency') else "secondary"):
+                        activate_ocr_field('summary', 'currency')
+                
+                gt_parse['header'] = header
+                gt_parse['summary'] = summary
             
-            # TAB 2: Customer/Supplier Details with SWAP button
+            # TAB 2: Party Details (without bank details)
             with tab2:
-                # SWAP BUTTON - Centered and prominent
+                # SWAP BUTTON
                 col1, col2, col3 = st.columns([1, 2, 1])
                 with col2:
-                    if st.button("🔄 Swap Customer ↔ Supplier", key=f"swap_btn_{selected_file}", 
+                    if st.button("🔄 Swap Sender ↔ Recipient", key=f"swap_btn_{selected_file}", 
                                type="primary", use_container_width=True):
                         if not st.session_state.just_swapped:
                             st.session_state.just_swapped = True
-                            swap_customer_supplier_details(selected_file)
+                            swap_sender_recipient_details(selected_file)
                             st.rerun()
                 
-                # Reset the flag after rerun
                 if st.session_state.just_swapped:
                     st.session_state.just_swapped = False
                 
-                st.markdown("**Customer Details**")
-                customer_supplier = gt_parse.get('Customer_supplier_details', {})
+                st.markdown("**Sender Details**")
+                header = gt_parse.get('header', {})
                 
+                # Sender Name
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    customer_supplier['Customer_name'] = st.text_input(
-                        "Customer Name", 
-                        value=customer_supplier.get('Customer_name', ''),
-                        key=f"cust_name_{selected_file}"
+                    header['sender_name'] = st.text_input(
+                        "Sender Name", 
+                        value=header.get('sender_name', ''),
+                        key=f"sender_name_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_cust_name_{selected_file}", 
-                               type="primary" if is_ocr_active('Customer_supplier_details', 'Customer_name') else "secondary"):
-                        activate_ocr_field('Customer_supplier_details', 'Customer_name')
+                    if st.button("🔍", key=f"ocr_sender_name_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'sender_name') else "secondary"):
+                        activate_ocr_field('header', 'sender_name')
                 
+                # Sender Address
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    customer_supplier['Customer_address'] = st.text_area(
-                        "Customer Address", 
-                        value=customer_supplier.get('Customer_address', ''),
-                        key=f"cust_addr_{selected_file}",
+                    header['sender_addr'] = st.text_area(
+                        "Sender Address", 
+                        value=header.get('sender_addr', ''),
+                        key=f"sender_addr_{selected_file}",
                         height=60
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_cust_addr_{selected_file}", 
-                               type="primary" if is_ocr_active('Customer_supplier_details', 'Customer_address') else "secondary"):
-                        activate_ocr_field('Customer_supplier_details', 'Customer_address')
+                    if st.button("🔍", key=f"ocr_sender_addr_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'sender_addr') else "secondary"):
+                        activate_ocr_field('header', 'sender_addr')
                 
-                col_input, col_btn = st.columns([5, 1])
-                with col_input:
-                    customer_supplier['Customer_contact_info'] = st.text_input(
-                        "Customer Contact Info", 
-                        value=customer_supplier.get('Customer_contact_info', ''),
-                        key=f"cust_contact_{selected_file}"
-                    )
-                with col_btn:
-                    st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_cust_contact_{selected_file}", 
-                               type="primary" if is_ocr_active('Customer_supplier_details', 'Customer_contact_info') else "secondary"):
-                        activate_ocr_field('Customer_supplier_details', 'Customer_contact_info')
-                
-                st.markdown("**Supplier Details**")
+                st.markdown("**Recipient Details**")
                 
+                # Recipient Name
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    customer_supplier['Supplier_name'] = st.text_input(
-                        "Supplier Name", 
-                        value=customer_supplier.get('Supplier_name', ''),
-                        key=f"supp_name_{selected_file}"
+                    header['rcpt_name'] = st.text_input(
+                        "Recipient Name", 
+                        value=header.get('rcpt_name', ''),
+                        key=f"rcpt_name_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_supp_name_{selected_file}", 
-                               type="primary" if is_ocr_active('Customer_supplier_details', 'Supplier_name') else "secondary"):
-                        activate_ocr_field('Customer_supplier_details', 'Supplier_name')
+                    if st.button("🔍", key=f"ocr_rcpt_name_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'rcpt_name') else "secondary"):
+                        activate_ocr_field('header', 'rcpt_name')
                 
+                # Recipient Address
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    customer_supplier['Supplier_address'] = st.text_area(
-                        "Supplier Address", 
-                        value=customer_supplier.get('Supplier_address', ''),
-                        key=f"supp_addr_{selected_file}",
+                    header['rcpt_addr'] = st.text_area(
+                        "Recipient Address", 
+                        value=header.get('rcpt_addr', ''),
+                        key=f"rcpt_addr_{selected_file}",
                         height=60
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_supp_addr_{selected_file}", 
-                               type="primary" if is_ocr_active('Customer_supplier_details', 'Supplier_address') else "secondary"):
-                        activate_ocr_field('Customer_supplier_details', 'Supplier_address')
+                    if st.button("🔍", key=f"ocr_rcpt_addr_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'rcpt_addr') else "secondary"):
+                        activate_ocr_field('header', 'rcpt_addr')
+                
+                gt_parse['header'] = header
+            
+            # TAB 3: Bank Details
+            with tab3:
+                header = gt_parse.get('header', {})
                 
+                # Bank IBAN
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    customer_supplier['Supplier_contact_info'] = st.text_input(
-                        "Supplier Contact Info", 
-                        value=customer_supplier.get('Supplier_contact_info', ''),
-                        key=f"supp_contact_{selected_file}"
+                    header['bank_iban'] = st.text_input(
+                        "Bank IBAN", 
+                        value=header.get('bank_iban', ''),
+                        key=f"bank_iban_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_supp_contact_{selected_file}", 
-                               type="primary" if is_ocr_active('Customer_supplier_details', 'Supplier_contact_info') else "secondary"):
-                        activate_ocr_field('Customer_supplier_details', 'Supplier_contact_info')
-                
-                gt_parse['Customer_supplier_details'] = customer_supplier
-            
-            # TAB 3: Bank Details
-            with tab3:
-                bank = gt_parse.get('Bank_details', {})
+                    if st.button("🔍", key=f"ocr_bank_iban_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'bank_iban') else "secondary"):
+                        activate_ocr_field('header', 'bank_iban')
                 
+                # Bank Name
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    bank['Bank_name'] = st.text_input(
+                    header['bank_name'] = st.text_input(
                         "Bank Name", 
-                        value=bank.get('Bank_name', ''),
+                        value=header.get('bank_name', ''),
                         key=f"bank_name_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
                     if st.button("🔍", key=f"ocr_bank_name_{selected_file}", 
-                               type="primary" if is_ocr_active('Bank_details', 'Bank_name') else "secondary"):
-                        activate_ocr_field('Bank_details', 'Bank_name')
+                               type="primary" if is_ocr_active('header', 'bank_name') else "secondary"):
+                        activate_ocr_field('header', 'bank_name')
                 
+                # Bank Account No
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    bank['Bank_acc_no'] = st.text_input(
+                    header['bank_acc_no'] = st.text_input(
                         "Bank Account No", 
-                        value=bank.get('Bank_acc_no', ''),
-                        key=f"bank_acc_{selected_file}"
+                        value=header.get('bank_acc_no', ''),
+                        key=f"bank_acc_no_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_bank_acc_{selected_file}", 
-                               type="primary" if is_ocr_active('Bank_details', 'Bank_acc_no') else "secondary"):
-                        activate_ocr_field('Bank_details', 'Bank_acc_no')
+                    if st.button("🔍", key=f"ocr_bank_acc_no_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'bank_acc_no') else "secondary"):
+                        activate_ocr_field('header', 'bank_acc_no')
                 
+                # Bank Routing
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    bank['Bank_routing_no'] = st.text_input(
-                        "Bank Routing No", 
-                        value=bank.get('Bank_routing_no', ''),
+                    header['bank_routing'] = st.text_input(
+                        "Bank Routing", 
+                        value=header.get('bank_routing', ''),
                         key=f"bank_routing_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
                     if st.button("🔍", key=f"ocr_bank_routing_{selected_file}", 
-                               type="primary" if is_ocr_active('Bank_details', 'Bank_routing_no') else "secondary"):
-                        activate_ocr_field('Bank_details', 'Bank_routing_no')
+                               type="primary" if is_ocr_active('header', 'bank_routing') else "secondary"):
+                        activate_ocr_field('header', 'bank_routing')
                 
+                # Bank SWIFT
                 col_input, col_btn = st.columns([5, 1])
                 with col_input:
-                    bank['Swift_code'] = st.text_input(
-                        "SWIFT Code", 
-                        value=bank.get('Swift_code', ''),
-                        key=f"swift_{selected_file}"
+                    header['bank_swift'] = st.text_input(
+                        "Bank SWIFT", 
+                        value=header.get('bank_swift', ''),
+                        key=f"bank_swift_{selected_file}"
                     )
                 with col_btn:
                     st.markdown("<br>", unsafe_allow_html=True)
-                    if st.button("🔍", key=f"ocr_swift_{selected_file}", 
-                               type="primary" if is_ocr_active('Bank_details', 'Swift_code') else "secondary"):
-                        activate_ocr_field('Bank_details', 'Swift_code')
+                    if st.button("🔍", key=f"ocr_bank_swift_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'bank_swift') else "secondary"):
+                        activate_ocr_field('header', 'bank_swift')
                 
-                gt_parse['Bank_details'] = bank
+                # Bank Account Name
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    header['bank_acc_name'] = st.text_input(
+                        "Bank Account Name", 
+                        value=header.get('bank_acc_name', ''),
+                        key=f"bank_acc_name_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_bank_acc_name_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'bank_acc_name') else "secondary"):
+                        activate_ocr_field('header', 'bank_acc_name')
+                
+                # Bank Branch
+                col_input, col_btn = st.columns([5, 1])
+                with col_input:
+                    header['bank_branch'] = st.text_input(
+                        "Bank Branch", 
+                        value=header.get('bank_branch', ''),
+                        key=f"bank_branch_{selected_file}"
+                    )
+                with col_btn:
+                    st.markdown("<br>", unsafe_allow_html=True)
+                    if st.button("🔍", key=f"ocr_bank_branch_{selected_file}", 
+                               type="primary" if is_ocr_active('header', 'bank_branch') else "secondary"):
+                        activate_ocr_field('header', 'bank_branch')
+                
+                gt_parse['header'] = header
             
-            # TAB 4: Line Items
+            # TAB 4: Items
             with tab4:
                 current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
-                line_items = current_gt_parse.get('Line_items', [])
+                items = current_gt_parse.get('items', [])
                 
                 # Add/Remove row buttons
                 col_add, col_remove = st.columns([1, 1])
                 with col_add:
-                    if st.button("➕ Add New Row", key=f"add_row_{selected_file}", use_container_width=True):
+                    if st.button("➕ Add New Item", key=f"add_item_{selected_file}", use_container_width=True):
                         if not st.session_state.button_clicked:
                             st.session_state.button_clicked = True
-                            new_row = {
-                                "Po_number": "", "Invoice_no": "", "Other_doc_ref_no": "",
-                                "Invoice_date": "", "Invoice_amount_FCY": "",
-                                "Amount_paid_for_each_invoice": "", "Outstanding_balance_FCY": "",
-                                "Discounts_taken_FCY": "", "Adjustments(without_holding_tax)_FCY": "",
-                                "Descriptions": ""
+                            new_item = {
+                                "descriptions": "", "SKU": "", "quantity": "",
+                                "unit_price": "", "amount": "", "tax": "", "Line_total": ""
                             }
                             current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
-                            current_line_items = current_gt_parse.get('Line_items', [])
-                            current_line_items.append(new_row)
-                            current_gt_parse['Line_items'] = current_line_items
+                            current_items = current_gt_parse.get('items', [])
+                            current_items.append(new_item)
+                            current_gt_parse['items'] = current_items
                             st.session_state.edited_data[selected_file]['gt_parse'] = current_gt_parse
                             st.session_state.modified_indices.add(selected_file)
 
-                            # Ensure the newly added row's expander is open
-                            new_idx = len(current_line_items) - 1
+                            new_idx = len(current_items) - 1
                             expander_key_new = f"line_item_expander_{selected_file}_{new_idx}"
                             st.session_state[expander_key_new] = True
 
                             st.rerun()
                 
                 with col_remove:
-                    if st.button("➖ Remove Last Row", key=f"remove_row_{selected_file}", 
-                               disabled=(len(line_items) == 0), use_container_width=True):
-                        if not st.session_state.button_clicked and len(line_items) > 0:
+                    if st.button("➖ Remove Last Item", key=f"remove_item_{selected_file}", 
+                               disabled=(len(items) == 0), use_container_width=True):
+                        if not st.session_state.button_clicked and len(items) > 0:
                             st.session_state.button_clicked = True
                             current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
-                            current_line_items = current_gt_parse.get('Line_items', [])
-                            N = len(current_line_items)
-                            current_line_items.pop()
-                            current_gt_parse['Line_items'] = current_line_items
+                            current_items = current_gt_parse.get('items', [])
+                            N = len(current_items)
+                            current_items.pop()
+                            current_gt_parse['items'] = current_items
                             st.session_state.edited_data[selected_file]['gt_parse'] = current_gt_parse
                             st.session_state.modified_indices.add(selected_file)
 
-                            # Remove the expander flag for the popped row (if present)
                             popped_idx = N - 1
                             expander_key_popped = f"line_item_expander_{selected_file}_{popped_idx}"
                             if expander_key_popped in st.session_state:
@@ -1021,178 +1116,127 @@ elif st.session_state.page == 'viewer':
                 if st.session_state.button_clicked:
                     st.session_state.button_clicked = False
                 
-                # Display each row as an expander with OCR buttons
                 current_gt_parse = st.session_state.edited_data[selected_file].get('gt_parse', {})
-                line_items = current_gt_parse.get('Line_items', [])
+                items = current_gt_parse.get('items', [])
                 
-                if line_items:
-                    for idx, item in enumerate(line_items):
-                        # Use a persistent session_state flag so expansion state is preserved across reruns.
+                if items:
+                    for idx, item in enumerate(items):
                         expander_key = f"line_item_expander_{selected_file}_{idx}"
                         expanded_default = st.session_state.get(expander_key, False)
 
-                        # Note: do NOT pass a 'key' arg to st.expander to maintain compatibility; control expanded via session_state flag.
-                        with st.expander(f"**Row {idx + 1}** - Invoice: {item.get('Invoice_no', 'N/A')}", expanded=expanded_default):
-                            # PO Number
-                            col_input, col_btn = st.columns([5, 1])
-                            with col_input:
-                                item['Po_number'] = st.text_input(
-                                    "PO Number", 
-                                    value=item.get('Po_number', ''),
-                                    key=f"po_num_{selected_file}_{idx}"
-                                )
-                            with col_btn:
-                                st.markdown("<br>", unsafe_allow_html=True)
-                                if st.button("🔍", key=f"ocr_po_{selected_file}_{idx}", 
-                                           type="primary" if is_ocr_active('Line_items', 'Po_number', idx) else "secondary"):
-                                    # ensure expander stays open when user explicitly requests OCR
-                                    st.session_state[expander_key] = True
-                                    activate_ocr_field('Line_items', 'Po_number', idx)
-                            
-                            # Invoice No
-                            col_input, col_btn = st.columns([5, 1])
-                            with col_input:
-                                item['Invoice_no'] = st.text_input(
-                                    "Invoice No", 
-                                    value=item.get('Invoice_no', ''),
-                                    key=f"inv_no_{selected_file}_{idx}"
-                                )
-                            with col_btn:
-                                st.markdown("<br>", unsafe_allow_html=True)
-                                if st.button("🔍", key=f"ocr_inv_{selected_file}_{idx}", 
-                                           type="primary" if is_ocr_active('Line_items', 'Invoice_no', idx) else "secondary"):
-                                    st.session_state[expander_key] = True
-                                    activate_ocr_field('Line_items', 'Invoice_no', idx)
-                            
-                            # Other Doc Ref No
-                            col_input, col_btn = st.columns([5, 1])
-                            with col_input:
-                                item['Other_doc_ref_no'] = st.text_input(
-                                    "Other Doc Ref No", 
-                                    value=item.get('Other_doc_ref_no', ''),
-                                    key=f"other_doc_{selected_file}_{idx}"
-                                )
-                            with col_btn:
-                                st.markdown("<br>", unsafe_allow_html=True)
-                                if st.button("🔍", key=f"ocr_other_{selected_file}_{idx}", 
-                                           type="primary" if is_ocr_active('Line_items', 'Other_doc_ref_no', idx) else "secondary"):
-                                    st.session_state[expander_key] = True
-                                    activate_ocr_field('Line_items', 'Other_doc_ref_no', idx)
-                            
-                            # Invoice Date
+                        with st.expander(f"**Item {idx + 1}** - {item.get('descriptions', 'N/A')[:30]}", expanded=expanded_default):
+                            # Descriptions
                             col_input, col_btn = st.columns([5, 1])
                             with col_input:
-                                item['Invoice_date'] = st.text_input(
-                                    "Invoice Date", 
-                                    value=item.get('Invoice_date', ''),
-                                    key=f"inv_date_{selected_file}_{idx}"
+                                item['descriptions'] = st.text_area(
+                                    "Descriptions", 
+                                    value=item.get('descriptions', ''),
+                                    key=f"desc_{selected_file}_{idx}",
+                                    height=60
                                 )
                             with col_btn:
                                 st.markdown("<br>", unsafe_allow_html=True)
-                                if st.button("🔍", key=f"ocr_inv_date_{selected_file}_{idx}", 
-                                           type="primary" if is_ocr_active('Line_items', 'Invoice_date', idx) else "secondary"):
+                                if st.button("🔍", key=f"ocr_desc_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('items', 'descriptions', idx) else "secondary"):
                                     st.session_state[expander_key] = True
-                                    activate_ocr_field('Line_items', 'Invoice_date', idx)
+                                    activate_ocr_field('items', 'descriptions', idx)
                             
-                            # Invoice Amount FCY
+                            # SKU
                             col_input, col_btn = st.columns([5, 1])
                             with col_input:
-                                item['Invoice_amount_FCY'] = st.text_input(
-                                    "Invoice Amount FCY", 
-                                    value=item.get('Invoice_amount_FCY', ''),
-                                    key=f"inv_amt_{selected_file}_{idx}"
+                                item['SKU'] = st.text_input(
+                                    "SKU", 
+                                    value=item.get('SKU', ''),
+                                    key=f"sku_{selected_file}_{idx}"
                                 )
                             with col_btn:
                                 st.markdown("<br>", unsafe_allow_html=True)
-                                if st.button("🔍", key=f"ocr_inv_amt_{selected_file}_{idx}", 
-                                           type="primary" if is_ocr_active('Line_items', 'Invoice_amount_FCY', idx) else "secondary"):
+                                if st.button("🔍", key=f"ocr_sku_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('items', 'SKU', idx) else "secondary"):
                                     st.session_state[expander_key] = True
-                                    activate_ocr_field('Line_items', 'Invoice_amount_FCY', idx)
+                                    activate_ocr_field('items', 'SKU', idx)
                             
-                            # Amount Paid
+                            # Quantity
                             col_input, col_btn = st.columns([5, 1])
                             with col_input:
-                                item['Amount_paid_for_each_invoice'] = st.text_input(
-                                    "Amount Paid", 
-                                    value=item.get('Amount_paid_for_each_invoice', ''),
-                                    key=f"amt_paid_{selected_file}_{idx}"
+                                item['quantity'] = st.text_input(
+                                    "Quantity", 
+                                    value=item.get('quantity', ''),
+                                    key=f"qty_{selected_file}_{idx}"
                                 )
                             with col_btn:
                                 st.markdown("<br>", unsafe_allow_html=True)
-                                if st.button("🔍", key=f"ocr_amt_paid_{selected_file}_{idx}", 
-                                           type="primary" if is_ocr_active('Line_items', 'Amount_paid_for_each_invoice', idx) else "secondary"):
+                                if st.button("🔍", key=f"ocr_qty_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('items', 'quantity', idx) else "secondary"):
                                     st.session_state[expander_key] = True
-                                    activate_ocr_field('Line_items', 'Amount_paid_for_each_invoice', idx)
+                                    activate_ocr_field('items', 'quantity', idx)
                             
-                            # Outstanding Balance
+                            # Unit Price
                             col_input, col_btn = st.columns([5, 1])
                             with col_input:
-                                item['Outstanding_balance_FCY'] = st.text_input(
-                                    "Outstanding Balance FCY", 
-                                    value=item.get('Outstanding_balance_FCY', ''),
-                                    key=f"out_bal_{selected_file}_{idx}"
+                                item['unit_price'] = st.text_input(
+                                    "Unit Price", 
+                                    value=item.get('unit_price', ''),
+                                    key=f"unit_price_{selected_file}_{idx}"
                                 )
                             with col_btn:
                                 st.markdown("<br>", unsafe_allow_html=True)
-                                if st.button("🔍", key=f"ocr_out_bal_{selected_file}_{idx}", 
-                                           type="primary" if is_ocr_active('Line_items', 'Outstanding_balance_FCY', idx) else "secondary"):
+                                if st.button("🔍", key=f"ocr_unit_price_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('items', 'unit_price', idx) else "secondary"):
                                     st.session_state[expander_key] = True
-                                    activate_ocr_field('Line_items', 'Outstanding_balance_FCY', idx)
+                                    activate_ocr_field('items', 'unit_price', idx)
                             
-                            # Discounts
+                            # Amount
                             col_input, col_btn = st.columns([5, 1])
                             with col_input:
-                                item['Discounts_taken_FCY'] = st.text_input(
-                                    "Discounts Taken FCY", 
-                                    value=item.get('Discounts_taken_FCY', ''),
-                                    key=f"disc_{selected_file}_{idx}"
+                                item['amount'] = st.text_input(
+                                    "Amount", 
+                                    value=item.get('amount', ''),
+                                    key=f"amount_{selected_file}_{idx}"
                                 )
                             with col_btn:
                                 st.markdown("<br>", unsafe_allow_html=True)
-                                if st.button("🔍", key=f"ocr_disc_{selected_file}_{idx}", 
-                                           type="primary" if is_ocr_active('Line_items', 'Discounts_taken_FCY', idx) else "secondary"):
+                                if st.button("🔍", key=f"ocr_amount_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('items', 'amount', idx) else "secondary"):
                                     st.session_state[expander_key] = True
-                                    activate_ocr_field('Line_items', 'Discounts_taken_FCY', idx)
+                                    activate_ocr_field('items', 'amount', idx)
                             
-                            # Adjustments
+                            # Tax
                             col_input, col_btn = st.columns([5, 1])
                             with col_input:
-                                item['Adjustments(without_holding_tax)_FCY'] = st.text_input(
-                                    "Adjustments FCY", 
-                                    value=item.get('Adjustments(without_holding_tax)_FCY', ''),
-                                    key=f"adj_{selected_file}_{idx}"
+                                item['tax'] = st.text_input(
+                                    "Tax", 
+                                    value=item.get('tax', ''),
+                                    key=f"tax_{selected_file}_{idx}"
                                 )
                             with col_btn:
                                 st.markdown("<br>", unsafe_allow_html=True)
-                                if st.button("🔍", key=f"ocr_adj_{selected_file}_{idx}", 
-                                           type="primary" if is_ocr_active('Line_items', 'Adjustments(without_holding_tax)_FCY', idx) else "secondary"):
+                                if st.button("🔍", key=f"ocr_tax_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('items', 'tax', idx) else "secondary"):
                                     st.session_state[expander_key] = True
-                                    activate_ocr_field('Line_items', 'Adjustments(without_holding_tax)_FCY', idx)
+                                    activate_ocr_field('items', 'tax', idx)
                             
-                            # Descriptions
+                            # Line Total
                             col_input, col_btn = st.columns([5, 1])
                             with col_input:
-                                item['Descriptions'] = st.text_area(
-                                    "Descriptions", 
-                                    value=item.get('Descriptions', ''),
-                                    key=f"desc_{selected_file}_{idx}",
-                                    height=60
+                                item['Line_total'] = st.text_input(
+                                    "Line Total", 
+                                    value=item.get('Line_total', ''),
+                                    key=f"line_total_{selected_file}_{idx}"
                                 )
                             with col_btn:
                                 st.markdown("<br>", unsafe_allow_html=True)
-                                if st.button("🔍", key=f"ocr_desc_{selected_file}_{idx}", 
-                                           type="primary" if is_ocr_active('Line_items', 'Descriptions', idx) else "secondary"):
+                                if st.button("🔍", key=f"ocr_line_total_{selected_file}_{idx}", 
+                                           type="primary" if is_ocr_active('items', 'Line_total', idx) else "secondary"):
                                     st.session_state[expander_key] = True
-                                    activate_ocr_field('Line_items', 'Descriptions', idx)
+                                    activate_ocr_field('items', 'Line_total', idx)
                     
-                    # Update line items back to gt_parse
-                    current_gt_parse['Line_items'] = line_items
+                    current_gt_parse['items'] = items
                     
-                    st.markdown("**📊 Line Items Summary Table**")
+                    st.markdown("**📊 Items Summary Table**")
                     
-                    # Display summary table with index starting from 1
-                    df = pd.DataFrame(line_items)
-                    df.index = df.index + 1  # Start index from 1
+                    df = pd.DataFrame(items)
+                    df.index = df.index + 1
                     df.index.name = 'SL No'
                     
                     st.dataframe(
@@ -1201,7 +1245,7 @@ elif st.session_state.page == 'viewer':
                         height=300
                     )
                 else:
-                    st.info("No line items. Click '➕ Add New Row' to add a new row.")
+                    st.info("No items. Click '➕ Add New Item' to add a new item.")
             
             st.session_state.edited_data[selected_file]['gt_parse'] = gt_parse