diff --git a/pdf_renamer.py b/pdf_renamer.py
index 4d9d9c5..bef50a8 100644
--- a/pdf_renamer.py
+++ b/pdf_renamer.py
@@ -367,9 +367,6 @@ ALLOWED_MIME_TYPES = {
     'zip': 'application/zip'
 }
 
-# Global jobs storage (in production, use database)
-job_queue = {}
-
 def login_required(f):
     @wraps(f)
     def decorated_function(*args, **kwargs):
@@ -421,6 +418,20 @@ def allowed_file(filename, file_stream=None):
     
     return True
 
+def sanitize_segment(value):
+    """Sanitize a path segment to avoid invalid/unsafe filesystem characters."""
+    import re
+    if value is None:
+        return ''
+    cleaned = str(value)
+    # Remove path separators and other unsafe characters
+    cleaned = cleaned.replace(os.sep, ' ')
+    if os.altsep:
+        cleaned = cleaned.replace(os.altsep, ' ')
+    cleaned = re.sub(r'[<>:"/\\|?*\x00-\x1F]', ' ', cleaned)
+    cleaned = re.sub(r'\s+', ' ', cleaned).strip()
+    return cleaned
+
 def extract_names_from_pdf(pdf_path):
     reader = None
     try:
@@ -468,7 +479,11 @@ def extract_student_info_from_text(text):
         'school': '',
         'gender': ''
     }
-    lines = text.split('\n')
+    required_fields = ['first_name', 'last_name', 'grade', 'school', 'gender']
+    lines = [l.strip() for l in text.split('\n')]
+    name_re = r"[A-Z][a-zA-Z]+(?:[-'][A-Za-zA-Z]+)*"
+    def norm_name(value):
+        return value.strip().replace('"', '').title()
     
     # --- Custom patterns for failed extractions ---
     # Pattern: GenderSchoolLastName, GradeFirstName (e.g., FemaleBrookville HighMouse, 11Mickey)
@@ -510,6 +525,518 @@ def extract_student_info_from_text(text):
             extracted['grade'] = m3.group(2)
             break
 
