diff --git a/java/com.sap.sailing.gwt.ui/images/spectator-table-bg.png b/java/com.sap.sailing.gwt.ui/images/spectator-table-bg.png
index e57994d7aa9..75c7c506ff0 100644
Binary files a/java/com.sap.sailing.gwt.ui/images/spectator-table-bg.png and b/java/com.sap.sailing.gwt.ui/images/spectator-table-bg.png differ
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java
index 8b0165e55ea..2e341c7e1c0 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java
@@ -134,11 +134,14 @@ public class RaceTimePanel extends TimePanel<RaceTimePanelSettings> implements R
     private void initMinMax(RaceTimesInfoDTO newRaceTimesInfo) {
         Date min = null;
         Date max = null;
-        if (newRaceTimesInfo.startOfTracking != null) {
+        long startAndEndRaceExtensionTime = 5 * 60 * 1000; // 5 minutes
+        
+        if (newRaceTimesInfo.startOfRace != null) {
+            min = new Date(newRaceTimesInfo.startOfRace.getTime() - startAndEndRaceExtensionTime);
+        } else if (newRaceTimesInfo.startOfTracking != null) {
             min = newRaceTimesInfo.startOfTracking;
-        } else if (newRaceTimesInfo.startOfRace != null) {
-            min = new Date(newRaceTimesInfo.startOfRace.getTime() - 5 * 60 * 1000);
         }
+
         switch (timer.getPlayMode()) {
         case Live:
             if (newRaceTimesInfo.timePointOfNewestEvent != null) {
@@ -147,7 +150,7 @@ public class RaceTimePanel extends TimePanel<RaceTimePanelSettings> implements R
             break;
         case Replay:
             if (newRaceTimesInfo.endOfRace != null) {
-                max = newRaceTimesInfo.endOfRace;
+                max = new Date(newRaceTimesInfo.endOfRace.getTime() + startAndEndRaceExtensionTime);
             } else if (newRaceTimesInfo.timePointOfNewestEvent != null) {
                 max = newRaceTimesInfo.timePointOfNewestEvent;
             }