diff --git a/MyTracks/res/layout/stats_core.xml b/MyTracks/res/layout/stats_core.xml
index b8aabf48e..64dd9bfab 100644
--- a/MyTracks/res/layout/stats_core.xml
+++ b/MyTracks/res/layout/stats_core.xml
@@ -29,21 +29,32 @@ limitations under the License.
   <!-- Total time/moving time -->
   <TableRow>
     <TextView
-      android:id="@+id/stats_total_time_label"
+      android:text="@string/stats_total_time"
+      style="@style/StatsLabel" />
+    <TextView
+      android:id="@+id/stats_moving_time_label"
+      android:layout_column="2"
+      android:text="@string/stats_moving_time"
       style="@style/StatsLabel" />
   </TableRow>
   <TableRow>
     <TextView
       android:id="@+id/stats_total_time_value"
       style="@style/StatsValue" />
+    <TextView 
+      android:id="@+id/stats_moving_time_spacer"
+      style="@style/StatsSpacer" />
+    <TextView
+      android:id="@+id/stats_moving_time_value"
+      style="@style/StatsValue" />
   </TableRow>
-  <!-- Average speed/average moving speed and max speed (average pace/average moving pace and fastest pace) -->
+  <!-- Average speed/average moving speed (average pace/average moving pace) -->
   <TableRow>
     <TextView
       android:id="@+id/stats_average_speed_label"
       style="@style/StatsLabel" />
     <TextView
-      android:id="@+id/stats_max_speed_label"
+      android:id="@+id/stats_average_moving_speed_label"
       android:layout_column="2"
       style="@style/StatsLabel" />
   </TableRow>
@@ -51,7 +62,20 @@ limitations under the License.
     <TextView
       android:id="@+id/stats_average_speed_value"
       style="@style/StatsValue" />
-    <TextView style="@style/StatsSpacer" />
+    <TextView 
+      android:id="@+id/stats_average_moving_speed_spacer"
+      style="@style/StatsSpacer" />
+    <TextView
+      android:id="@+id/stats_average_moving_speed_value"
+      style="@style/StatsValue" />
+  </TableRow>
+  <!-- Max speed (fastest pace) -->
+  <TableRow>
+    <TextView
+      android:id="@+id/stats_max_speed_label"
+      style="@style/StatsLabel" />
+  </TableRow>
+  <TableRow>
     <TextView
       android:id="@+id/stats_max_speed_value"
       style="@style/StatsValue" />
diff --git a/MyTracks/res/layout/track_widget.xml b/MyTracks/res/layout/track_widget.xml
index d1f34e7e5..952ee31c1 100644
--- a/MyTracks/res/layout/track_widget.xml
+++ b/MyTracks/res/layout/track_widget.xml
@@ -39,10 +39,7 @@ limitations under the License.
       android:layout_width="0dp"
       android:orientation="vertical"
       android:paddingLeft="8dp" >
-      <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal" >
+      <LinearLayout style="@style/TrackWidgetStat" >
         <TextView
           android:id="@+id/track_widget_distance_value"
           style="@style/TrackWidgetValue" />
@@ -50,34 +47,48 @@ limitations under the License.
           android:text="@string/stats_total_distance"
           style="@style/TrackWidgetLabel" />
       </LinearLayout>
-      <LinearLayout
-        android:background="@color/track_widget_line"
-        android:layout_height="1dp"
-        android:layout_width="fill_parent" />
-      <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal" >
+      <LinearLayout style="@style/TrackWidgetSeparator" />
+      <LinearLayout style="@style/TrackWidgetStat" >
         <TextView
-          android:id="@+id/track_widget_time_value"
+          android:id="@+id/track_widget_total_time_value"
           style="@style/TrackWidgetValue" />
         <TextView
-          android:id="@+id/track_widget_time_label"
+          android:text="@string/stats_total_time"
+          style="@style/TrackWidgetLabel" />
+      </LinearLayout>
+      <LinearLayout style="@style/TrackWidgetSeparator" />
+      <LinearLayout style="@style/TrackWidgetStat" >
+        <TextView
+          android:id="@+id/track_widget_average_speed_value"
+          style="@style/TrackWidgetValue" />
+        <TextView
+          android:id="@+id/track_widget_average_speed_label"
           style="@style/TrackWidgetLabel" />
       </LinearLayout>
       <LinearLayout