+    # Pattern: FirstName, SchoolGradeLastName, Gender (e.g., Michael, Home School7Shuck, Male)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^([A-Z][a-z]+)$', lines[i])
+        m2 = re.match(r'^(.+?)(\d{1,2}|K)([A-Z][a-z]+)$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['first_name'] = m1.group(1)
+            extracted['school'] = m2.group(1).strip()
+            extracted['grade'] = m2.group(2)
+            extracted['last_name'] = m2.group(3)
+            extracted['gender'] = m3.group(1)
+            break
+
+    # Pattern: GradeFirstName, SchoolLastName, Gender (e.g., 9Joshua, Liberty Christian AcademyMcCain, Male)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(\d{1,2}|K)([A-Z][a-z]+)$', lines[i])
+        m2 = re.match(r'^(.+?)([A-Z][a-z]+)$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['grade'] = m1.group(1)
+            extracted['first_name'] = m1.group(2)
+            extracted['school'] = m2.group(1).strip()
+            extracted['last_name'] = m2.group(2)
+            extracted['gender'] = m3.group(1)
+            break
+
+    # Pattern: School, GenderFirstName, GradeLastName (e.g., Other (Not Listed), FemaleSophia, 11Porter)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(.+)$', lines[i])
+        m2 = re.match(r'^(Female|Male)([A-Z][a-z]+)$', lines[i+1])
+        m3 = re.match(r'^(\d{1,2}|K)([A-Z][a-z]+)$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['school'] = m1.group(1).strip()
+            extracted['gender'] = m2.group(1)
+            extracted['first_name'] = m2.group(2)
+            extracted['grade'] = m3.group(1)
+            extracted['last_name'] = m3.group(2)
+            return extracted
+
+    # Pattern: GenderGradeLastNameFirstName, School (e.g., Female11SpearAva, Home School)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(Female|Male)(\d{1,2}|K)([A-Z][a-z]+)([A-Z][a-z]+)$', lines[i])
+        m2 = re.match(r'^(.+)$', lines[i+1])
+        if m1 and m2:
+            extracted['gender'] = m1.group(1)
+            extracted['grade'] = m1.group(2)
+            extracted['last_name'] = m1.group(3)
+            extracted['first_name'] = m1.group(4)
+            extracted['school'] = m2.group(1).strip()
+            break
+
+    # Pattern: GenderGradeLastName, SchoolFirstName (e.g., Male11Seckman, New CovenantMicharl)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(Female|Male)(\d{1,2}|K)([A-Z][a-z]+)$', lines[i])
+        m2 = re.match(r'^(.+?)([A-Z][a-z]+)$', lines[i+1])
+        if m1 and m2:
+            extracted['gender'] = m1.group(1)
+            extracted['grade'] = m1.group(2)
+            extracted['last_name'] = m1.group(3)
+            extracted['school'] = m2.group(1).strip()
+            extracted['first_name'] = m2.group(2)
+            break
+
+    # Pattern: GenderLastName, GradeFirstName, School (e.g., MaleKirk, 10Jaihden "JJ", Home School)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(Female|Male)([A-Z][a-z]+)$', lines[i])
+        m2 = re.match(r'^(\d{1,2}|K)([A-Z][a-z]+)', lines[i+1])
+        m3 = re.match(r'^(.+)$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['gender'] = m1.group(1)
+            extracted['last_name'] = m1.group(2)
+            extracted['grade'] = m2.group(1)
+            extracted['first_name'] = m2.group(2)
+            extracted['school'] = m3.group(1).strip()
+            break
+
+    # Pattern: FirstName, Grade, SchoolLastName, Gender (e.g., Tracey, 12, Other (Not Listed)Lindsay, Female)
+    for i in range(len(lines) - 3):
+        m1 = re.match(r'^([A-Z][a-z]+)$', lines[i])
+        m2 = re.match(r'^(\d{1,2}|K)$', lines[i+1])
+        m3 = re.match(r'^(.+?)([A-Z][a-z]+)$', lines[i+2])
+        m4 = re.match(r'^(Female|Male)$', lines[i+3])
+        if m1 and m2 and m3 and m4:
+            extracted['first_name'] = m1.group(1)
+            extracted['grade'] = m2.group(1)
+            extracted['school'] = m3.group(1).strip()
+            extracted['last_name'] = m3.group(2)
+            extracted['gender'] = m4.group(1)
+            break
+
+    # Pattern: GenderGrade, SchoolLastNameFirstName (e.g., Female7, Brookville MiddleBrownMicah)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(Female|Male)(\d{1,2}|K)$', lines[i])
+        m2 = re.match(r'^(.+?)([A-Z][a-z]+)([A-Z][a-z]+)$', lines[i+1])
+        if m1 and m2:
+            extracted['gender'] = m1.group(1)
+            extracted['grade'] = m1.group(2)
+            extracted['school'] = m2.group(1).strip()
+            extracted['last_name'] = m2.group(2)
+            extracted['first_name'] = m2.group(3)
+            break
+
+    # Pattern: GenderSchoolGradeFirstName, LastName (e.g., FemaleRustburg High9Lexi, Wilson)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(Female|Male)(.+?)(\d{1,2}|K)(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(' + name_re + r')$', lines[i+1])
+        if m1 and m2:
+            extracted['gender'] = m1.group(1)
+            extracted['school'] = m1.group(2).strip()
+            extracted['grade'] = m1.group(3)
+            extracted['first_name'] = m1.group(4)
+            extracted['last_name'] = m2.group(1)
+            break
+
+    # Pattern: GenderSchoolGradeLastNameFirstName (e.g., MaleLiberty Christian Academy11SnakenbergBryson)
+    for i in range(len(lines) - 0):
+        m1 = re.match(r'^(Female|Male)(.+?)(\d{1,2}|K)([A-Z][a-z]+)([A-Z][a-z]+)$', lines[i])
+        if m1:
+            extracted['gender'] = m1.group(1)
+            extracted['school'] = m1.group(2).strip()
+            extracted['grade'] = m1.group(3)
+            extracted['last_name'] = m1.group(4)
+            extracted['first_name'] = m1.group(5)
+            break
+
+    # Pattern: SchoolLastNameFirstName, Grade, Gender (e.g., Monelison MiddleCarmodyLandon, 7, Male)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(.+?)([A-Z][a-z]+)([A-Z][a-z]+)$', lines[i])
+        m2 = re.match(r'^(\d{1,2}|K)$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['school'] = m1.group(1).strip()
+            extracted['last_name'] = m1.group(2)
+            extracted['first_name'] = m1.group(3)
+            extracted['grade'] = m2.group(1)
+            extracted['gender'] = m3.group(1)
+            break
+
+    # Pattern: FirstName, GradeLastName, School, Gender (e.g., Jesse, 6McGinniss, Timberlake Christian, Male)
+    for i in range(len(lines) - 3):
+        m1 = re.match(r'^([A-Z][a-z]+)$', lines[i])
+        m2 = re.match(r'^(\d{1,2}|K)(' + name_re + r')$', lines[i+1])
+        m3 = re.match(r'^(.+)$', lines[i+2])
+        m4 = re.match(r'^(Female|Male)$', lines[i+3])
+        if m1 and m2 and m3 and m4:
+            extracted['first_name'] = m1.group(1)
+            extracted['grade'] = m2.group(1)
+            extracted['last_name'] = m2.group(2)
+            extracted['school'] = m3.group(1).strip()
+            extracted['gender'] = m4.group(1)
+            break
+
+    # Pattern: GenderFirstName, LastName, Grade, School (e.g., MaleBenjamin, Byrne-Cox, 12, Home School)
+    for i in range(len(lines) - 3):
+        m1 = re.match(r'^(Female|Male)([A-Z][a-z]+)$', lines[i])
+        m2 = re.match(r'^(' + name_re + r')$', lines[i+1])
+        m3 = re.match(r'^(\d{1,2}|K)$', lines[i+2])
+        m4 = re.match(r'^(.+)$', lines[i+3])
+        if m1 and m2 and m3 and m4:
+            extracted['gender'] = m1.group(1)
+            extracted['first_name'] = m1.group(2)
+            extracted['last_name'] = m2.group(1)
+            extracted['grade'] = m3.group(1)
+            extracted['school'] = m4.group(1).strip()
+            break
+
+    # Pattern: FirstName, LastName, Grade, GenderSchool (e.g., Andrew, Servin-Hernandez, 8, MaleSandusky Middle)
+    for i in range(len(lines) - 3):
+        m1 = re.match(r'^(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(' + name_re + r')$', lines[i+1])
+        m3 = re.match(r'^(\d{1,2}|K)$', lines[i+2])
+        m4 = re.match(r'^(Female|Male)(.+)$', lines[i+3])
+        if m1 and m2 and m3 and m4:
+            extracted['first_name'] = m1.group(1)
+            extracted['last_name'] = m2.group(1)
+            extracted['grade'] = m3.group(1)
+            extracted['gender'] = m4.group(1)
+            extracted['school'] = m4.group(2).strip()
+            break
+
+    # Pattern: SchoolGradeFirstName, GenderLastName (e.g., Temple Christian6Morgan, MaleChristian)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(.+?)(\d{1,2}|K)(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(Female|Male)(' + name_re + r')$', lines[i+1])
+        if m1 and m2:
+            extracted['school'] = m1.group(1).strip()
+            extracted['grade'] = m1.group(2)
+            extracted['first_name'] = m1.group(3)
+            extracted['gender'] = m2.group(1)
+            extracted['last_name'] = m2.group(2)
+            break
+
+    # Pattern: GenderGradeLastName, SchoolFirstName (e.g., Male9Bieri, Liberty Christian AcademySJ)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(Female|Male)(\d{1,2}|K)(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(.+?)(' + name_re + r')$', lines[i+1])
+        if m1 and m2:
+            extracted['gender'] = m1.group(1)
+            extracted['grade'] = m1.group(2)
+            extracted['last_name'] = m1.group(3)
+            extracted['school'] = m2.group(1).strip()
+            extracted['first_name'] = m2.group(2)
+            break
+
+    # Pattern: SchoolLastNameFirstName, GenderGrade (e.g., Home SchoolBethelAbigail, Female7)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(.+?)(' + name_re + r')(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(Female|Male)(\d{1,2}|K)$', lines[i+1])
+        if m1 and m2:
+            extracted['school'] = m1.group(1).strip()
+            extracted['last_name'] = m1.group(2)
+            extracted['first_name'] = m1.group(3)
+            extracted['gender'] = m2.group(1)
+            extracted['grade'] = m2.group(2)
+            break
+
+    # Pattern: SchoolLastName, GradeFirstName, Gender (e.g., Other (Not Listed)Caballero, 7Mason, Male)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(.+?)(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(\d{1,2}|K)(' + name_re + r')$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['school'] = m1.group(1).strip()
+            extracted['last_name'] = m1.group(2)
+            extracted['grade'] = m2.group(1)
+            extracted['first_name'] = m2.group(2)
+            extracted['gender'] = m3.group(1)
+            break
+
+    # Pattern: GradeLastName, School, GenderFirstName (e.g., 6Petty, Other (Not Listed), FemaleAnia)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(\d{1,2}|K)(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(.+)$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)(' + name_re + r')$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['grade'] = m1.group(1)
+            extracted['last_name'] = m1.group(2)
+            extracted['school'] = m2.group(1).strip()
+            extracted['gender'] = m3.group(1)
+            extracted['first_name'] = m3.group(2)
+            break
+
+    # Pattern: Grade, SchoolLastNameFirstName, Gender (e.g., 9, Home SchoolSpearCharlotte, Female)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(\d{1,2}|K)$', lines[i])
+        m2 = re.match(r'^(.+?)(' + name_re + r')(' + name_re + r')$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['grade'] = m1.group(1)
+            extracted['school'] = m2.group(1).strip()
+            extracted['last_name'] = m2.group(2)
+            extracted['first_name'] = m2.group(3)
+            extracted['gender'] = m3.group(1)
+            break
+
+    # Pattern: Grade, GenderSchoolLastNameFirstName (e.g., 9, FemaleHome SchoolHeagyPaige)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(\d{1,2}|K)$', lines[i])
+        m2 = re.match(r'^(Female|Male)(.+?)(' + name_re + r')(' + name_re + r')$', lines[i+1])
+        if m1 and m2:
+            extracted['grade'] = m1.group(1)
+            extracted['gender'] = m2.group(1)
+            extracted['school'] = m2.group(2).strip()
+            extracted['last_name'] = m2.group(3)
+            extracted['first_name'] = m2.group(4)
+            break
+
+    # Pattern: GenderGradeLastName FirstName, School (e.g., Male7Trochesset Oliver, Liberty Christian Academy)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(Female|Male)(\d{1,2}|K)(' + name_re + r')\s+(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(.+)$', lines[i+1])
+        if m1 and m2:
+            extracted['gender'] = m1.group(1)
+            extracted['grade'] = m1.group(2)
+            extracted['last_name'] = m1.group(3)
+            extracted['first_name'] = m1.group(4)
+            extracted['school'] = m2.group(1).strip()
+            break
+
+    # Pattern: FirstName, SchoolLastName, Grade, Gender (e.g., Neale, Other (Not Listed)Hans, 9, Male)
+    for i in range(len(lines) - 3):
+        m1 = re.match(r'^(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(.+?)(' + name_re + r')$', lines[i+1])
+        m3 = re.match(r'^(\d{1,2}|K)$', lines[i+2])
+        m4 = re.match(r'^(Female|Male)$', lines[i+3])
+        if m1 and m2 and m3 and m4:
+            extracted['first_name'] = m1.group(1)
+            extracted['school'] = m2.group(1).strip()
+            extracted['last_name'] = m2.group(2)
+            extracted['grade'] = m3.group(1)
+            extracted['gender'] = m4.group(1)
+            break
+
+    # Pattern: GradeLastNameFirstName, GenderSchool (e.g., 11DorsettJaxon, MaleLiberty Christian Academy)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(\d{1,2}|K)(' + name_re + r')(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(Female|Male)(.+)$', lines[i+1])
+        if m1 and m2:
+            extracted['grade'] = m1.group(1)
+            extracted['last_name'] = m1.group(2)
+            extracted['first_name'] = m1.group(3)
+            extracted['gender'] = m2.group(1)
+            extracted['school'] = m2.group(2).strip()
+            break
+
+    # Pattern: FirstName, Grade, GenderSchoolLastName (e.g., Neale, 6, MaleOther (Not Listed)Sebastian)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(\d{1,2}|K)$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)(.+?)(' + name_re + r')$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['first_name'] = m1.group(1)
+            extracted['grade'] = m2.group(1)
+            extracted['gender'] = m3.group(1)
+            extracted['school'] = m3.group(2).strip()
+            extracted['last_name'] = m3.group(3)
+            break
+
+    # Pattern: Name, Grade, GenderSchool (missing first or last name)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^([A-Za-z]+)$', lines[i])
+        m2 = re.match(r'^(\d{1,2}|K)$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)(.+)$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['last_name'] = norm_name(m1.group(1))
+            extracted['first_name'] = 'Unknown'
+            extracted['grade'] = m2.group(1)
+            extracted['gender'] = m3.group(1)
+            extracted['school'] = m3.group(2).strip()
+            return extracted
+
+    # Pattern: GradeLastNameFirstName, School, Gender (e.g., 12ClarkAva, Jefferson Forest High, Female)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(\d{1,2}|K)(' + name_re + r')(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(.+)$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['grade'] = m1.group(1)
+            extracted['last_name'] = m1.group(2)
+            extracted['first_name'] = m1.group(3)
+            extracted['school'] = m2.group(1).strip()
+            extracted['gender'] = m3.group(1)
+            break
+
+    # Pattern: LastName, Grade, GenderFirstName, School (e.g., Johnke, 6, FemaleKyla, Other (Not Listed))
+    for i in range(len(lines) - 3):
+        m1 = re.match(r'^(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(\d{1,2}|K)$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)(' + name_re + r')$', lines[i+2])
+        m4 = re.match(r'^(.+)$', lines[i+3])
+        if m1 and m2 and m3 and m4:
+            extracted['last_name'] = m1.group(1)
+            extracted['grade'] = m2.group(1)
+            extracted['gender'] = m3.group(1)
+            extracted['first_name'] = m3.group(2)
+            extracted['school'] = m4.group(1).strip()
+            break
+
+    # Pattern: SchoolFirstName (case-insensitive), GenderGradeLastName (case-insensitive)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(.+?)([A-Za-z]+)$', lines[i], re.IGNORECASE)
+        m2 = re.match(r'^(Female|Male)(\d{1,2}|K)([A-Za-z]+)$', lines[i+1], re.IGNORECASE)
+        if m1 and m2:
+            extracted['school'] = m1.group(1).strip()
+            extracted['first_name'] = norm_name(m1.group(2))
+            extracted['gender'] = m2.group(1).capitalize()
+            extracted['grade'] = m2.group(2)
+            extracted['last_name'] = norm_name(m2.group(3))
+            break
+
+    # Pattern: LastName, GenderSchoolGradeFirstName (e.g., Porter, MaleLiberty Christian Academy8Samuel)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(Female|Male)(.+?)(\d{1,2}|K)(' + name_re + r')$', lines[i+1])
+        if m1 and m2:
+            extracted['last_name'] = m1.group(1)
+            extracted['gender'] = m2.group(1)
+            extracted['school'] = m2.group(2).strip()
+            extracted['grade'] = m2.group(3)
+            extracted['first_name'] = m2.group(4)
+            break
+
+    # Pattern: LastName, GenderFirstName, Grade, School (e.g., Brainard, FemaleEmily, 10, Other (Not Listed))
+    for i in range(len(lines) - 3):
+        m1 = re.match(r'^(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(Female|Male)(' + name_re + r')$', lines[i+1])
+        m3 = re.match(r'^(\d{1,2}|K)$', lines[i+2])
+        m4 = re.match(r'^(.+)$', lines[i+3])
+        if m1 and m2 and m3 and m4:
+            extracted['last_name'] = m1.group(1)
+            extracted['gender'] = m2.group(1)
+            extracted['first_name'] = m2.group(2)
+            extracted['grade'] = m3.group(1)
+            extracted['school'] = m4.group(1).strip()
+            break
+
+    # Pattern: LastName, GenderSchoolGradeFirstName (e.g., Mays, FemaleAmherst High9Kara)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(Female|Male)(.+?)(\d{1,2}|K)(' + name_re + r')$', lines[i+1])
+        if m1 and m2:
+            extracted['last_name'] = m1.group(1)
+            extracted['gender'] = m2.group(1)
+            extracted['school'] = m2.group(2).strip()
+            extracted['grade'] = m2.group(3)
+            extracted['first_name'] = m2.group(4)
+            break
+
+    # Pattern: GradeLastName, GenderSchoolFirstName (e.g., 10Davis, FemaleE.C. Glass HighTa'Mya)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(\d{1,2}|K)(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(Female|Male)(.+?)(' + name_re + r')$', lines[i+1])
+        if m1 and m2:
+            extracted['grade'] = m1.group(1)
+            extracted['last_name'] = m1.group(2)
+            extracted['gender'] = m2.group(1)
+            extracted['school'] = m2.group(2).strip()
+            extracted['first_name'] = m2.group(3)
+            break
+
+    # Pattern: School, GenderLastName, GradeFirstName (e.g., Liberty Christian Academy, MaleHagner, 9Jarad Jr.)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(.+)$', lines[i])
+        m2 = re.match(r'^(Female|Male)(' + name_re + r')$', lines[i+1])
+        m3 = re.match(r'^(\d{1,2}|K)(' + name_re + r')', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['school'] = m1.group(1).strip()
+            extracted['gender'] = m2.group(1)
+            extracted['last_name'] = m2.group(2)
+            extracted['grade'] = m3.group(1)
+            extracted['first_name'] = m3.group(2)
+            break
+
+    # Pattern: GenderLastName, SchoolGradeFirstName (e.g., MaleMartin, Monelison Middle7Levi)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(Female|Male)(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(.+?)(\d{1,2}|K)(' + name_re + r')$', lines[i+1])
+        if m1 and m2:
+            extracted['gender'] = m1.group(1)
+            extracted['last_name'] = m1.group(2)
+            extracted['school'] = m2.group(1).strip()
+            extracted['grade'] = m2.group(2)
+            extracted['first_name'] = m2.group(3)
+            break
+
+    # Pattern: FirstName, School, GenderGradeLastName (e.g., Lillian, Other (Not Listed), Female6Buchanan)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(.+)$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)(\d{1,2}|K)(' + name_re + r')$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['first_name'] = m1.group(1)
+            extracted['school'] = m2.group(1).strip()
+            extracted['gender'] = m3.group(1)
+            extracted['grade'] = m3.group(2)
+            extracted['last_name'] = m3.group(3)
+            break
+
+    # Pattern: FirstName, School, GenderLastName, Grade (e.g., Luke, Other (Not Listed), MaleHottle, 11)
+    for i in range(len(lines) - 3):
+        m1 = re.match(r'^(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(.+)$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)(' + name_re + r')$', lines[i+2])
+        m4 = re.match(r'^(\d{1,2}|K)$', lines[i+3])
+        if m1 and m2 and m3 and m4:
+            extracted['first_name'] = m1.group(1)
+            extracted['school'] = m2.group(1).strip()
+            extracted['gender'] = m3.group(1)
+            extracted['last_name'] = m3.group(2)
+            extracted['grade'] = m4.group(1)
+            break
+
+    # Pattern: SchoolGradeFirstName, LastName, Gender (e.g., Monelison Middle8Laila, Mays, Female)
+    for i in range(len(lines) - 2):
+        m1 = re.match(r'^(.+?)(\d{1,2}|K)(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(' + name_re + r')$', lines[i+1])
+        m3 = re.match(r'^(Female|Male)$', lines[i+2])
+        if m1 and m2 and m3:
+            extracted['school'] = m1.group(1).strip()
+            extracted['grade'] = m1.group(2)
+            extracted['first_name'] = m1.group(3)
+            extracted['last_name'] = m2.group(1)
+            extracted['gender'] = m3.group(1)
+            break
+
+    # Pattern: GradeLastNameFirstName (multi-word first), GenderSchool (e.g., 6HoskinsMary Emma, FemaleNew Covenant)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(\d{1,2}|K)(' + name_re + r')(.+)$', lines[i])
+        m2 = re.match(r'^(Female|Male)(.+)$', lines[i+1])
+        if m1 and m2:
+            extracted['grade'] = m1.group(1)
+            extracted['last_name'] = m1.group(2)
+            extracted['first_name'] = m1.group(3).strip()
+            extracted['gender'] = m2.group(1)
+            extracted['school'] = m2.group(2).strip()
+            break
+
+    # Pattern: SchoolGradeLastNameFirstName, Gender (e.g., Brookville Middle6DraganEmily, Female)
+    for i in range(len(lines) - 1):
+        m1 = re.match(r'^(.+?)(\d{1,2}|K)(' + name_re + r')(' + name_re + r')$', lines[i])
+        m2 = re.match(r'^(Female|Male)$', lines[i+1])
+        if m1 and m2:
+            extracted['school'] = m1.group(1).strip()
+            extracted['grade'] = m1.group(2)
+            extracted['last_name'] = m1.group(3)
+            extracted['first_name'] = m1.group(4)
+            extracted['gender'] = m2.group(1)
+            break
+
+    if all(extracted.get(field) for field in required_fields):
+        return extracted
+
     # Enhanced preprocessing: aggressively split lines with multiple fields stuck together
     processed_lines = []
     skip_headers = [
@@ -604,7 +1131,7 @@ def extract_student_info_from_text(text):
             processed_lines.append(m5.group(1))
             processed_lines.append(m5.group(2).strip())
             processed_lines.append(m5.group(3))
-            processed_lines.append(m4.group(4))
+            processed_lines.append(m5.group(4))
             continue
         # Pattern: Grade + Gender + School + FirstName + LastName (e.g., '10FemaleHomeSchoolAbigailDober')
         m6 = re.match(r'^(\d{1,2}|K)(Female|Male)([A-Z][a-z]+(?: [A-Z][a-z]+)*)([A-Z][a-z]+)([A-Z][a-z]+)$', orig_line)
@@ -765,16 +1292,37 @@ def extract_student_info_from_text(text):
     # Post-processing and validation
     required_fields = ['first_name', 'last_name', 'grade', 'school', 'gender']
     if all(extracted.get(field) for field in required_fields):
-        # Clean up school name: remove any trailing capitalized names or numbers
-        extracted['school'] = re.sub(r'([A-Z][a-z]+|\d+)$', '', extracted['school']).strip()
+        # Clean up school name: remove trailing student name or stray numbers, but keep valid suffixes
+        school_clean = extracted['school'].strip()
+        suffix_keep = {'School', 'Academy', 'Middle', 'High', 'Elementary', 'Christian', 'Catholic', 'Public', 'Private'}
+        parts = school_clean.split()
+        if parts:
+            last_part = parts[-1]
+            first_name = extracted['first_name'] or ''
+            last_name = extracted['last_name'] or ''
+            if last_part.isdigit():
+                parts = parts[:-1]
+            elif last_part in {first_name, last_name}:
+                parts = parts[:-1]
+            elif last_part not in suffix_keep and last_part in {first_name.title(), last_name.title()}:
+                parts = parts[:-1]
+        school_clean = ' '.join(parts).strip()
         # Remove any names from school if they match first/last name
         for n in [extracted['first_name'], extracted['last_name']]:
             if n:
-                extracted['school'] = re.sub(rf'\b{re.escape(n)}\b', '', extracted['school']).strip()
-        # Final check: if school is just a number or a name, discard it
-        if re.fullmatch(r'(\d{1,2}|K)', extracted['school']) or re.fullmatch(r'([A-Z][a-z]+|[A-Z\-]+|[A-Z][a-z]+\s[A-Z][a-z]+)+', extracted['school']):
+                school_clean = re.sub(rf'\b{re.escape(n)}\b', '', school_clean).strip()
+        extracted['school'] = school_clean
+        # Final check: discard invalid schools (pure grade or same as student name)
+        school_clean = extracted['school'].strip()
+        if re.fullmatch(r'(\d{1,2}|K)', school_clean):
             extracted['school'] = ''
-        extracted['school'] = extracted['school'].strip()
+        else:
+            first_lower = extracted['first_name'].lower() if extracted['first_name'] else ''
+            last_lower = extracted['last_name'].lower() if extracted['last_name'] else ''
+            if school_clean.lower() in {first_lower, last_lower}:
+                extracted['school'] = ''
+            else:
+                extracted['school'] = school_clean
         return extracted
 
     # Fallback: Try to extract fields from any order in the lines (for highly concatenated or out-of-order data)
@@ -826,6 +1374,7 @@ def extract_student_info_from_text(text):
 
 def process_job(job_id, files):
     temp_extract_dirs = []
+    job_failed = False
     try:
         print("=== DEBUG: process_job STARTED ===")
         with job_lock:
@@ -833,7 +1382,7 @@ def process_job(job_id, files):
             job_queue[job_id]['progress'] = 'Starting job processing...'
         save_jobs()  # Persist initial progress
         # Create base Episode directory for this job
-        episode_dir = os.path.join(app.config['UPLOAD_FOLDER'], 'Episode')
+        episode_dir = os.path.join(app.config['UPLOAD_FOLDER'], f'Episode_{job_id}')
         os.makedirs(episode_dir, exist_ok=True)
         processed_files = []
         skipped_dir = os.path.join(episode_dir, 'Skipped')
@@ -923,15 +1472,16 @@ def process_job(job_id, files):
                                     job_queue[job_id]['progress'] = f'Extracted data for {pdf_info["first_name"]} {pdf_info["last_name"]}'
                                     print(f"DEBUG: Successfully extracted data for {pdf_info['first_name']} {pdf_info['last_name']}")
                                     # Create folder structure: Episode/School/Grade/Gender/
-                                    school_dir = os.path.join(episode_dir, pdf_info['school'])
-                                    grade_dir = os.path.join(school_dir, pdf_info['grade'])
-                                    gender_dir = os.path.join(grade_dir, pdf_info['gender'])
+                                    school_dir = os.path.join(episode_dir, sanitize_segment(pdf_info['school']) or 'Unknown_School')
+                                    grade_dir = os.path.join(school_dir, sanitize_segment(pdf_info['grade']) or 'Unknown_Grade')
+                                    gender_dir = os.path.join(grade_dir, sanitize_segment(pdf_info['gender']) or 'Unknown_Gender')
                                     print(f"DEBUG: Creating directories: {school_dir} -> {grade_dir} -> {gender_dir}")
                                     os.makedirs(gender_dir, exist_ok=True)
                                     print(f"DEBUG: Directories created successfully")
                                     
                                     # Move file to appropriate folder with new name
-                                    new_path = os.path.join(gender_dir, pdf_info['filename'])
+                                    safe_filename = secure_filename(pdf_info['filename']) or pdf_info['filename']
+                                    new_path = os.path.join(gender_dir, safe_filename)
                                     print(f"DEBUG: Attempting to move {pdf_path} to {new_path}")
                                     counter = 1
                                     while os.path.exists(new_path):
@@ -984,13 +1534,14 @@ def process_job(job_id, files):
                     else:
                         job_queue[job_id]['progress'] = f'Extracted data for {pdf_info["first_name"]} {pdf_info["last_name"]}'
                         # Create folder structure: Episode/School/Grade/Gender/
-                        school_dir = os.path.join(episode_dir, pdf_info['school'])
-                        grade_dir = os.path.join(school_dir, pdf_info['grade'])
-                        gender_dir = os.path.join(grade_dir, pdf_info['gender'])
+                        school_dir = os.path.join(episode_dir, sanitize_segment(pdf_info['school']) or 'Unknown_School')
+                        grade_dir = os.path.join(school_dir, sanitize_segment(pdf_info['grade']) or 'Unknown_Grade')
+                        gender_dir = os.path.join(grade_dir, sanitize_segment(pdf_info['gender']) or 'Unknown_Gender')
                         os.makedirs(gender_dir, exist_ok=True)
                         
                         # Move file to appropriate folder with new name
-                        new_filepath = os.path.join(gender_dir, pdf_info['filename'])
+                        safe_filename = secure_filename(pdf_info['filename']) or pdf_info['filename']
+                        new_filepath = os.path.join(gender_dir, safe_filename)
                         counter = 1
                         while os.path.exists(new_filepath):
                             base, ext = os.path.splitext(pdf_info['filename'])
@@ -1047,11 +1598,13 @@ def process_job(job_id, files):
         except Exception as e:
             job_queue[job_id]['progress'] = f'Error creating ZIP: {str(e)}'
             job_queue[job_id]['status'] = 'error'
+            job_failed = True
             save_jobs()  # Persist error status
             print(f"DEBUG: ZIP creation failed: {str(e)}")
         
         with job_lock:
-            job_queue[job_id]['status'] = 'completed'
+            if not job_failed:
+                job_queue[job_id]['status'] = 'completed'
             job_queue[job_id]['processed_files'] = processed_files
             # Store skipped as (filename, reason, raw_text)
             job_queue[job_id]['skipped'] = [(p[1], p[2], p[3]) for p in processed_files if p[0] == 'skipped']
@@ -1081,36 +1634,178 @@ def login():
     <!DOCTYPE html>
     <html>
     <head>
-        <title>Login</title>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>NextGenPDF - Login</title>
         <style>
-            body { font-family: Arial, sans-serif; background-color: #f4f4f4; margin: 0; padding: 20px; text-align: center; }
-            .login-container { background-color: #fff; padding: 30px; border-radius: 10px; box-shadow: 0 0 10px rgba(0,0,0,0.1); display: inline-block; margin: 20px; }
-            h1 { color: #333; }
-            .login-options { display: flex; justify-content: space-around; flex-wrap: wrap; }
-            .login-option { margin: 10px; }
-            a { color: #007bff; text-decoration: none; padding: 15px 30px; background-color: #007bff; color: white; border-radius: 5px; display: inline-block; }
-            a:hover { background-color: #0056b3; }
-            form { margin-top: 20px; }
-            input[type="text"], input[type="password"] { padding: 10px; margin: 5px; width: 200px; border: 1px solid #ccc; border-radius: 5px; }
-            input[type="submit"] { background-color: #28a745; color: white; border: none; padding: 10px 20px; border-radius: 5px; cursor: pointer; }
-            input[type="submit"]:hover { background-color: #218838; }
+            * { margin: 0; padding: 0; box-sizing: border-box; }
+            body { 
+                font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; 
+                background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); 
+                min-height: 100vh; 
+                display: flex; 
+                justify-content: center; 
+                align-items: center; 
+                padding: 20px;
+            }
+            .login-wrapper { 
+                background: white; 
+                border-radius: 15px; 
+                box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3); 
+                overflow: hidden; 
+                max-width: 900px; 
+                width: 100%;
+                display: grid;
+                grid-template-columns: 1fr 1fr;
+            }
+            .login-left { 
+                background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); 
+                padding: 60px 40px; 
+                display: flex; 
+                flex-direction: column; 
+                justify-content: center; 
+                align-items: center; 
+                color: white;
+                text-align: center;
+            }
+            .login-left img { width: 180px; margin-bottom: 30px; filter: brightness(0) invert(1); }
+            .login-left h1 { font-size: 32px; margin-bottom: 15px; font-weight: 600; }
+            .login-left p { font-size: 16px; line-height: 1.6; opacity: 0.9; }
+            .login-right { 
+                padding: 60px 40px; 
+                display: flex; 
+                flex-direction: column; 
+                justify-content: center;
+            }
+            .login-right h2 { 
+                font-size: 24px; 
+                color: #333; 
+                margin-bottom: 40px; 
+                text-align: center; 
+                font-weight: 600;
+            }
+            .login-options { display: flex; flex-direction: column; gap: 20px; }
+            .login-option { }
+            .login-option h3 { 
+                font-size: 14px; 
+                color: #666; 
+                text-transform: uppercase; 
+                letter-spacing: 1px; 
+                margin-bottom: 15px; 
+                font-weight: 600;
+            }
+            .login-btn { 
+                width: 100%; 
+                padding: 14px 24px; 
+                font-size: 16px; 
+                border: none; 
+                border-radius: 8px; 
+                cursor: pointer; 
+                font-weight: 600; 
+                transition: all 0.3s ease;
+                text-decoration: none;
+                display: block;
+                text-align: center;
+            }
+            .btn-microsoft {
+                background: #0078d4;
+                color: white;
+            }
+            .btn-microsoft:hover { 
+                background: #106ebe; 
+                transform: translateY(-2px);
+                box-shadow: 0 10px 25px rgba(0, 120, 212, 0.3);
+            }
+            form { width: 100%; }
+            .form-group { margin-bottom: 15px; }
+            .form-group input { 
+                width: 100%; 
+                padding: 12px 16px; 
+                border: 1px solid #ddd; 
+                border-radius: 8px; 
+                font-size: 15px; 
+                transition: all 0.3s ease;
+                font-family: inherit;
+            }
+            .form-group input:focus { 
+                outline: none; 
+                border-color: #667eea; 
+                box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
+            }
+            .btn-admin {
+                width: 100%;
+                padding: 12px 24px;
+                background: #28a745;
+                color: white;
+                border: none;
+                border-radius: 8px;
+                font-size: 16px;
+                font-weight: 600;
+                cursor: pointer;
+                transition: all 0.3s ease;
+            }
+            .btn-admin:hover { 
+                background: #218838; 
+                transform: translateY(-2px);
+                box-shadow: 0 10px 25px rgba(40, 167, 69, 0.3);
+            }
+            .divider { 
+                text-align: center; 
+                margin: 25px 0; 
+                position: relative; 
+                color: #999;
+            }
+            .divider::before { 
+                content: ''; 
+                position: absolute; 
+                top: 50%; 
+                left: 0; 
+                right: 0; 
+                height: 1px; 
+                background: #ddd;
+            }
+            .divider span { 
+                background: white; 
+                padding: 0 10px; 
+                position: relative; 
+                font-size: 13px;
+            }
+            @media (max-width: 768px) {
+                .login-wrapper { grid-template-columns: 1fr; }
+                .login-left { padding: 40px 30px; }
+                .login-right { padding: 40px 30px; }
+                .login-left h1 { font-size: 24px; }
+            }
         </style>
     </head>
     <body>
-        <img src="/static/trbc-logo-full.png" alt="Logo" width="200">
-        <h1>PDF Renamer Login</h1>
-        <div class="login-options">
-            <div class="login-option">
-                <h2>Microsoft Entra ID</h2>
-                <a href="/entra-login">Login with Microsoft</a>
+        <div class="login-wrapper">
+            <div class="login-left">
+                <img src="/static/trbc-logo-full.png" alt="Logo">
+                <h1>NextGenPDF</h1>
+                <p>Automated PDF Organization & Renaming System</p>
             </div>
-            <div class="login-option">
-                <h2>Admin Login</h2>
-                <form method="post" action="/admin-login">
-                    <input type="text" name="username" placeholder="Username" required><br>
-                    <input type="password" name="password" placeholder="Password" required><br>
-                    <input type="submit" value="Admin Login">
-                </form>
+            <div class="login-right">
+                <h2>Welcome Back</h2>
+                <div class="login-options">
+                    <div class="login-option">
+                        <h3>Microsoft Entra ID</h3>
+                        <a href="/entra-login" class="login-btn btn-microsoft">Sign in with Microsoft</a>
+                    </div>
+                    <div class="divider"><span>or</span></div>
+                    <div class="login-option">
+                        <h3>Administrator Login</h3>
+                        <form method="post" action="/admin-login">
+                            <div class="form-group">
+                                <input type="text" name="username" placeholder="Username" required>
+                            </div>
+                            <div class="form-group">
+                                <input type="password" name="password" placeholder="Password" required>
+                            </div>
+                            <button type="submit" class="btn-admin">Sign In</button>
+                        </form>
+                    </div>
+                </div>
             </div>
         </div>
     </body>
@@ -1271,58 +1966,406 @@ def upload_files():
     <!DOCTYPE html>
     <html>
     <head>
-        <title>NextGenPDF - Automated PDF Organization</title>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>NextGenPDF - Upload Files</title>
         <style>
-            body { font-family: Arial, sans-serif; background-color: #f4f4f4; margin: 0; padding: 20px; text-align: center; }
-            img { margin-bottom: 20px; }
-            h1 { color: #333; margin-bottom: 10px; }
-            .subtitle { color: #666; font-size: 18px; margin-bottom: 30px; }
-            form { background-color: #fff; padding: 20px; border-radius: 10px; box-shadow: 0 0 10px rgba(0,0,0,0.1); display: inline-block; }
-            input[type="file"] { margin: 10px 0; }
-            input[type="submit"] { background-color: #28a745; color: white; border: none; padding: 10px 20px; border-radius: 5px; cursor: pointer; }
-            input[type="submit"]:hover { background-color: #218838; }
-            .logout { position: absolute; top: 20px; right: 20px; background-color: #dc3545; color: white; text-decoration: none; padding: 10px 20px; border-radius: 5px; }
-            .logout:hover { background-color: #c82333; }
-            .view-jobs-btn { background-color: #007bff; color: white; text-decoration: none; padding: 10px 20px; border-radius: 5px; display: inline-block; margin: 10px 0; }
-            .view-jobs-btn:hover { background-color: #0056b3; }
-            .info-box { background-color: #e7f3ff; border-left: 5px solid #007bff; padding: 20px; margin: 20px auto; max-width: 800px; text-align: left; border-radius: 5px; box-shadow: 0 2px 5px rgba(0,0,0,0.1); }
-            .info-box h2 { color: #007bff; margin-top: 0; font-size: 24px; }
-            .info-box p { color: #333; line-height: 1.6; margin: 10px 0; }
-            .info-box ul { color: #333; line-height: 1.8; margin: 10px 0; padding-left: 20px; }
-            .info-box li { margin: 5px 0; }
-            .feature-icon { color: #28a745; font-weight: bold; margin-right: 5px; }
+            * { margin: 0; padding: 0; box-sizing: border-box; }
+            body { 
+                font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; 
+                background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%); 
+                min-height: 100vh; 
+                padding: 30px 20px;
+            }
+            .container { max-width: 1200px; margin: 0 auto; }
+            .header { 
+                display: flex; 
+                justify-content: space-between; 
+                align-items: center; 
+                margin-bottom: 40px;
+            }
+            .header-info { display: flex; align-items: center; gap: 20px; }
+            .logo img { height: 50px; }
+            .header-text h1 { 
+                font-size: 28px; 
+                color: #333; 
+                margin: 0;
+                font-weight: 600;
+            }
+            .header-text p { 
+                font-size: 14px; 
+                color: #666; 
+                margin: 5px 0 0 0;
+            }
+            .header-actions { display: flex; gap: 10px; }
+            .nav-link { 
+                display: inline-flex;
+                align-items: center;
+                gap: 8px;
+                padding: 12px 20px; 
+                background: white; 
+                color: #667eea; 
+                text-decoration: none; 
+                border-radius: 8px; 
+                font-weight: 600; 
+                transition: all 0.3s ease;
+                box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+            }
+            .nav-link:hover { 
+                transform: translateY(-2px);
+                box-shadow: 0 5px 15px rgba(0, 0, 0, 0.15);
+            }
+            .logout-btn {
+                background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%);
+                color: white !important;
+            }
+            .main-content { display: grid; grid-template-columns: 1fr 1fr; gap: 30px; }
+            .upload-section { 
+                background: white; 
+                padding: 40px; 
+                border-radius: 15px; 
+                box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
+            }
+            .upload-section h2 { 
+                font-size: 22px; 
+                color: #333; 
+                margin-bottom: 30px; 
+                font-weight: 600;
+            }
+            .upload-area { 
+                border: 2px dashed #667eea; 
+                border-radius: 12px; 
+                padding: 60px 20px; 
+                text-align: center; 
+                background: #f8f9ff; 
+                cursor: pointer; 
+                transition: all 0.3s ease;
+                position: relative;
+            }
+            .upload-area:hover { 
+                border-color: #764ba2; 
+                background: #f3f4ff;
+            }
+            .upload-area.active { 
+                border-color: #28a745; 
+                background: #f0f9f4;
+            }
+            .upload-icon { 
+                font-size: 48px; 
+                margin-bottom: 15px; 
+                color: #667eea;
+            }
+            .upload-area.active .upload-icon { color: #28a745; }
+            .upload-text { 
+                color: #333; 
+                font-size: 16px; 
+                font-weight: 500;
+            }
+            .upload-text p { 
+                margin: 5px 0; 
+                color: #666; 
+                font-size: 14px;
+            }
+            .upload-input { 
+                position: absolute; 
+                top: 0; 
+                left: 0; 
+                width: 100%; 
+                height: 100%; 
+                opacity: 0; 
+                cursor: pointer;
+            }
+            .submit-btn { 
+                width: 100%; 
+                padding: 14px 24px; 
+                background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); 
+                color: white; 
+                border: none; 
+                border-radius: 8px; 
+                font-size: 16px; 
+                font-weight: 600; 
+                cursor: pointer; 
+                margin-top: 20px; 
+                transition: all 0.3s ease;
+            }
+            .submit-btn:hover { 
+                transform: translateY(-2px);
+                box-shadow: 0 10px 25px rgba(102, 126, 234, 0.3);
+            }
+            .submit-btn:disabled { 
+                opacity: 0.5; 
+                cursor: not-allowed; 
+                transform: none;
+            }
+            .file-list { 
+                margin-top: 20px; 
+                max-height: 300px; 
+                overflow-y: auto;
+            }
+            .file-item { 
+                background: #f8f9fa; 
+                padding: 10px 15px; 
+                border-radius: 6px; 
+                margin: 8px 0; 
+                display: flex; 
+                justify-content: space-between; 
+                align-items: center;
+                font-size: 14px;
+            }
+            .file-item .remove-btn { 
+                background: #dc3545; 
+                color: white; 
+                border: none; 
+                border-radius: 4px; 
+                padding: 4px 8px; 
+                cursor: pointer; 
+                font-size: 12px;
+            }
+            .info-section { 
+                background: white; 
+                padding: 40px; 
+                border-radius: 15px; 
+                box-shadow: 0 10px 30px rgba(0, 0, 0, 0.1);
+            }
+            .info-section h2 { 
+                font-size: 22px; 
+                color: #333; 
+                margin-bottom: 20px; 
+                font-weight: 600;
+            }
+            .info-box { 
+                background: linear-gradient(135deg, #667eea15 0%, #764ba215 100%); 
+                border-left: 4px solid #667eea; 
+                padding: 20px; 
+                border-radius: 8px; 
+                margin-bottom: 20px;
+            }
+            .info-box h3 { 
+                color: #667eea; 
+                font-size: 16px; 
+                margin-bottom: 12px; 
+                font-weight: 600;
+            }
+            .info-box p, .info-box ul { 
+                color: #555; 
+                font-size: 14px; 
+                line-height: 1.6;
+                margin: 0;
+            }
+            .info-box ul { 
+                padding-left: 20px; 
+                margin: 10px 0;
+            }
+            .info-box li { 
+                margin: 8px 0; 
+                color: #555;
+            }
+            .feature-item { 
+                display: flex; 
+                align-items: flex-start; 
+                gap: 12px; 
+                margin-bottom: 12px;
+            }
+            .feature-icon { 
+                color: #28a745; 
+                font-weight: bold; 
+                font-size: 18px;
+                flex-shrink: 0;
+            }
+            .feature-text { 
+                color: #555; 
+                font-size: 14px;
+            }
+            .quick-links { 
+                display: flex; 
+                gap: 10px; 
+                margin-top: 20px;
+            }
+            .quick-link { 
+                flex: 1; 
+                padding: 15px; 
+                background: #f8f9fa; 
+                border-radius: 8px; 
+                text-align: center; 
+                text-decoration: none; 
+                color: #667eea; 
+                font-weight: 600; 
+                transition: all 0.3s ease;
+                border: 1px solid #e9ecef;
+            }
+            .quick-link:hover { 
+                background: #667eea; 
+                color: white;
+            }
+            .alert { 
+                padding: 15px 20px; 
+                border-radius: 8px; 
+                margin-bottom: 20px; 
+                font-size: 14px;
+            }
+            .alert.success { 
+                background: #d4edda; 
+                color: #155724; 
+                border: 1px solid #c3e6cb;
+            }
+            .alert.error { 
+                background: #f8d7da; 
+                color: #721c24; 
+                border: 1px solid #f5c6cb;
+            }
+            @media (max-width: 768px) {
+                .main-content { grid-template-columns: 1fr; }
+                .header { flex-direction: column; text-align: center; gap: 20px; }
+                .header-actions { justify-content: center; flex-wrap: wrap; }
+            }
         </style>
     </head>
     <body>
-        <a href="/logout" class="logout">Logout</a>
-        <img src="/static/trbc-logo-full.png" alt="Logo" width="200">
-        <h1>NextGenPDF</h1>
-        <p class="subtitle">Automated PDF Organization & Renaming System</p>
-        
-        <div class="info-box">
-            <h2>📄 What Does NextGenPDF Do?</h2>
-            <p><strong>NextGenPDF</strong> automatically extracts student information from PDF registration forms and organizes them into a structured folder system.</p>
-            
-            <p><strong>How it works:</strong></p>
-            <ul>
-                <li><span class="feature-icon">✓</span> Upload individual PDFs or ZIP files containing multiple PDFs</li>
-                <li><span class="feature-icon">✓</span> Extracts student name, school, grade, and gender from each PDF</li>
-                <li><span class="feature-icon">✓</span> Renames files to: <code>LastName_FirstName_Grade.pdf</code></li>
-                <li><span class="feature-icon">✓</span> Organizes into folders: <code>Episode/School/Grade/Gender/</code></li>
-                <li><span class="feature-icon">✓</span> Creates a downloadable ZIP archive with the organized structure</li>
-                <li><span class="feature-icon">✓</span> Provides real-time progress updates during processing</li>
-            </ul>
-            
-            <p><strong>Perfect for:</strong> Managing registration forms, organizing student documents, and automating file management workflows.</p>
+        <div class="container">
+            <div class="header">
+                <div class="header-info">
+                    <div class="logo"><img src="/static/trbc-logo-full.png" alt="Logo"></div>
+                    <div class="header-text">
+                        <h1>NextGenPDF</h1>
+                        <p>Automated PDF Organization & Renaming</p>
+                    </div>
+                </div>
+                <div class="header-actions">
+                    <a href="/jobs" class="nav-link">📊 View Jobs</a>
+                    <a href="/logout" class="nav-link logout-btn">🚪 Logout</a>
+                </div>
+            </div>
+
+            {% with messages = get_flashed_messages(with_categories=true) %}
+            {% if messages %}
+                {% for category, message in messages %}
+                    <div class="alert {{ category }}">{{ message }}</div>
+                {% endfor %}
+            {% endif %}
+            {% endwith %}
+
+            <div class="main-content">
+                <div class="upload-section">
+                    <h2>📁 Upload Files</h2>
+                    <form method="post" enctype="multipart/form-data" id="upload-form">
+                        <div class="upload-area" id="upload-area">
+                            <div class="upload-icon">⬆️</div>
+                            <div class="upload-text">
+                                <p style="font-weight: 600;">Drag & drop your files here</p>
+                                <p>or click to select PDF and ZIP files</p>
+                            </div>
+                            <input type="file" id="file-input" name="files" multiple accept=".pdf,.zip" class="upload-input">
+                        </div>
+                        <div class="file-list" id="file-list"></div>
+                        <button type="submit" class="submit-btn" id="submit-btn">Upload & Process Files</button>
+                    </form>
+                </div>
+
+                <div class="info-section">
+                    <h2>ℹ️ How It Works</h2>
+                    <div class="info-box">
+                        <h3>What is NextGenPDF?</h3>
+                        <p>NextGenPDF automatically extracts student information from PDF registration forms and organizes them into a structured folder system.</p>
+                    </div>
+                    <div class="info-box">
+                        <h3>📋 Processing Steps</h3>
+                        <div class="feature-item">
+                            <div class="feature-icon">1</div>
+                            <div class="feature-text">Upload individual PDFs or ZIP files</div>
+                        </div>
+                        <div class="feature-item">
+                            <div class="feature-icon">2</div>
+                            <div class="feature-text">System extracts name, school, grade, and gender</div>
+                        </div>
+                        <div class="feature-item">
+                            <div class="feature-icon">3</div>
+                            <div class="feature-text">Files renamed to: <strong>LastName_FirstName_Grade.pdf</strong></div>
+                        </div>
+                        <div class="feature-item">
+                            <div class="feature-icon">4</div>
+                            <div class="feature-text">Organized into: <strong>Episode/School/Grade/Gender/</strong></div>
+                        </div>
+                        <div class="feature-item">
+                            <div class="feature-icon">5</div>
+                            <div class="feature-text">Download organized ZIP archive</div>
+                        </div>
+                    </div>
+                    <div class="quick-links">
+                        <a href="/jobs" class="quick-link">View Jobs →</a>
+                    </div>
+                </div>
+            </div>
         </div>
-        
-        <a href="/jobs" class="view-jobs-btn">View Jobs</a>
-        <br><br>
-        <form method="post" enctype="multipart/form-data">
-            <input type="file" name="files" multiple accept=".pdf,.zip">
-            <br><br>
-            <input type="submit" value="Upload & Process Files">
-        </form>
+
+        <script>
+            const uploadArea = document.getElementById('upload-area');
+            const fileInput = document.getElementById('file-input');
+            const fileList = document.getElementById('file-list');
+            const uploadForm = document.getElementById('upload-form');
+            let selectedFiles = [];
+
+            // Drag and drop handlers
+            uploadArea.addEventListener('dragover', (e) => {
+                e.preventDefault();
+                uploadArea.classList.add('active');
+            });
+
+            uploadArea.addEventListener('dragleave', () => {
+                uploadArea.classList.remove('active');
+            });
+
+            uploadArea.addEventListener('drop', (e) => {
+                e.preventDefault();
+                uploadArea.classList.remove('active');
+                const files = e.dataTransfer.files;
+                fileInput.files = files;
+                updateFileList(files);
+            });
+
+            uploadArea.addEventListener('click', () => fileInput.click());
+
+            fileInput.addEventListener('change', (e) => {
+                updateFileList(e.target.files);
+            });
+
+            function updateFileList(files) {
+                selectedFiles = Array.from(files);
+                fileList.innerHTML = '';
+                
+                if (selectedFiles.length === 0) {
+                    document.getElementById('submit-btn').disabled = true;
+                    return;
+                }
+
+                selectedFiles.forEach((file, index) => {
+                    const item = document.createElement('div');
+                    item.className = 'file-item';
+                    const size = (file.size / 1024 / 1024).toFixed(2);
+                    item.innerHTML = `
+                        <span>📄 ${file.name} (${size} MB)</span>
+                        <button type="button" class="remove-btn" onclick="removeFile(${index})">Remove</button>
+                    `;
+                    fileList.appendChild(item);
+                });
+
+                document.getElementById('submit-btn').disabled = false;
+            }
+
+            function removeFile(index) {
+                selectedFiles.splice(index, 1);
+                const dt = new DataTransfer();
+                selectedFiles.forEach(file => dt.items.add(file));
+                fileInput.files = dt.files;
+                updateFileList(dt.files);
+            }
+
+            uploadForm.addEventListener('submit', (e) => {
+                if (selectedFiles.length === 0) {
+                    e.preventDefault();
+                    alert('Please select files to upload');
+                }
+            });
+        </script>
     </body>
     </html>
     ''')
@@ -1334,116 +2377,468 @@ def jobs():
     <!DOCTYPE html>
     <html>
     <head>
-        <title>Jobs</title>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>NextGenPDF - Jobs Dashboard</title>
         <style>
-            body { font-family: Arial, sans-serif; background-color: #f4f4f4; margin: 0; padding: 20px; text-align: center; }
-            img { margin-bottom: 20px; }
-            h1 { color: #333; }
-            .job { background-color: #fff; margin: 10px auto; padding: 15px; border-radius: 10px; box-shadow: 0 0 10px rgba(0,0,0,0.1); max-width: 800px; text-align: left; }
-            .status { padding: 5px 10px; border-radius: 5px; color: white; font-weight: bold; }
-            .status.queued { background-color: #ffc107; }
-            .status.processing { background-color: #17a2b8; }
-            .status.completed { background-color: #28a745; }
-            .status.error { background-color: #dc3545; }
-            .progress-text { color: #17a2b8; font-style: italic; }
-            .download-btn { background-color: #007bff; color: white; text-decoration: none; padding: 8px 16px; border-radius: 5px; margin-left: 10px; }
-            .download-btn:hover { background-color: #0056b3; }
-            .delete-btn { background-color: #dc3545; color: white; border: none; padding: 8px 16px; border-radius: 5px; margin-left: 10px; cursor: pointer; }
-            .delete-btn:hover { background-color: #c82333; }
-            .flash { padding: 10px; margin: 10px 0; border-radius: 5px; text-align: center; }
-            .flash.success { background-color: #d4edda; color: #155724; border: 1px solid #c3e6cb; }
-            .flash.error { background-color: #f8d7da; color: #721c24; border: 1px solid #f5c6cb; }
-            .logout { position: absolute; top: 20px; right: 20px; background-color: #dc3545; color: white; text-decoration: none; padding: 10px 20px; border-radius: 5px; }
-            .logout:hover { background-color: #c82333; }
-            .nav-links { margin-bottom: 20px; }
-            .nav-links a { color: #007bff; text-decoration: none; padding: 10px 20px; background-color: #f8f9fa; border-radius: 5px; margin: 0 10px; }
-            .nav-links a:hover { background-color: #e9ecef; }
-            .nav-btn { background-color: #007bff; color: white; text-decoration: none; padding: 10px 20px; border-radius: 5px; display: inline-block; margin: 0 10px; }
-            .nav-btn:hover { background-color: #0056b3; }
-            .zip-content { background-color: #f8f9fa; padding: 10px; margin: 5px 0; border-radius: 5px; border-left: 4px solid #007bff; }
-            .zip-toggle { cursor: pointer; background-color: #e9ecef; padding: 8px; margin: 5px 0; border-radius: 5px; border: 1px solid #dee2e6; }
-            .zip-toggle:hover { background-color: #dee2e6; }
-            .zip-details { display: none; margin-top: 10px; }
-            .skipped-section { background-color: #fff3cd; border: 1px solid #ffeaa7; border-radius: 5px; padding: 10px; margin: 10px 0; }
-            .skipped-toggle { cursor: pointer; background-color: #ffeaa7; padding: 8px; margin: 5px 0; border-radius: 5px; border: 1px solid #ffc107; font-weight: bold; color: #856404; }
-            .skipped-toggle:hover { background-color: #ffc107; }
-            .skipped-details { display: none; margin-top: 10px; }
-            ul { list-style-type: none; padding: 0; }
-            li { background-color: #ffffff; margin: 2px 0; padding: 5px; border-radius: 3px; }
+            * { margin: 0; padding: 0; box-sizing: border-box; }
+            body { 
+                font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; 
+                background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%); 
+                min-height: 100vh; 
+                padding: 30px 20px;
+            }
+            .container { max-width: 1200px; margin: 0 auto; }
+            .header { 
+                display: flex; 
+                justify-content: space-between; 
+                align-items: center; 
+                margin-bottom: 40px;
+            }
+            .header-info { display: flex; align-items: center; gap: 20px; }
+            .logo img { height: 50px; }
+            .header-text h1 { 
+                font-size: 28px; 
+                color: #333; 
+                margin: 0;
+                font-weight: 600;
+            }
+            .header-text p { 
+                font-size: 14px; 
+                color: #666; 
+                margin: 5px 0 0 0;
+            }
+            .header-actions { display: flex; gap: 10px; }
+            .nav-link { 
+                display: inline-flex;
+                align-items: center;
+                gap: 8px;
+                padding: 12px 20px; 
+                background: white; 
+                color: #667eea; 
+                text-decoration: none; 
+                border-radius: 8px; 
+                font-weight: 600; 
+                transition: all 0.3s ease;
+                box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+            }
+            .nav-link:hover { 
+                transform: translateY(-2px);
+                box-shadow: 0 5px 15px rgba(0, 0, 0, 0.15);
+            }
+            .logout-btn {
+                background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%);
+                color: white !important;
+            }
+            .jobs-container { }
+            .job-card { 
+                background: white; 
+                border-radius: 12px; 
+                box-shadow: 0 5px 20px rgba(0, 0, 0, 0.1);
+                margin-bottom: 25px;
+                overflow: hidden;
+                transition: all 0.3s ease;
+            }
+            .job-card:hover { 
+                box-shadow: 0 10px 35px rgba(0, 0, 0, 0.15);
+                transform: translateY(-2px);
+            }
+            .job-header { 
+                background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); 
+                color: white; 
+                padding: 20px; 
+                display: flex; 
+                justify-content: space-between; 
+                align-items: center;
+            }
+            .job-title { font-size: 18px; font-weight: 600; }
+            .job-meta { font-size: 12px; opacity: 0.9; }
+            .status-badge { 
+                padding: 8px 16px; 
+                border-radius: 20px; 
+                font-size: 12px; 
+                font-weight: 600;
+                text-transform: uppercase;
+                letter-spacing: 0.5px;
+            }
+            .status-queued { background: rgba(255, 193, 7, 0.2); color: #f57f17; }
+            .status-processing { background: rgba(0, 150, 136, 0.2); color: #00897b; }
+            .status-completed { background: rgba(76, 175, 80, 0.2); color: #558b2f; }
+            .status-error { background: rgba(244, 67, 54, 0.2); color: #c62828; }
+            .job-body { padding: 25px; }
+            .job-info { display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: 20px; margin-bottom: 20px; }
+            .info-item { }
+            .info-label { 
+                font-size: 12px; 
+                text-transform: uppercase; 
+                letter-spacing: 0.5px; 
+                color: #999; 
+                font-weight: 600; 
+                margin-bottom: 5px;
+            }
+            .info-value { 
+                font-size: 16px; 
+                color: #333; 
+                font-weight: 500;
+            }
+            .progress-bar { 
+                width: 100%; 
+                height: 8px; 
+                background: #f0f0f0; 
+                border-radius: 10px; 
+                overflow: hidden; 
+                margin-top: 10px;
+            }
+            .progress-fill { 
+                height: 100%; 
+                background: linear-gradient(90deg, #667eea 0%, #764ba2 100%); 
+                width: 0%; 
+                transition: width 0.5s ease;
+            }
+            .progress-text { 
+                font-size: 12px; 
+                color: #667eea; 
+                font-style: italic; 
+                margin-top: 8px;
+            }
+            .zip-contents { 
+                background: #f8f9fa; 
+                border-radius: 8px; 
+                padding: 15px; 
+                margin: 15px 0;
+            }
+            .zip-toggle { 
+                cursor: pointer; 
+                font-weight: 600; 
+                color: #667eea; 
+                display: flex; 
+                align-items: center; 
+                justify-content: space-between;
+                padding: 10px 0;
+                user-select: none;
+            }
+            .zip-toggle:hover { color: #764ba2; }
+            .zip-details { 
+                display: none; 
+                margin-top: 15px; 
+                max-height: 400px; 
+                overflow-y: auto;
+            }
+            .file-list { list-style: none; }
+            .file-list li { 
+                padding: 8px 12px; 
+                background: white; 
+                margin: 5px 0; 
+                border-radius: 4px; 
+                font-size: 13px; 
+                color: #555;
+                border-left: 3px solid #667eea;
+            }
+            .skipped-section { 
+                background: #fff3cd; 
+                border-left: 4px solid #ffc107; 
+                border-radius: 8px; 
+                padding: 15px; 
+                margin: 15px 0;
+            }
+            .skipped-toggle { 
+                cursor: pointer; 
+                font-weight: 600; 
+                color: #856404; 
+                display: flex; 
+                align-items: center; 
+                justify-content: space-between;
+                user-select: none;
+            }
+            .skipped-toggle:hover { color: #533f03; }
+            .skipped-details { display: none; margin-top: 15px; }
+            .action-buttons { 
+                display: flex; 
+                gap: 10px; 
+                flex-wrap: wrap;
+                margin-top: 20px;
+            }
+            .btn { 
+                padding: 10px 20px; 
+                border: none; 
+                border-radius: 6px; 
+                font-size: 14px; 
+                font-weight: 600; 
+                cursor: pointer; 
+                transition: all 0.3s ease;
+                text-decoration: none;
+                display: inline-flex;
+                align-items: center;
+                gap: 8px;
+            }
+            .btn-download { 
+                background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); 
+                color: white;
+            }
+            .btn-download:hover { 
+                transform: translateY(-2px);
+                box-shadow: 0 5px 15px rgba(102, 126, 234, 0.3);
+            }
+            .btn-delete { 
+                background: #dc3545; 
+                color: white;
+            }
+            .btn-delete:hover { 
+                background: #c82333;
+                transform: translateY(-2px);
+                box-shadow: 0 5px 15px rgba(220, 53, 69, 0.3);
+            }
+            .empty-state { 
+                text-align: center; 
+                padding: 60px 20px; 
+                background: white; 
+                border-radius: 12px;
+                box-shadow: 0 5px 20px rgba(0, 0, 0, 0.1);
+            }
+            .empty-state-icon { font-size: 64px; margin-bottom: 20px; }
+            .empty-state-text { 
+                font-size: 18px; 
+                color: #666; 
+                margin-bottom: 20px;
+            }
+            .empty-state-link { 
+                display: inline-block;
+                padding: 12px 24px;
+                background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+                color: white;
+                text-decoration: none;
+                border-radius: 6px;
+                font-weight: 600;
+                transition: all 0.3s ease;
+            }
+            .empty-state-link:hover { 
+                transform: translateY(-2px);
+                box-shadow: 0 5px 15px rgba(102, 126, 234, 0.3);
+            }
+            .alert { 
+                padding: 15px 20px; 
+                border-radius: 8px; 
+                margin-bottom: 20px; 
+                font-size: 14px;
+            }
+            .alert.success { 
+                background: #d4edda; 
+                color: #155724; 
+                border: 1px solid #c3e6cb;
+            }
+            .alert.error { 
+                background: #f8d7da; 
+                color: #721c24; 
+                border: 1px solid #f5c6cb;
+            }
+            @media (max-width: 768px) {
+                .header { flex-direction: column; gap: 20px; }
+                .header-actions { justify-content: center; flex-wrap: wrap; }
+                .job-header { flex-direction: column; align-items: flex-start; gap: 10px; }
+                .job-info { grid-template-columns: 1fr; }
+            }
         </style>
     </head>
     <body>
-        <a href="/logout" class="logout">Logout</a>
-        <img src="/static/trbc-logo-full.png" alt="Logo" width="200">
-        <h1>Processing Jobs</h1>
-        <div class="nav-links" style="margin-bottom: 20px;">
-            <a href="/" class="nav-btn">← Upload Files</a>
-            <a href="/completed-jobs" class="nav-btn">View Completed Jobs Archive →</a>
-        </div>
-        {% with messages = get_flashed_messages(with_categories=true) %}
-        {% if messages %}
-        {% for category, message in messages %}
-        <div class="flash {{ category }}">{{ message }}</div>
-        {% endfor %}
-        {% endif %}
-        {% endwith %}
-        {% for job_id, job in jobs.items() %}
-        <div class="job">
-            <h3>Job {{ job_id[:8] }}</h3>
-            <p><strong>Status:</strong> <span class="status {{ job.status }}">{{ job.status.title() }}</span></p>
-            {% if job.status == 'processing' and job.progress %}
-            <p><strong>Progress:</strong> <span class="progress-text">{{ job.progress }}</span></p>
-            {% endif %}
-            <p><strong>Files:</strong> {{ job.files|length }}</p>
-            {% if job.zip_contents %}
-            <p><strong>ZIP Contents:</strong></p>
-            {% for zip_name, pdf_files in job.zip_contents.items() %}
-            <div class="zip-content">
-                <div class="zip-toggle" onclick="toggleZipDetails(this)">
-                    <strong>{{ zip_name }}</strong> ({{ pdf_files|length }} files) ▶
+        <div class="container">
+            <div class="header">
+                <div class="header-info">
+                    <div class="logo"><img src="/static/trbc-logo-full.png" alt="Logo"></div>
+                    <div class="header-text">
+                        <h1>Jobs Dashboard</h1>
+                        <p>Monitor your PDF processing jobs</p>
+                    </div>
                 </div>
-                <div class="zip-details">
-                    <ul>
-                    {% for pdf_file in pdf_files %}
-                        <li>{{ pdf_file }}</li>
-                    {% endfor %}
-                    </ul>
+                <div class="header-actions">
+                    <a href="/" class="nav-link">📤 Upload Files</a>
+                    <a href="/logout" class="nav-link logout-btn">🚪 Logout</a>
                 </div>
             </div>
-            {% endfor %}
+
+            {% with messages = get_flashed_messages(with_categories=true) %}
+            {% if messages %}
+                {% for category, message in messages %}
+                    <div class="alert {{ category }}">{{ message }}</div>
+                {% endfor %}
             {% endif %}
-            {% if job.status == 'completed' %}
-                {% if job.zip_name %}
-                <p><a href="/download/{{ job.zip_name }}" class="download-btn">Download ZIP</a>
-                <form method="post" action="/delete/{{ job_id }}" style="display: inline;">
-                    <button type="submit" class="delete-btn" onclick="return confirm('Are you sure you want to delete this job?')">Delete Job</button>
-                </form></p>
+            {% endwith %}
+
+            <div class="jobs-container">
+                {% if jobs %}
+                    {% for job_id, job in jobs.items() %}
+                    <div class="job-card">
+                        <div class="job-header">
+                            <div>
+                                <div class="job-title">📋 Job {{ job_id[:8] }}</div>
+                                <div class="job-meta">Created: {{ job.created_at }}</div>
+                            </div>
+                            <div class="status-badge status-{{ job.status }}">{{ job.status }}</div>
+                        </div>
+                        <div class="job-body">
+                            <div class="job-info">
+                                <div class="info-item">
+                                    <div class="info-label">Total Files</div>
+                                    <div class="info-value">{{ job.files|length }}</div>
+                                </div>
+                                <div class="info-item">
+                                    <div class="info-label">Status</div>
+                                    <div class="info-value" style="color: {% if job.status == 'completed' %}#558b2f{% elif job.status == 'processing' %}#00897b{% elif job.status == 'error' %}#c62828{% else %}#f57f17{% endif %};">
+                                        {% if job.status == 'completed' %}✓ Completed{% elif job.status == 'processing' %}⏳ Processing{% elif job.status == 'error' %}✗ Error{% else %}⌛ Queued{% endif %}
+                                    </div>
+                                </div>
+                            </div>
+                            
+                            {% if job.status == 'processing' and job.progress %}
+                                <div>
+                                    <div class="info-label">Progress</div>
+                                    <div class="progress-bar">
+                                        <div class="progress-fill" id="progress-{{ job_id }}"></div>
+                                    </div>
+                                    <div class="progress-text" id="progress-text-{{ job_id }}">{{ job.progress }}</div>
+                                </div>
+                            {% endif %}
+                            
+                            {% if job.zip_contents %}
+                                <div class="zip-contents">
+                                    {% for zip_name, pdf_files in job.zip_contents.items() %}
+                                    <div class="zip-toggle" onclick="toggleDetails(this)">
+                                        <span>📦 {{ zip_name }} ({{ pdf_files|length }} files)</span>
+                                        <span>▶</span>
+                                    </div>
+                                    <div class="zip-details">
+                                        <ul class="file-list">
+                                        {% for pdf_file in pdf_files %}
+                                            <li>{{ pdf_file }}</li>
+                                        {% endfor %}
+                                        </ul>
+                                    </div>
+                                    {% endfor %}
+                                </div>
+                            {% endif %}
+                            
+                            {% if job.status == 'completed' %}
+                                {% if job.skipped and job.skipped|length > 0 %}
+                                <div class="skipped-section">
+                                    <div class="skipped-toggle" onclick="toggleSkipped(this)">
+                                        <span>⚠️ Skipped Files ({{ job.skipped|length }})</span>
+                                        <span>▶</span>
+                                    </div>
+                                    <div class="skipped-details">
+                                        <ul class="file-list">
+                                        {% for skip_info in job.skipped %}
+                                            <li><strong>{{ skip_info[0] }}</strong>: {{ skip_info[1] }}</li>
+                                        {% endfor %}
+                                        </ul>
+                                    </div>
+                                </div>
+                                {% endif %}
+                                
+                                <div class="action-buttons">
+                                    {% if job.zip_name %}
+                                        <a href="/download/{{ job.zip_name }}" class="btn btn-download">⬇️ Download ZIP</a>
+                                    {% else %}
+                                        <span style="color: #999; font-size: 14px;">No files were successfully processed</span>
+                                    {% endif %}
+                                    <form method="post" action="/delete/{{ job_id }}" style="display: contents;">
+                                        <button type="submit" class="btn btn-delete" onclick="return confirm('Are you sure? This cannot be undone.')">🗑️ Delete Job</button>
+                                    </form>
+                                </div>
+                            {% endif %}
+                        </div>
+                    </div>
+                    {% endfor %}
                 {% else %}
-                <p><em>No files were successfully processed to create a ZIP archive.</em>
-                <form method="post" action="/delete/{{ job_id }}" style="display: inline;">
-                    <button type="submit" class="delete-btn" onclick="return confirm('Are you sure you want to delete this job?')">Delete Job</button>
-                </form></p>
-                {% endif %}
-                {% if job.skipped %}
-                <div class="skipped-section">
-                    <div class="skipped-toggle" onclick="toggleSkippedDetails(this)">
-                        ⚠️ Skipped Files ({{ job.skipped|length }}) ▶
+                    <div class="empty-state">
+                        <div class="empty-state-icon">📭</div>
+                        <div class="empty-state-text">No jobs yet</div>
+                        <a href="/" class="empty-state-link">Upload Files to Get Started</a>
                     </div>
-                    <div class="skipped-details">
-                        <ul>
-                        {% for skip_info in job.skipped %}
-                            <li><strong>{{ skip_info[0] }}</strong>: {{ skip_info[1] }}</li>
-                        {% endfor %}
-                        </ul>
-                    </div>
-                </div>
                 {% endif %}
-            {% endif %}
+            </div>
         </div>
-        {% endfor %}
-        {% if not jobs %}
-        <p>No jobs yet. <a href="/">Upload some files</a> to get started.</p>
-        {% endif %}
+
+        <script>
+            let previousJobStatuses = {};
+            
+            function toggleDetails(element) {
+                const details = element.nextElementSibling;
+                const arrow = element.querySelector('span:last-child');
+                if (details.style.display === 'block') {
+                    details.style.display = 'none';
+                    arrow.textContent = '▶';
+                } else {
+                    details.style.display = 'block';
+                    arrow.textContent = '▼';
+                }
+            }
+            
+            function toggleSkipped(element) {
+                const details = element.nextElementSibling;
+                const arrow = element.querySelector('span:last-child');
+                if (details.style.display === 'block') {
+                    details.style.display = 'none';
+                    arrow.textContent = '▶';
+                } else {
+                    details.style.display = 'block';
+                    arrow.textContent = '▼';
+                }
+            }
+            
+            function updateJobs() {
+                fetch('/api/jobs', { credentials: 'same-origin' })
+                    .then(response => {
+                        if (!response.ok) throw new Error(`HTTP ${response.status}`);
+                        return response.json();
+                    })
+                    .then(data => {
+                        const jobs = Object.entries(data);
+                        
+                        // Check for job completions
+                        let hasNewCompletion = false;
+                        if (jobs.length > 0) {
+                            jobs.forEach(([jobId, job]) => {
+                                if (job.status === 'completed' && previousJobStatuses[jobId] === 'processing') {
+                                    hasNewCompletion = true;
+                                }
+                                previousJobStatuses[jobId] = job.status;
+                            });
+                        }
+                        
+                        if (hasNewCompletion) {
+                            setTimeout(() => { window.location.href = '/completed-jobs'; }, 500);
+                            return;
+                        }
+                        
+                        // Update progress bars for processing jobs
+                        jobs.forEach(([jobId, job]) => {
+                            if (job.status === 'processing' && job.progress) {
+                                const progressBar = document.getElementById(`progress-${jobId}`);
+                                const progressText = document.getElementById(`progress-text-${jobId}`);
+                                if (progressBar) {
+                                    const match = job.progress.match(/(\d+)\/(\d+)/);
+                                    if (match) {
+                                        const current = parseInt(match[1]);
+                                        const total = parseInt(match[2]);
+                                        const percentage = (current / total) * 100;
+                                        progressBar.style.width = percentage + '%';
+                                    }
+                                }
+                                if (progressText) {
+                                    progressText.textContent = job.progress;
+                                }
+                            }
+                        });
+                    })
+                    .catch(err => console.error('Error updating jobs:', err));
+            }
+            
+            // Update every 2 seconds
+            setInterval(updateJobs, 2000);
+            updateJobs(); // Initial update
+        </script>
+    </body>
+    </html>
+    ''')
         <script>
             // Track previous job statuses to detect completion
             let previousJobStatuses = {};