diff --git a/web/admin.html b/web/admin.html
index ba58310..ad3054c 100644
--- a/web/admin.html
+++ b/web/admin.html
@@ -2115,10 +2115,13 @@
                 
                 if (isLocal) {
                     // Local flight display
-                    const callsign = flight.callsign && flight.callsign.trim() ? flight.callsign : flight.registration;
-                    aircraftDisplay = `<strong>${callsign}</strong><br><span style="font-size: 0.8em; color: #666; font-style: italic;">${flight.registration}</span>`;
+                    if (flight.callsign && flight.callsign.trim()) {
+                        aircraftDisplay = `<strong>${flight.callsign}</strong><br><span style="font-size: 0.8em; color: #666; font-style: italic;">${flight.registration}</span>`;
+                    } else {
+                        aircraftDisplay = `<strong>${flight.registration}</strong>`;
+                    }
                     acType = flight.type;
-                    fromDisplay = '-';
+                    fromDisplay = `<i>${flight.flight_type === 'CIRCUITS' ? 'Circuits' : flight.flight_type === 'LOCAL' ? 'Local Flight' : 'Departure'}</i>`;
                     eta = flight.departure_dt ? formatTimeOnly(flight.departure_dt) : '-';
                     pob = flight.pob || '-';
                     fuel = '-';
@@ -2132,8 +2135,11 @@
                     `;
                 } else {
                     // PPR display
-                    const callsign = flight.ac_call && flight.ac_call.trim() ? flight.ac_call : flight.ac_reg;
-                    aircraftDisplay = `<strong>${callsign}</strong><br><span style="font-size: 0.8em; color: #666; font-style: italic;">${flight.ac_reg}</span>`;
+                    if (flight.ac_call && flight.ac_call.trim()) {
+                        aircraftDisplay = `<strong>${flight.ac_call}</strong><br><span style="font-size: 0.8em; color: #666; font-style: italic;">${flight.ac_reg}</span>`;
+                    } else {
+                        aircraftDisplay = `<strong>${flight.ac_reg}</strong>`;
+                    }
                     acType = flight.ac_type;
                     
                     // Lookup airport name for in_from
@@ -2214,9 +2220,12 @@
                 
                 if (isLocal) {
                     // Local flight display
-                    const callsign = flight.callsign && flight.callsign.trim() ? flight.callsign : flight.registration;
-                    aircraftDisplay = `<strong>${callsign}</strong><br><span style="font-size: 0.8em; color: #666; font-style: italic;">${flight.registration}</span>`;
-                    toDisplay = '-';
+                    if (flight.callsign && flight.callsign.trim()) {
+                        aircraftDisplay = `<strong>${flight.callsign}</strong><br><span style="font-size: 0.8em; color: #666; font-style: italic;">${flight.registration}</span>`;
+                    } else {
+                        aircraftDisplay = `<strong>${flight.registration}</strong>`;
+                    }
+                    toDisplay = `<i>${flight.flight_type === 'CIRCUITS' ? 'Circuits' : flight.flight_type === 'LOCAL' ? 'Local Flight' : 'Departure'}</i>`;
                     etd = flight.booked_out_dt ? formatTimeOnly(flight.booked_out_dt) : '-';
                     pob = flight.pob || '-';
                     fuel = '-';
@@ -2246,8 +2255,11 @@
                     }
                 } else {
                     // PPR display
-                    const callsign = flight.ac_call && flight.ac_call.trim() ? flight.ac_call : flight.ac_reg;
-                    aircraftDisplay = `<strong>${callsign}</strong><br><span style="font-size: 0.8em; color: #666; font-style: italic;">${flight.ac_reg}</span>`;
+                    if (flight.ac_call && flight.ac_call.trim()) {
+                        aircraftDisplay = `<strong>${flight.ac_call}</strong><br><span style="font-size: 0.8em; color: #666; font-style: italic;">${flight.ac_reg}</span>`;
+                    } else {
+                        aircraftDisplay = `<strong>${flight.ac_reg}</strong>`;
+                    }
                     toDisplay = flight.out_to || '-';
                     if (flight.out_to && flight.out_to.length === 4 && /^[A-Z]{4}$/.test(flight.out_to)) {
                         toDisplay = await getAirportDisplay(flight.out_to);