diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties
index 883c330a638..cd268e32ebb 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages.properties
@@ -108,8 +108,8 @@ eventRegattaRaceWinner=Winner
 eventRegattaRaceLeader=Leader
 eventRegattaRacesLegendGps=Tracking
 eventRegattaRacesLegendWind=Wind Data
-eventRegattaRacesLegendVideo=Video Stream
-eventRegattaRacesLegendAudio=Audio Stream
+eventRegattaRacesLegendVideo=Video
+eventRegattaRacesLegendAudio=Audio
 eventSponsorsTitle=Event Sponsorships
 footerJobs=Jobs
 footerCopyright=\u00A9 2015 SAP Sailing Analytics
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties
index 7e657fa0e03..90d26cb9271 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_de.properties
@@ -108,8 +108,8 @@ eventRegattaRaceWinner=Gewinner
 eventRegattaRaceLeader=Führender
 eventRegattaRacesLegendGps=Tracking
 eventRegattaRacesLegendWind=Winddaten
-eventRegattaRacesLegendVideo=Video Stream
-eventRegattaRacesLegendAudio=Audio Stream
+eventRegattaRacesLegendVideo=Video
+eventRegattaRacesLegendAudio=Audio
 eventSponsorsTitle=Veranstaltungssponsoren
 footerJobs=Jobs
 footerCopyright=\u00A9 2015 SAP Sailing Analytics
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties
index ade865f9df7..69867955ed5 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/common/client/i18n/TextMessages_zh.properties
@@ -138,8 +138,8 @@ eventRegattaRaceWinner=Winner
 eventRegattaRaceLeader=Leader
 eventRegattaRacesLegendGps=Tracking
 eventRegattaRacesLegendWind=Wind Data
-eventRegattaRacesLegendVideo=Video Stream
-eventRegattaRacesLegendAudio=Audio Stream
+eventRegattaRacesLegendVideo=Video
+eventRegattaRacesLegendAudio=Audio
 eventSponsorsTitle=Event Sponsorships
 footerJobs=Jobs
 footerCopyright=\u00A9 2015 ＳＡＰ帆船
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.gss b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.gss
index ee66c9be278..f254cd7de05 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.gss
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.gss
@@ -135,6 +135,9 @@
   color: #ccc;
   font-weight: 700;
 }
+.eventregattarace_racetime {
+  white-space: nowrap;
+}
 .eventregattarace_flag {
   display: none;
   width: 9%;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.ui.xml
index 11bef605ea3..602200356f9 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRaces.ui.xml
@@ -23,7 +23,7 @@
         <div class="{local_res.css.eventregattaraces_legend_item} {local_res.css.eventregattaraces_legend_itemgps}"><ui:text from='{i18n.eventRegattaRacesLegendGps}'/></div>
         <div class="{local_res.css.eventregattaraces_legend_item} {local_res.css.eventregattaraces_legend_itemwind}"><ui:text from='{i18n.eventRegattaRacesLegendWind}'/></div>
         <div class="{local_res.css.eventregattaraces_legend_item} {local_res.css.eventregattaraces_legend_itemvideo}"><ui:text from='{i18n.eventRegattaRacesLegendVideo}'/></div>
-        <div class="{local_res.css.eventregattaraces_legend_item} {local_res.css.eventregattaraces_legend_itemaudio}"><ui:text from='{i18n.eventRegattaRacesLegendAudio}'/></div>
+<!-- <div class="{local_res.css.eventregattaraces_legend_item} {local_res.css.eventregattaraces_legend_itemaudio}"><ui:text from='{i18n.eventRegattaRacesLegendAudio}'/></div>-->
       </div>
       <g:HTMLPanel ui:field="regattaPhasesPanel" />
     </div>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.java
index b1738436e4d..deaeb734eeb 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.java
@@ -30,7 +30,6 @@ public class EventRegattaRacesRace extends Composite {
     @UiField DivElement fleetColor;
     @UiField SpanElement raceName;
     @UiField SpanElement raceName2;
-    @UiField SpanElement raceState;
     @UiField SpanElement raceTime;
     @UiField SpanElement averageRaceWind;
     
@@ -54,7 +53,7 @@ public class EventRegattaRacesRace extends Composite {
     
     @UiField DivElement featureGPS;
     @UiField DivElement featureWind;
-    @UiField DivElement featureAudio;
+    // @UiField DivElement featureAudio;
     @UiField DivElement featureVideo;
     
     @UiField SpanElement currentLegNo;
@@ -168,11 +167,13 @@ public class EventRegattaRacesRace extends Composite {
         } else {
             featureVideo.setTitle(String.valueOf(race.trackedRaceStatistics.videoTracksCount));
         }
+        /* not used for now 
         if(!race.trackedRaceStatistics.hasAudioData) {
             featureAudio.addClassName(EventRegattaRacesResources.INSTANCE.css().eventregattarace_featureunavailable());
         } else {
             featureAudio.setTitle(String.valueOf(race.trackedRaceStatistics.audioTracksCount));
         }
+        */
     }
     
     private void hideElement(Element el) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.ui.xml b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.ui.xml
index dbf0cc923e5..5b2e1c75b93 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.ui.xml
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesRace.ui.xml
@@ -11,7 +11,7 @@
   <div class="{local_res.css.eventregattarace_details} {local_res.css.eventregattarace_name}">
       <span ui:field="raceName" class="{local_res.css.eventregattarace_nameshort}"></span>
       <ui:text from='{i18n.eventRegattaRaceRace}'/>&nbsp;<span ui:field="raceName2" /><br></br>
-      <span ui:field="raceState" />&nbsp;<span ui:field="raceTime" />
+      <span ui:field="raceTime" class="{local_res.css.eventregattarace_racetime}" />
   </div>
   <!-- race state  if race.isScheduled and race.isTracked -->
   <div ui:field="raceFlagDiv" class="{local_res.css.eventregattarace_details} {local_res.css.eventregattarace_flag}">
@@ -36,7 +36,7 @@
     <div ui:field="featureGPS" class="{local_res.css.eventregattarace_feature} {local_res.css.eventregattarace_featuregps}"></div>
     <div ui:field="featureWind" class="{local_res.css.eventregattarace_feature} {local_res.css.eventregattarace_featurewind}"></div>
     <div ui:field="featureVideo" class="{local_res.css.eventregattarace_feature} {local_res.css.eventregattarace_featurevideo}"></div>
-    <div ui:field="featureAudio" class="{local_res.css.eventregattarace_feature} {local_res.css.eventregattarace_featureaudio}"></div>
+    <!--<div ui:field="featureAudio" class="{local_res.css.eventregattarace_feature} {local_res.css.eventregattarace_featureaudio}"></div> -->
   </div>
   <div ui:field="raceNotTrackedDiv" class="{local_res.css.eventregattarace_action} {local_res.css.eventregattarace_actiondisabled}">
       <ui:text from='{i18n.eventRegattaRaceNotTracked}'/>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesResources.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesResources.java
index 04301953cb1..474b001b7c1 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesResources.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/regattaraces/EventRegattaRacesResources.java
@@ -33,6 +33,7 @@ public interface EventRegattaRacesResources extends ClientBundle {
         String eventregattarace_details();
         String eventregattarace_name();
         String eventregattarace_nameshort();
+        String eventregattarace_racetime();
         String eventregattarace_flag();
         String eventregattarace_wind();
         String eventregattarace_wind_strength();