-        android:background="@color/track_widget_line"
-        android:layout_height="1dp"
-        android:layout_width="fill_parent" />
+        android:id="@+id/track_widget_moving_time_separator"
+        style="@style/TrackWidgetSeparator" />
       <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal" >
+        android:id="@+id/track_widget_moving_time_stat"
+        style="@style/TrackWidgetStat" >
         <TextView
-          android:id="@+id/track_widget_speed_value"
+          android:id="@+id/track_widget_moving_time_value"
           style="@style/TrackWidgetValue" />
         <TextView
-          android:id="@+id/track_widget_speed_label"
+          android:text="@string/stats_moving_time"
+          style="@style/TrackWidgetLabel" />
+      </LinearLayout>
+      <LinearLayout
+        android:id="@+id/track_widget_average_moving_speed_separator"
+        style="@style/TrackWidgetSeparator" />
+      <LinearLayout
+        android:id="@+id/track_widget_average_moving_speed_stat"
+        style="@style/TrackWidgetStat" >
+        <TextView
+          android:id="@+id/track_widget_average_moving_speed_value"
+          style="@style/TrackWidgetValue" />
+        <TextView
+          android:id="@+id/track_widget_average_moving_speed_label"
           style="@style/TrackWidgetLabel" />
       </LinearLayout>
       <ImageButton
diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml
index b88acdaeb..0cbdb8b13 100644
--- a/MyTracks/res/values/keys.xml
+++ b/MyTracks/res/values/keys.xml
@@ -53,7 +53,7 @@ limitations under the License.
   <string name="stats_show_coordinate_key">statsShowCoordinate</string>
   <string name="stats_show_elevation_key">statsShowElevation</string>
   <string name="stats_show_grade_key">statsShowGrade</string>
-  <string name="stats_use_total_time_key">statsUseTotalTime</string>
+  <string name="stats_show_moving_time_key">statsShowMovingTime</string>
   <string name="track_color_mode_medium_key">trackColorModeMedium</string>
   <string name="track_color_mode_percentage_key">trackColorModePercentage</string>
   <string name="track_color_mode_slow_key">trackColorModeSlow</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 808edd17a..6600757f7 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -2038,13 +2038,6 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Preferred rate
   </string>
-  <string name="settings_stats_time_title"
-    translation_description="In the 'Stats' settings, the option to change the time measurement,
-      either total time or moving time.
-
-      Character limit: ~23 (1 line)">
-    Time measurement
-  </string>
   <string name="settings_stats_units_imperial"
     translation_description="In the 'Stats' settings, the option to use imperial units, with
       examples.">
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 51e31bd80..965bb535f 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
   <!-- The style for the about value -->
   <style name="AboutValue" parent="@style/TextMedium">
     <item name="android:paddingLeft">48dp</item>
@@ -180,10 +180,6 @@ limitations under the License.
   </style>
   <!-- Theme selector -->
   <style name="ThemeSelector" parent="android:Theme" />
-  <!-- The style for the track widget label -->
-  <style name="TrackWidgetLabel" parent="@style/TextSmall">
-    <item name="android:width">100dp</item>
-  </style>
   <!-- The style for the track widget button -->
   <style name="TrackWidgetButton">
     <item name="android:layout_gravity">center_horizontal</item>
@@ -192,6 +188,22 @@ limitations under the License.
     <item name="android:layout_width">fill_parent</item>
     <item name="android:padding">8dp</item>
   </style>
+  <!-- The style for the track widget label -->
+  <style name="TrackWidgetLabel" parent="@style/TextSmall">
+    <item name="android:width">100dp</item>
+  </style>
+  <!-- The style for the track widget separator -->
+  <style name="TrackWidgetSeparator">
+    <item name="android:background">@color/track_widget_line</item>
+    <item name="android:layout_height">1dp</item>
+    <item name="android:layout_width">fill_parent</item>
+  </style>
+  <!-- The style for the track widget stat -->
+  <style name="TrackWidgetStat">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:orientation">horizontal</item>
+  </style>
   <!-- The style for the track widget value -->
   <style name="TrackWidgetValue" parent="@style/TextSmall">
     <item name="android:layout_weight">1</item>
diff --git a/MyTracks/res/xml/stats_settings.xml b/MyTracks/res/xml/stats_settings.xml
index 42c628a51..6b0f4efd0 100644
--- a/MyTracks/res/xml/stats_settings.xml
+++ b/MyTracks/res/xml/stats_settings.xml
@@ -26,13 +26,11 @@ limitations under the License.
     android:defaultValue="true"
     android:key="@string/report_speed_key"
     android:title="@string/settings_stats_rate_title" />
