diff --git a/Client/Pages/Index.razor b/Client/Pages/Index.razor
index d19b76e..ddb4aac 100644
--- a/Client/Pages/Index.razor
+++ b/Client/Pages/Index.razor
@@ -83,12 +83,21 @@ else
                     </div>
                     @if (SelectedSchedule.ContainsKey(day))
                     {
-                        <div class="shift-times">
-                            @GetShiftTimes(day)
-                        </div>
-                        <div class="transport-info">
-                            @GetTransportSummary(day)
-                        </div>
+                        if (GetShiftTimes(day).Length > 0)
+                        {
+                            <div class="shift-times">
+                                @GetShiftTimes(day)
+                            </div>
+                            <div class="transport-info">
+                                @GetTransportSummary(day)
+                            </div>
+                        }
+                        else
+                        {
+                            <div class="shift-times">
+                                @SelectedSchedule[day]
+                            </div>
+                        }
                     }
                 </div>
             }
@@ -132,12 +141,21 @@ else
                 </div>
                 @if (SelectedSchedule.ContainsKey(day))
                 {
-                    <div class="shift-times">
-                        @GetShiftTimes(day)
-                    </div>
-                    <div class="transport-info">
-                        @GetTransportSummary(day)
-                    </div>
+                    if (GetShiftTimes(day).Length > 0)
+                    {
+                        <div class="shift-times">
+                            @GetShiftTimes(day)
+                        </div>
+                        <div class="transport-info">
+                            @GetTransportSummary(day)
+                        </div>
+                    }
+                    else
+                    {
+                        <div class="shift-times">
+                            @SelectedSchedule[day]
+                        </div>
+                    }
                 }
             </div>
         }
diff --git a/Client/Pages/Index.razor.cs b/Client/Pages/Index.razor.cs
index 81bf0a7..cec5bb3 100644
--- a/Client/Pages/Index.razor.cs
+++ b/Client/Pages/Index.razor.cs
@@ -272,13 +272,15 @@ namespace ShiftScheduler.Client.Pages
             
             var morningTransport = shiftWithTransport.GetMorningTransportSummary();
             if (!string.IsNullOrEmpty(morningTransport))
-                summaries.Add($"🚂 {morningTransport}");
+                summaries.Add(morningTransport);
                 
             var afternoonTransport = shiftWithTransport.GetAfternoonTransportSummary();
             if (!string.IsNullOrEmpty(afternoonTransport))
-                summaries.Add($"🚂 {afternoonTransport}");
+                summaries.Add(afternoonTransport);
+            
+            if (summaries.Count == 0) { return string.Empty; }
                 
-            return string.Join(" | ", summaries);
+            return "🚂 " + string.Join(" | ", summaries);
         }
 
         // Helper method to get shift times for display