-  <CheckBoxPreference
-    android:defaultValue="true"
-    android:key="@string/stats_use_total_time_key"
-    android:summaryOff="@string/stats_moving_time"
-    android:summaryOn="@string/stats_total_time"
-    android:title="@string/settings_stats_time_title" />
   <PreferenceCategory android:title="@string/settings_show" >
+    <CheckBoxPreference
+      android:defaultValue="false"
+      android:key="@string/stats_show_moving_time_key"
+      android:title="@string/stats_moving_time" />
     <CheckBoxPreference
       android:defaultValue="false"
       android:key="@string/stats_show_elevation_key"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
index d31f8c867..9ace174a2 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
@@ -80,7 +80,7 @@ public class PreferencesUtils {
   public static final boolean STATS_SHOW_COORDINATE_DEFAULT = false;
   public static final boolean STATS_SHOW_ELEVATION_DEFAULT = false;
   public static final boolean STATS_SHOW_GRADE_DEFAULT = false;
-  public static final boolean STATS_USE_TOTAL_TIME_DEFAULT = true;
+  public static final boolean STATS_SHOW_MOVING_TIME_DEFAULT = false;
 
   public static final int TRACK_COLOR_MODE_MEDIUM_DEFAULT = 15;
   public static final int TRACK_COLOR_MODE_PERCENTAGE_DEFAULT = 25;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
index 9b19f91b3..cc12308c6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
@@ -104,46 +104,49 @@ public class StatsUtils {
         activity, R.string.metric_units_key, PreferencesUtils.METRIC_UNITS_DEFAULT);
     boolean reportSpeed = PreferencesUtils.getBoolean(
         activity, R.string.report_speed_key, PreferencesUtils.REPORT_SPEED_DEFAULT);
-    boolean useTotalTime = PreferencesUtils.getBoolean(
-        activity, R.string.stats_use_total_time_key, PreferencesUtils.STATS_USE_TOTAL_TIME_DEFAULT);
+    boolean showMovingTime = PreferencesUtils.getBoolean(activity,
+        R.string.stats_show_moving_time_key, PreferencesUtils.STATS_SHOW_MOVING_TIME_DEFAULT);
     
     // Set total distance
     double totalDistance = tripStatistics == null ? Double.NaN : tripStatistics.getTotalDistance();
     setDistanceValue(activity, R.id.stats_total_distance_value, totalDistance, metricUnits);
     
-    // Set total time/moving time
-    setTimeLabel(activity, R.id.stats_total_time_label, R.string.stats_total_time,
-        R.string.stats_moving_time, useTotalTime);
-    long totalTime;
-    if (tripStatistics == null) {
-      totalTime = -1L;
-    } else {
-      totalTime = useTotalTime ? tripStatistics.getTotalTime() : tripStatistics.getMovingTime(); 
-    }
-    setTimeValue(activity, R.id.stats_total_time_value, totalTime);
-    
-    // Set average speed/moving average speed
-    if (useTotalTime) {
-      setSpeedLabel(activity, R.id.stats_average_speed_label, R.string.stats_average_speed,
-          R.string.stats_average_pace, reportSpeed);
-    } else {
-      setSpeedLabel(activity, R.id.stats_average_speed_label, R.string.stats_average_moving_speed,
-          R.string.stats_average_moving_pace, reportSpeed);
-    }
-    double averageSpeed;
-    if (tripStatistics == null) {
-      averageSpeed = Double.NaN;
-    } else {
-      averageSpeed = useTotalTime ? tripStatistics.getAverageSpeed()
-          : tripStatistics.getAverageMovingSpeed();
+    // Set total time
+    setTimeValue(activity, R.id.stats_total_time_value,
+        tripStatistics != null ? tripStatistics.getTotalTime() : -1L);
+
+    // Set moving time
+    setItemVisibility(activity, R.id.stats_moving_time_label, R.id.stats_moving_time_spacer,
+        R.id.stats_moving_time_value, showMovingTime);
+    if (showMovingTime) {
+      setTimeValue(activity, R.id.stats_moving_time_value,
+          tripStatistics != null ? tripStatistics.getMovingTime() : -1L);
     }
+
+    // Set average speed
+    setSpeedLabel(activity, R.id.stats_average_speed_label, R.string.stats_average_speed,
+        R.string.stats_average_pace, reportSpeed);
+    double averageSpeed = tripStatistics != null ? tripStatistics.getAverageSpeed() : Double.NaN;
     setSpeedValue(activity, R.id.stats_average_speed_value, averageSpeed, metricUnits, reportSpeed);
     
+    // Set average moving speed
+    setItemVisibility(activity, R.id.stats_average_moving_speed_label,
+        R.id.stats_average_moving_speed_spacer, R.id.stats_average_moving_speed_value,
+        showMovingTime);
+    if (showMovingTime) {
+      setSpeedLabel(activity, R.id.stats_average_moving_speed_label,
+          R.string.stats_average_moving_speed, R.string.stats_average_moving_pace, reportSpeed);
+      double averageMovingSpeed = tripStatistics != null ? tripStatistics.getAverageMovingSpeed()
+          : Double.NaN;
+      setSpeedValue(activity, R.id.stats_average_moving_speed_value, averageMovingSpeed,
+          metricUnits, reportSpeed);
+    }
+
     // Set max speed
     setSpeedLabel(activity, R.id.stats_max_speed_label, R.string.stats_max_speed,
         R.string.stats_fastest_pace, reportSpeed);
     double maxSpeed = tripStatistics == null ? Double.NaN : tripStatistics.getMaxSpeed();
-    setSpeedValue(activity, R.id.stats_max_speed_value, maxSpeed, metricUnits, reportSpeed);    
+    setSpeedValue(activity, R.id.stats_max_speed_value, maxSpeed, metricUnits, reportSpeed);
     
     // Set elevation
     boolean showElevation = PreferencesUtils.getBoolean(
@@ -189,23 +192,21 @@ public class StatsUtils {
       setGradeValue(activity, R.id.stats_max_grade_value, maxGrade);
     }
   }
-  
-  /**
-   * Sets a time label.
-   * 
-   * @param activity the activity
-   * @param id the time label resource id
-   * @param totalTimeId the total time string id
-   * @param movingTimeId the moving time string id
-   * @param totalTime true to use total time
-   */
-  private static void setTimeLabel(Activity activity, int id, int totalTimeId, int movingTimeId,
-      boolean totalTime) {
-    TextView textView = (TextView) activity.findViewById(id);
-    if (textView == null) {
-      return;
+
+  private static void setItemVisibility(
+      Activity activity, int labelId, int spacerId, int valueId, boolean show) {
+    View label = activity.findViewById(labelId);
+    View spacer = activity.findViewById(spacerId);
+    View value = activity.findViewById(valueId);
+    if (label != null) {
+      label.setVisibility(show ? View.VISIBLE : View.GONE);
+    }
+    if (spacer != null) {
+      spacer.setVisibility(show ? View.VISIBLE : View.GONE);
+    }
+    if (value != null) {
+      value.setVisibility(show ? View.VISIBLE : View.GONE);
     }
-    textView.setText(totalTime ? totalTimeId : movingTimeId);
   }
 
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
index dfb12112c..67d4f4d63 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java
@@ -79,12 +79,12 @@ public class TrackWidgetProvider extends AppWidgetProvider
   private String unknown;
   private String trackStartedBroadcastAction;
   private String trackStoppedBroadcastAction;
-  
+
   private SharedPreferences sharedPreferences;
   private long selectedTrackId;
   private boolean metricUnits;
   private boolean reportSpeed;
-  private boolean useTotalTime;
+  private boolean showMovingTime;
 
   public TrackWidgetProvider() {
     super();
@@ -93,21 +93,21 @@ public class TrackWidgetProvider extends AppWidgetProvider
 
   @Override
   public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-    if (key == null || PreferencesUtils.getKey(context, R.string.metric_units_key).equals(key)) {
+    if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.metric_units_key))) {
       metricUnits = PreferencesUtils.getBoolean(
           context, R.string.metric_units_key, PreferencesUtils.METRIC_UNITS_DEFAULT);
     }
-    if (key == null || PreferencesUtils.getKey(context, R.string.report_speed_key).equals(key)) {
+    if (key == null || key.equals(PreferencesUtils.getKey(context, R.string.report_speed_key))) {
       reportSpeed = PreferencesUtils.getBoolean(
           context, R.string.report_speed_key, PreferencesUtils.REPORT_SPEED_DEFAULT);
     }
     if (key == null
-        || PreferencesUtils.getKey(context, R.string.stats_use_total_time_key).equals(key)) {
-      useTotalTime = PreferencesUtils.getBoolean(context, R.string.stats_use_total_time_key,
-          PreferencesUtils.STATS_USE_TOTAL_TIME_DEFAULT);
+        || key.equals(PreferencesUtils.getKey(context, R.string.stats_show_moving_time_key))) {
+      showMovingTime = PreferencesUtils.getBoolean(context, R.string.stats_show_moving_time_key,
+          PreferencesUtils.STATS_SHOW_MOVING_TIME_DEFAULT);
     }
     if (key == null
-        || PreferencesUtils.getKey(context, R.string.selected_track_id_key).equals(key)) {
+        || key.equals(PreferencesUtils.getKey(context, R.string.selected_track_id_key))) {
       selectedTrackId = PreferencesUtils.getLong(context, R.string.selected_track_id_key);
     }
     if (key != null) {
@@ -155,15 +155,15 @@ public class TrackWidgetProvider extends AppWidgetProvider
     context = aContext;
     trackObserver = new TrackObserver();
     myTracksProviderUtils = MyTracksProviderUtils.Factory.get(context);
-    
+
     unknown = context.getString(R.string.value_unknown);
     trackStartedBroadcastAction = context.getString(R.string.track_started_broadcast_action);
     trackStoppedBroadcastAction = context.getString(R.string.track_stopped_broadcast_action);
-  
+
     sharedPreferences = context.getSharedPreferences(SETTINGS_NAME, Context.MODE_PRIVATE);
     sharedPreferences.registerOnSharedPreferenceChangeListener(this);
     onSharedPreferenceChanged(sharedPreferences, null);
-  
+
     context.getContentResolver()
         .registerContentObserver(TracksColumns.CONTENT_URI, true, trackObserver);
   }
@@ -197,16 +197,17 @@ public class TrackWidgetProvider extends AppWidgetProvider
    */
   private void updateButton(RemoteViews remoteViews, String action) {
     boolean isRecording = trackStartedBroadcastAction.equals(action);
-    remoteViews.setViewVisibility(R.id.track_widget_record_button, isRecording ? View.GONE
-        : View.VISIBLE);
-    remoteViews.setViewVisibility(R.id.track_widget_stop_button, isRecording ? View.VISIBLE
-        : View.INVISIBLE);
+    remoteViews.setViewVisibility(
+        R.id.track_widget_record_button, isRecording ? View.GONE : View.VISIBLE);
+    remoteViews.setViewVisibility(
+        R.id.track_widget_stop_button, isRecording ? View.VISIBLE : View.INVISIBLE);
     Intent intent = new Intent(context, ControlRecordingService.class).setAction(
         context.getString(isRecording ? R.string.track_action_end : R.string.track_action_start));
     PendingIntent pendingIntent = PendingIntent.getService(
         context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-    remoteViews.setOnClickPendingIntent(isRecording ? R.id.track_widget_stop_button
-        : R.id.track_widget_record_button, pendingIntent);
+    remoteViews.setOnClickPendingIntent(
+        isRecording ? R.id.track_widget_stop_button : R.id.track_widget_record_button,
+        pendingIntent);
   }
 
   /**
@@ -215,31 +216,48 @@ public class TrackWidgetProvider extends AppWidgetProvider
    * @param remoteViews the remote views
    */
   private void updateView(RemoteViews remoteViews) {
-    Track track = selectedTrackId != PreferencesUtils.SELECTED_TRACK_ID_DEFAULT 
-        ? myTracksProviderUtils.getTrack(selectedTrackId) : myTracksProviderUtils.getLastTrack();
+    Track track = selectedTrackId != PreferencesUtils.SELECTED_TRACK_ID_DEFAULT ? myTracksProviderUtils
+        .getTrack(selectedTrackId)
+        : myTracksProviderUtils.getLastTrack();
     TripStatistics tripStatistics = track == null ? null : track.getTripStatistics();
-    String distance = tripStatistics == null ? unknown
+
+    String distanceValue = tripStatistics == null ? unknown
         : StringUtils.formatDistance(context, tripStatistics.getTotalDistance(), metricUnits);
-    int timeLabelId = useTotalTime ? R.string.stats_total_time : R.string.stats_moving_time;
-    String time = tripStatistics == null ? unknown : StringUtils.formatElapsedTime(
-        useTotalTime ? tripStatistics.getTotalTime()
-            : tripStatistics.getMovingTime());
-    int speedLabelId;
-    if (useTotalTime) {
-      speedLabelId = reportSpeed ? R.string.stats_average_speed : R.string.stats_average_pace;
-    } else {
-      speedLabelId = reportSpeed ? R.string.stats_average_moving_speed
-          : R.string.stats_average_moving_pace;
+    remoteViews.setTextViewText(R.id.track_widget_distance_value, distanceValue);
+
+    String totalTimeValue = tripStatistics == null ? unknown
+        : StringUtils.formatElapsedTime(tripStatistics.getTotalTime());
+    remoteViews.setTextViewText(R.id.track_widget_total_time_value, totalTimeValue);
+
+    String averageSpeedLabel = context.getString(
+        reportSpeed ? R.string.stats_average_speed : R.string.stats_average_pace);
+    remoteViews.setTextViewText(R.id.track_widget_average_speed_label, averageSpeedLabel);
+    String averageSpeedValue = tripStatistics == null ? unknown
+        : StringUtils.formatSpeed(
+            context, tripStatistics.getAverageSpeed(), metricUnits, reportSpeed);
+    remoteViews.setTextViewText(R.id.track_widget_average_speed_value, averageSpeedValue);
+
+    setStatVisibility(remoteViews, R.id.track_widget_moving_time_stat,
+        R.id.track_widget_moving_time_separator, showMovingTime);
+    if (showMovingTime) {
+      String movingTimeValue = tripStatistics == null ? unknown
+          : StringUtils.formatElapsedTime(tripStatistics.getMovingTime());
+      remoteViews.setTextViewText(R.id.track_widget_moving_time_value, movingTimeValue);
     }
 
-    String speed = tripStatistics == null ? unknown : StringUtils.formatSpeed(
-        context, useTotalTime ? tripStatistics.getAverageSpeed()
-            : tripStatistics.getAverageMovingSpeed(), metricUnits, reportSpeed);
-    remoteViews.setTextViewText(R.id.track_widget_distance_value, distance);
-    remoteViews.setTextViewText(R.id.track_widget_time_label, context.getString(timeLabelId));
-    remoteViews.setTextViewText(R.id.track_widget_time_value, time);
-    remoteViews.setTextViewText(R.id.track_widget_speed_label, context.getString(speedLabelId));
-    remoteViews.setTextViewText(R.id.track_widget_speed_value, speed);
+    setStatVisibility(remoteViews, R.id.track_widget_average_moving_speed_stat,
+        R.id.track_widget_average_moving_speed_separator, showMovingTime);
+    if (showMovingTime) {
+      String averageMovingSpeedLabel = context.getString(
+          reportSpeed ? R.string.stats_average_moving_speed : R.string.stats_average_moving_pace);
+      remoteViews.setTextViewText(
+          R.id.track_widget_average_moving_speed_label, averageMovingSpeedLabel);
+      String averageMovingSpeedValue = tripStatistics == null ? unknown
+          : StringUtils.formatSpeed(
+              context, tripStatistics.getAverageMovingSpeed(), metricUnits, reportSpeed);
+      remoteViews.setTextViewText(
+          R.id.track_widget_average_moving_speed_value, averageMovingSpeedValue);
+    }
 
     Intent intent;
     if (track != null) {
@@ -251,8 +269,13 @@ public class TrackWidgetProvider extends AppWidgetProvider
     TaskStackBuilder taskStackBuilder = TaskStackBuilder.from(context);
     taskStackBuilder.addNextIntent(intent);
     PendingIntent pendingIntent = taskStackBuilder.getPendingIntent(0, 0);
-    remoteViews.setOnClickPendingIntent(
-        R.id.track_widget_statistics, pendingIntent);
+    remoteViews.setOnClickPendingIntent(R.id.track_widget_statistics, pendingIntent);
     remoteViews.setOnClickPendingIntent(R.id.track_widget_icon, pendingIntent);
   }
+
+  private void setStatVisibility(
+      RemoteViews remoteViews, int statId, int separatorId, boolean show) {
+    remoteViews.setViewVisibility(statId, show ? View.VISIBLE : View.GONE);
+    remoteViews.setViewVisibility(separatorId, show ? View.VISIBLE : View.GONE);
+  }
 }