]> git.street.me.uk Git - andy/viking.git/blobdiff - src/viktrwlayer_propwin.c
[QA] Fix clang warning: format string is not a string literal
[andy/viking.git] / src / viktrwlayer_propwin.c
index 69de34a12f0faf16f020ae3ab2dc1fe88b8383b7..be96f509a6786bd39a042e92ab5ca7d3dcf0d318 100644 (file)
@@ -2,6 +2,9 @@
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
+ * Copyright (C) 2005-2007, Alex Foobarian <foobarian@gmail.com>
+ * Copyright (C) 2007-2008, Quy Tonthat <qtonthat@gmail.com>
+ * Copyright (C) 2012-2014, Rob Norris <rw_norris@hotmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include "config.h"
 #endif
 
+#ifdef HAVE_MATH_H
 #include <math.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <time.h>
+#ifdef HAVE_STRING_H
 #include <string.h>
-#include "coords.h"
-#include "vikcoord.h"
-#include "viktrack.h"
+#endif
 #include "viktrwlayer.h"
 #include "viktrwlayer_propwin.h"
-#include "vikwaypoint.h"
-#include "dialog.h"
-#include "globals.h"
 #include "dems.h"
-
+#include "viking.h"
 #include "vikviewport.h" /* ugh */
-#include "viktreeview.h" /* ugh */
+#include "vikutils.h"
+#include "ui_util.h"
 #include <gdk-pixbuf/gdk-pixdata.h>
-#include "viklayer.h" /* ugh */
-#include "vikaggregatelayer.h"
-#include "viklayerspanel.h" /* ugh */
 
-#define PROFILE_WIDTH 600
-#define PROFILE_HEIGHT 300
-#define MIN_ALT_DIFF 100.0
-#define MIN_SPEED_DIFF 20.0
+typedef enum {
+  PROPWIN_GRAPH_TYPE_ELEVATION_DISTANCE,
+  PROPWIN_GRAPH_TYPE_GRADIENT_DISTANCE,
+  PROPWIN_GRAPH_TYPE_SPEED_TIME,
+  PROPWIN_GRAPH_TYPE_DISTANCE_TIME,
+  PROPWIN_GRAPH_TYPE_ELEVATION_TIME,
+  PROPWIN_GRAPH_TYPE_SPEED_DISTANCE,
+  PROPWIN_GRAPH_TYPE_END,
+} VikPropWinGraphType_t;
+
+/* (Hopefully!) Human friendly altitude grid sizes - note no fixed 'ratio' just numbers that look nice...*/
+static const gdouble chunksa[] = {2.0, 5.0, 10.0, 15.0, 20.0,
+                                 25.0, 40.0, 50.0, 75.0, 100.0,
+                                 150.0, 200.0, 250.0, 375.0, 500.0,
+                                 750.0, 1000.0, 2000.0, 5000.0, 10000.0, 100000.0};
+
+/* (Hopefully!) Human friendly gradient grid sizes - note no fixed 'ratio' just numbers that look nice...*/
+static const gdouble chunksg[] = {1.0, 2.0, 3.0, 4.0, 5.0, 8.0, 10.0,
+                                 12.0, 15.0, 20.0, 25.0, 30.0, 35.0, 40.0, 45.0, 50.0, 75.0,
+                                 100.0, 150.0, 200.0, 250.0, 375.0, 500.0,
+                                 750.0, 1000.0, 10000.0, 100000.0};
+// Normally gradients should range up to couple hundred precent at most,
+//  however there are possibilities of having points with no altitude after a point with a big altitude
+//  (such as places with invalid DEM values in otherwise mountainous regions) - thus giving huge negative gradients.
+
+/* (Hopefully!) Human friendly grid sizes - note no fixed 'ratio' just numbers that look nice...*/
+/* As need to cover walking speeds - have many low numbers (but also may go up to airplane speeds!) */
+static const gdouble chunkss[] = {1.0, 2.0, 3.0, 4.0, 5.0, 8.0, 10.0,
+                                 15.0, 20.0, 25.0, 40.0, 50.0, 75.0,
+                                 100.0, 150.0, 200.0, 250.0, 375.0, 500.0,
+                                 750.0, 1000.0, 10000.0};
+
+/* (Hopefully!) Human friendly distance grid sizes - note no fixed 'ratio' just numbers that look nice...*/
+static const gdouble chunksd[] = {0.1, 0.2, 0.5, 1.0, 2.0, 3.0, 4.0, 5.0, 8.0, 10.0,
+                                 15.0, 20.0, 25.0, 40.0, 50.0, 75.0,
+                                 100.0, 150.0, 200.0, 250.0, 375.0, 500.0,
+                                 750.0, 1000.0, 10000.0};
+
+// Time chunks in seconds
+static const time_t chunkst[] = {
+  60,     // 1 minute
+  120,    // 2 minutes
+  300,    // 5 minutes
+  900,    // 15 minutes
+  1800,   // half hour
+  3600,   // 1 hour
+  10800,  // 3 hours
+  21600,  // 6 hours
+  43200,  // 12 hours
+  86400,  // 1 day
+  172800, // 2 days
+  604800, // 1 week
+  1209600,// 2 weeks
+  2419200,// 4 weeks
+};
+
+// Local show settings to restore on dialog opening
+static gboolean show_dem                = TRUE;
+static gboolean show_alt_gps_speed      = TRUE;
+static gboolean show_gps_speed          = TRUE;
+static gboolean show_gradient_gps_speed = TRUE;
+static gboolean show_dist_speed         = FALSE;
+static gboolean show_elev_speed         = FALSE;
+static gboolean show_elev_dem           = FALSE;
+static gboolean show_sd_gps_speed       = TRUE;
 
 typedef struct _propsaved {
   gboolean saved;
-  gint pos;
   GdkImage *img;
 } PropSaved;
 
 typedef struct _propwidgets {
+  gboolean  configure_dialog;
   VikTrwLayer *vtl;
   VikTrack *tr;
+  VikViewport *vvp;
   VikLayersPanel *vlp;
-  gchar *track_name;
+  gint      profile_width;
+  gint      profile_height;
+  gint      profile_width_old;
+  gint      profile_height_old;
+  gint      profile_width_offset;
+  gint      profile_height_offset;
   GtkWidget *dialog;
   GtkWidget *w_comment;
+  GtkWidget *w_description;
   GtkWidget *w_track_length;
   GtkWidget *w_tp_count;
   GtkWidget *w_segment_count;
   GtkWidget *w_duptp_count;
   GtkWidget *w_max_speed;
   GtkWidget *w_avg_speed;
+  GtkWidget *w_mvg_speed;
   GtkWidget *w_avg_dist;
   GtkWidget *w_elev_range;
   GtkWidget *w_elev_gain;
   GtkWidget *w_time_start;
   GtkWidget *w_time_end;
   GtkWidget *w_time_dur;
+  GtkWidget *w_color;
+  GtkWidget *w_namelabel;
+  GtkWidget *w_number_distlabels;
   GtkWidget *w_cur_dist; /*< Current distance */
-  GtkWidget *w_cur_time; /*< Current time */
+  GtkWidget *w_cur_elevation;
+  GtkWidget *w_cur_gradient_dist; /*< Current distance on gradient graph */
+  GtkWidget *w_cur_gradient_gradient; /*< Current gradient on gradient graph */
+  GtkWidget *w_cur_time; /*< Current track time */
+  GtkWidget *w_cur_time_real; /*< Actual time as on a clock */
+  GtkWidget *w_cur_speed;
+  GtkWidget *w_cur_dist_dist; /*< Current distance on distance graph */
+  GtkWidget *w_cur_dist_time; /*< Current track time on distance graph */
+  GtkWidget *w_cur_dist_time_real; // Clock time
+  GtkWidget *w_cur_elev_elev;
+  GtkWidget *w_cur_elev_time; // Track time
+  GtkWidget *w_cur_elev_time_real; // Clock time
+  GtkWidget *w_cur_speed_dist;
+  GtkWidget *w_cur_speed_speed;
+  GtkWidget *w_show_dem;
+  GtkWidget *w_show_alt_gps_speed;
+  GtkWidget *w_show_gps_speed;
+  GtkWidget *w_show_gradient_gps_speed;
+  GtkWidget *w_show_dist_speed;
+  GtkWidget *w_show_elev_speed;
+  GtkWidget *w_show_elev_dem;
+  GtkWidget *w_show_sd_gps_speed;
   gdouble   track_length;
+  gdouble   track_length_inc_gaps;
   PropSaved elev_graph_saved_img;
+  PropSaved gradient_graph_saved_img;
   PropSaved speed_graph_saved_img;
+  PropSaved dist_graph_saved_img;
+  PropSaved elev_time_graph_saved_img;
+  PropSaved speed_dist_graph_saved_img;
   GtkWidget *elev_box;
+  GtkWidget *gradient_box;
   GtkWidget *speed_box;
+  GtkWidget *dist_box;
+  GtkWidget *elev_time_box;
+  GtkWidget *speed_dist_box;
+  gdouble   *altitudes;
+  gdouble   *ats; // altitudes in time
+  gdouble   min_altitude;
+  gdouble   max_altitude;
+  gdouble   draw_min_altitude;
+  gdouble   draw_min_altitude_time;
+  gint      cia; // Chunk size Index into Altitudes
+  gint      ciat; // Chunk size Index into Altitudes / Time
+  // NB cia & ciat are normally same value but sometimes not due to differing methods of altitude array creation
+  //    thus also have draw_min_altitude for each altitude graph type
+  gdouble   *gradients;
+  gdouble   min_gradient;
+  gdouble   max_gradient;
+  gdouble   draw_min_gradient;
+  gint      cig; // Chunk size Index into Gradients
+  gdouble   *speeds;
+  gdouble   *speeds_dist;
+  gdouble   min_speed;
+  gdouble   max_speed;
+  gdouble   draw_min_speed;
+  gdouble   max_speed_dist;
+  gint      cis; // Chunk size Index into Speeds
+  gint      cisd; // Chunk size Index into Speed/Distance
+  gdouble   *distances;
+  gint      cid; // Chunk size Index into Distance
   VikTrackpoint *marker_tp;
+  gboolean  is_marker_drawn;
+  VikTrackpoint *blob_tp;
+  gboolean  is_blob_drawn;
+  time_t    duration;
+  gchar     *tz; // TimeZone at track's location
 } PropWidgets;
 
 static PropWidgets *prop_widgets_new()
@@ -95,35 +226,158 @@ static PropWidgets *prop_widgets_new()
 
 static void prop_widgets_free(PropWidgets *widgets)
 {
-
   if (widgets->elev_graph_saved_img.img)
     g_object_unref(widgets->elev_graph_saved_img.img);
+  if (widgets->gradient_graph_saved_img.img)
+    g_object_unref(widgets->gradient_graph_saved_img.img);
   if (widgets->speed_graph_saved_img.img)
     g_object_unref(widgets->speed_graph_saved_img.img);
+  if (widgets->dist_graph_saved_img.img)
+    g_object_unref(widgets->dist_graph_saved_img.img);
+  if (widgets->elev_time_graph_saved_img.img)
+    g_object_unref(widgets->elev_time_graph_saved_img.img);
+  if (widgets->speed_dist_graph_saved_img.img)
+    g_object_unref(widgets->speed_dist_graph_saved_img.img);
+  if (widgets->altitudes)
+    g_free(widgets->altitudes);
+  if (widgets->gradients)
+    g_free(widgets->gradients);
+  if (widgets->speeds)
+    g_free(widgets->speeds);
+  if (widgets->distances)
+    g_free(widgets->distances);
+  if (widgets->ats)
+    g_free(widgets->ats);
+  if (widgets->speeds_dist)
+    g_free(widgets->speeds_dist);
   g_free(widgets);
 }
 
-static void minmax_alt(const gdouble *altitudes, gdouble *min, gdouble *max)
+static void minmax_array(const gdouble *array, gdouble *min, gdouble *max, gboolean NO_ALT_TEST, gint PROFILE_WIDTH)
 {
   *max = -1000;
   *min = 20000;
   guint i;
   for ( i=0; i < PROFILE_WIDTH; i++ ) {
-    if ( altitudes[i] != VIK_DEFAULT_ALTITUDE ) {
-      if ( altitudes[i] > *max )
-        *max = altitudes[i];
-      if ( altitudes[i] < *min )
-        *min = altitudes[i];
+    if ( NO_ALT_TEST || (array[i] != VIK_DEFAULT_ALTITUDE) ) {
+      if ( array[i] > *max )
+        *max = array[i];
+      if ( array[i] < *min )
+        *min = array[i];
     }
   }
 }
 
-#define MARGIN 70
+#define MARGIN_X 70
+#define MARGIN_Y 20
 #define LINES 5
-static VikTrackpoint *set_center_at_graph_position(gdouble event_x, gint img_width, VikLayersPanel *vlp, VikTrack *tr, gboolean time_base)
+/**
+ * get_new_min_and_chunk_index:
+ * Returns via pointers:
+ *   the new minimum value to be used for the graph
+ *   the index in to the chunk sizes array (ci = Chunk Index)
+ */
+static void get_new_min_and_chunk_index (gdouble mina, gdouble maxa, const gdouble *chunks, size_t chunky, gdouble *new_min, gint *ci)
+{
+  /* Get unitized chunk */
+  /* Find suitable chunk index */
+  *ci = 0;
+  gdouble diff_chunk = (maxa - mina)/LINES;
+
+  /* Loop through to find best match */
+  while (diff_chunk > chunks[*ci]) {
+    (*ci)++;
+    /* Last Resort Check */
+    if ( *ci == chunky ) {
+      // Use previous value and exit loop
+      (*ci)--;
+      break;
+    }
+  }
+
+  /* Ensure adjusted minimum .. maximum covers mina->maxa */
+
+  // Now work out adjusted minimum point to the nearest lowest chunk divisor value
+  // When negative ensure logic uses lowest value
+  if ( mina < 0 )
+    *new_min = (gdouble) ( (gint)((mina - chunks[*ci]) / chunks[*ci]) * chunks[*ci] );
+  else
+    *new_min = (gdouble) ( (gint)(mina / chunks[*ci]) * chunks[*ci] );
+
+  // Range not big enough - as new minimum has lowered
+  if ((*new_min + (chunks[*ci] * LINES) < maxa)) {
+    // Next chunk should cover it
+    if ( *ci < chunky-1 ) {
+      (*ci)++;
+      // Remember to adjust the minimum too...
+      if ( mina < 0 )
+        *new_min = (gdouble) ( (gint)((mina - chunks[*ci]) / chunks[*ci]) * chunks[*ci] );
+      else
+        *new_min = (gdouble) ( (gint)(mina / chunks[*ci]) * chunks[*ci] );
+    }
+  }
+}
+
+static guint get_time_chunk_index (time_t duration)
+{
+  // Grid split
+  time_t myduration = duration / LINES;
+
+  // Search nearest chunk index
+  guint ci = 0;
+  guint last_chunk = G_N_ELEMENTS(chunkst);
+
+  // Loop through to find best match
+  while (myduration > chunkst[ci]) {
+    ci++;
+    // Last Resort Check
+    if ( ci == last_chunk )
+      break;
+  }
+  // Use previous value
+  if ( ci != 0 )
+   ci--;
+
+  return ci;
+}
+
+/**
+ *
+ */
+static guint get_distance_chunk_index (gdouble length)
+{
+  // Grid split
+  gdouble mylength = length / LINES;
+
+  // Search nearest chunk index
+  guint ci = 0;
+  guint last_chunk = G_N_ELEMENTS(chunksd);
+
+  // Loop through to find best match
+  while (mylength > chunksd[ci]) {
+    ci++;
+    // Last Resort Check
+    if ( ci == last_chunk )
+      break;
+  }
+  // Use previous value
+  if ( ci != 0 )
+   ci--;
+
+  return ci;
+}
+
+static VikTrackpoint *set_center_at_graph_position(gdouble event_x,
+                                                  gint img_width,
+                                                  VikTrwLayer *vtl,
+                                                  VikLayersPanel *vlp,
+                                                  VikViewport *vvp,
+                                                  VikTrack *tr,
+                                                  gboolean time_base,
+                                                  gint PROFILE_WIDTH)
 {
   VikTrackpoint *trackpoint;
-  gdouble x = event_x - img_width / 2 + PROFILE_WIDTH / 2 - MARGIN / 2;
+  gdouble x = event_x - img_width / 2 + PROFILE_WIDTH / 2 - MARGIN_X / 2;
   if (x < 0)
     x = 0;
   if (x > PROFILE_WIDTH)
@@ -136,117 +390,336 @@ static VikTrackpoint *set_center_at_graph_position(gdouble event_x, gint img_wid
 
   if ( trackpoint ) {
     VikCoord coord = trackpoint->coord;
-    vik_viewport_set_center_coord ( vik_layers_panel_get_viewport(vlp), &coord );
-    vik_layers_panel_emit_update ( vlp );
+    if ( vlp ) {
+      vik_viewport_set_center_coord ( vik_layers_panel_get_viewport(vlp), &coord, TRUE );
+      vik_layers_panel_emit_update ( vlp );
+    }
+    else {
+      /* since vlp not set, vvp should be valid instead! */
+      if ( vvp )
+        vik_viewport_set_center_coord ( vvp, &coord, TRUE );
+      vik_layer_emit_update ( VIK_LAYER(vtl) );
+    }
   }
   return trackpoint;
 }
 
-static void draw_graph_mark(GtkWidget *image, gdouble event_x, gint img_width, GdkGC *gc, PropSaved *saved_img)
+/**
+ * Returns whether the marker was drawn or not and whether the blob was drawn or not
+ */
+static void save_image_and_draw_graph_marks (GtkWidget *image,
+                                            gdouble marker_x,
+                                            GdkGC *gc,
+                                            gint blob_x,
+                                            gint blob_y,
+                                            PropSaved *saved_img,
+                                            gint PROFILE_WIDTH,
+                                            gint PROFILE_HEIGHT,
+                                            gboolean *marker_drawn,
+                                            gboolean *blob_drawn)
 {
-  GdkPixmap *pix;
-  const int saved_width = 5;
+  GdkPixmap *pix = NULL;
   /* the pixmap = margin + graph area */
-  gdouble x = event_x - img_width/2 + PROFILE_WIDTH/2 + MARGIN/2;
-
-  // fprintf(stderr, "event_x=%f img_width=%d x=%f\n", event_x, img_width, x);
-
   gtk_image_get_pixmap(GTK_IMAGE(image), &pix, NULL);
+
+  /* Restore previously saved image */
   if (saved_img->saved) {
-    gdk_draw_image(GDK_DRAWABLE(pix), gc, saved_img->img, 0, 0,
-        saved_img->pos, 0, -1, -1);
+    gdk_draw_image(GDK_DRAWABLE(pix), gc, saved_img->img, 0, 0, 0, 0, MARGIN_X+PROFILE_WIDTH, MARGIN_Y+PROFILE_HEIGHT);
     saved_img->saved = FALSE;
-    gtk_widget_queue_draw_area(image,
-        saved_img->pos + img_width/2 - PROFILE_WIDTH/2 - MARGIN/2, 0,
-        saved_img->img->width, saved_img->img->height);
-  }
-  if ((x >= MARGIN) && (x < (PROFILE_WIDTH + MARGIN))) {
-    if (saved_img->img)
-      gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), saved_img->img,
-          x - (saved_width/2), 0, 0, 0, saved_img->img->width, saved_img->img->height);
-    else
-      saved_img->img = gdk_drawable_copy_to_image(GDK_DRAWABLE(pix),
-          saved_img->img, x - (saved_width/2), 0, 0, 0, saved_width, PROFILE_HEIGHT);
-    saved_img->pos = x - (saved_width/2);
-    saved_img->saved = TRUE;
-    gdk_draw_line (GDK_DRAWABLE(pix), gc, x, 0, x, image->allocation.height);
-    /* redraw the area which contains the line, saved_width is just convenient */
-    gtk_widget_queue_draw_area(image, event_x - saved_width/2, 0, saved_width, PROFILE_HEIGHT);
   }
+
+  // ATM always save whole image - as anywhere could have changed
+  if (saved_img->img)
+    gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), saved_img->img, 0, 0, 0, 0, MARGIN_X+PROFILE_WIDTH, MARGIN_Y+PROFILE_HEIGHT);
+  else
+    saved_img->img = gdk_drawable_copy_to_image(GDK_DRAWABLE(pix), saved_img->img, 0, 0, 0, 0, MARGIN_X+PROFILE_WIDTH, MARGIN_Y+PROFILE_HEIGHT);
+  saved_img->saved = TRUE;
+
+  if ((marker_x >= MARGIN_X) && (marker_x < (PROFILE_WIDTH + MARGIN_X))) {
+    gdk_draw_line (GDK_DRAWABLE(pix), gc, marker_x, MARGIN_Y, marker_x, PROFILE_HEIGHT + MARGIN_Y);
+    *marker_drawn = TRUE;
+  }
+  else
+    *marker_drawn = FALSE;
+
+  // Draw a square blob to indicate where we are on track for this graph
+  if ( (blob_x >= MARGIN_X) && (blob_x < (PROFILE_WIDTH + MARGIN_X)) && (blob_y < PROFILE_HEIGHT+MARGIN_Y) ) {
+    gdk_draw_rectangle (GDK_DRAWABLE(pix), gc, TRUE, blob_x-3, blob_y-3, 6, 6);
+    *blob_drawn = TRUE;
+  }
+  else
+    *blob_drawn = FALSE;
+  
+  // Anywhere on image could have changed
+  if (*marker_drawn || *blob_drawn)
+    gtk_widget_queue_draw(image);
 }
 
-static void track_graph_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along, gboolean is_vt_graph )
+/**
+ * Return the percentage of how far a trackpoint is a long a track via the time method
+ */
+static gdouble tp_percentage_by_time ( VikTrack *tr, VikTrackpoint *trackpoint )
 {
-  VikTrack *tr = pass_along[0];
-  VikLayersPanel *vlp = pass_along[1];
-  PropWidgets *widgets = pass_along[2];
-  GList *child = gtk_container_get_children(GTK_CONTAINER(event_box));
-  GtkWidget *image = GTK_WIDGET(child->data);
-  GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(event_box));
-
+  gdouble pc = NAN;
+  if (trackpoint == NULL)
+    return pc;
+  time_t t_start, t_end, t_total;
+  t_start = VIK_TRACKPOINT(tr->trackpoints->data)->timestamp;
+  t_end = VIK_TRACKPOINT(g_list_last(tr->trackpoints)->data)->timestamp;
+  t_total = t_end - t_start;
+  pc = (gdouble)(trackpoint->timestamp - t_start)/t_total;
+  return pc;
+}
 
-  VikTrackpoint *trackpoint = set_center_at_graph_position(event->x, event_box->allocation.width, vlp, tr, is_vt_graph);
-  draw_graph_mark(image, event->x, event_box->allocation.width, window->style->black_gc,
-      is_vt_graph ? &widgets->speed_graph_saved_img : &widgets->elev_graph_saved_img);
-  g_list_free(child);
-  widgets->marker_tp = trackpoint;
-  gtk_dialog_set_response_sensitive(GTK_DIALOG(widgets->dialog), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, TRUE);
+/**
+ * Return the percentage of how far a trackpoint is a long a track via the distance method
+ */
+static gdouble tp_percentage_by_distance ( VikTrack *tr, VikTrackpoint *trackpoint, gdouble track_length )
+{
+  gdouble pc = NAN;
+  if (trackpoint == NULL)
+    return pc;
+  gdouble dist = 0.0;
+  GList *iter;
+  for (iter = tr->trackpoints->next; iter != NULL; iter = iter->next) {
+    dist += vik_coord_diff(&(VIK_TRACKPOINT(iter->data)->coord),
+                          &(VIK_TRACKPOINT(iter->prev->data)->coord));
+    /* Assuming trackpoint is not a copy */
+    if (trackpoint == VIK_TRACKPOINT(iter->data))
+      break;
+  }
+  if (iter != NULL)
+    pc = dist/track_length;
+  return pc;
+}
 
-  /* draw on the other graph */
-  if (trackpoint == NULL || widgets->elev_box == NULL || widgets->speed_box == NULL)
-    /* This test assumes we have only 2 graphs */
+static void track_graph_click( GtkWidget *event_box, GdkEventButton *event, PropWidgets *widgets, VikPropWinGraphType_t graph_type )
+{
+  gboolean is_time_graph =
+    ( graph_type == PROPWIN_GRAPH_TYPE_SPEED_TIME ||
+      graph_type == PROPWIN_GRAPH_TYPE_DISTANCE_TIME ||
+      graph_type == PROPWIN_GRAPH_TYPE_ELEVATION_TIME );
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation ( event_box, &allocation );
+
+  VikTrackpoint *trackpoint = set_center_at_graph_position(event->x, allocation.width, widgets->vtl, widgets->vlp, widgets->vvp, widgets->tr, is_time_graph, widgets->profile_width);
+  // Unable to get the point so give up
+  if ( trackpoint == NULL ) {
+    gtk_dialog_set_response_sensitive(GTK_DIALOG(widgets->dialog), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, FALSE);
     return;
+  }
+
+  widgets->marker_tp = trackpoint;
 
+  GList *child;
+  GtkWidget *image;
+  GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(event_box));
+  GtkWidget *graph_box;
+  PropSaved *graph_saved_img;
   gdouble pc = NAN;
-  gdouble x2;
-  GList *other_child = gtk_container_get_children(GTK_CONTAINER(
-                         is_vt_graph ? widgets->elev_box : widgets->speed_box));
-  GtkWidget *other_image = GTK_WIDGET(other_child->data);
-  if (is_vt_graph) {
-    gdouble dist = 0.0;
-    GList *iter;
-    for (iter = tr->trackpoints->next; iter != NULL; iter = iter->next) {
-      dist += vik_coord_diff(&(VIK_TRACKPOINT(iter->data)->coord),
-                                 &(VIK_TRACKPOINT(iter->prev->data)->coord));
-      /* Assuming trackpoint is not a copy */
-      if (trackpoint == VIK_TRACKPOINT(iter->data))
-        break;
-    }
-    if (iter != NULL)
-      pc = dist/widgets->track_length;
-  } else {
-    time_t t_start, t_end, t_total;
-    t_start = VIK_TRACKPOINT(tr->trackpoints->data)->timestamp;
-    t_end = VIK_TRACKPOINT(g_list_last(tr->trackpoints)->data)->timestamp;
-    t_total = t_end - t_start;
-    pc = (gdouble)(trackpoint->timestamp - t_start)/t_total;
-  }
-  if (!isnan(pc)) {
-    x2 = pc * PROFILE_WIDTH + MARGIN + (event_box->allocation.width/2 - PROFILE_WIDTH/2 - MARGIN/2);
-    draw_graph_mark(other_image, x2, event_box->allocation.width, window->style->black_gc,
-      is_vt_graph ? &widgets->elev_graph_saved_img : &widgets->speed_graph_saved_img);
+
+  // Attempt to redraw marker on all graph types
+  gint graphite;
+  for ( graphite = PROPWIN_GRAPH_TYPE_ELEVATION_DISTANCE;
+       graphite < PROPWIN_GRAPH_TYPE_END;
+       graphite++ ) {
+
+    // Switch commonal variables to particular graph type
+    switch (graphite) {
+    default:
+    case PROPWIN_GRAPH_TYPE_ELEVATION_DISTANCE:
+      graph_box       = widgets->elev_box;
+      graph_saved_img = &widgets->elev_graph_saved_img;
+      is_time_graph   = FALSE;
+      break;
+    case PROPWIN_GRAPH_TYPE_GRADIENT_DISTANCE:
+      graph_box       = widgets->gradient_box;
+      graph_saved_img = &widgets->gradient_graph_saved_img;
+      is_time_graph   = FALSE;
+      break;
+    case PROPWIN_GRAPH_TYPE_SPEED_TIME:
+      graph_box       = widgets->speed_box;
+      graph_saved_img = &widgets->speed_graph_saved_img;
+      is_time_graph   = TRUE;
+      break;
+    case PROPWIN_GRAPH_TYPE_DISTANCE_TIME:
+      graph_box       = widgets->dist_box;
+      graph_saved_img = &widgets->dist_graph_saved_img;
+      is_time_graph   = TRUE;
+      break;
+    case PROPWIN_GRAPH_TYPE_ELEVATION_TIME:
+      graph_box       = widgets->elev_time_box;
+      graph_saved_img = &widgets->elev_time_graph_saved_img;
+      is_time_graph   = TRUE;
+      break;
+    case PROPWIN_GRAPH_TYPE_SPEED_DISTANCE:
+      graph_box       = widgets->speed_dist_box;
+      graph_saved_img = &widgets->speed_dist_graph_saved_img;
+      is_time_graph   = FALSE;
+      break;
+    }
+
+    // Commonal method of redrawing marker
+    if ( graph_box ) {
+
+      child = gtk_container_get_children(GTK_CONTAINER(graph_box));
+      image = GTK_WIDGET(child->data);
+
+      if (is_time_graph)
+       pc = tp_percentage_by_time ( widgets->tr, trackpoint );
+      else
+       pc = tp_percentage_by_distance ( widgets->tr, trackpoint, widgets->track_length_inc_gaps );
+
+      if (!isnan(pc)) {
+        gdouble marker_x = (pc * widgets->profile_width) + MARGIN_X;
+       save_image_and_draw_graph_marks(image,
+                                       marker_x,
+                                       gtk_widget_get_style(window)->black_gc,
+                                       -1, // Don't draw blob on clicks
+                                       0,
+                                       graph_saved_img,
+                                       widgets->profile_width,
+                                       widgets->profile_height,
+                                       &widgets->is_marker_drawn,
+                                       &widgets->is_blob_drawn);
+      }
+      g_list_free(child);
+    }
   }
 
-  g_list_free(other_child);
+  gtk_dialog_set_response_sensitive(GTK_DIALOG(widgets->dialog), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, widgets->is_marker_drawn);
+}
+
+static gboolean track_profile_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr )
+{
+  track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_ELEVATION_DISTANCE);
+  return TRUE;  /* don't call other (further) callbacks */
+}
+
+static gboolean track_gradient_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr )
+{
+  track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_GRADIENT_DISTANCE);
+  return TRUE;  /* don't call other (further) callbacks */
+}
+
+static gboolean track_vt_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr )
+{
+  track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_SPEED_TIME);
+  return TRUE;  /* don't call other (further) callbacks */
+}
 
+static gboolean track_dt_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr )
+{
+  track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_DISTANCE_TIME);
+  return TRUE;  /* don't call other (further) callbacks */
 }
 
-static gboolean track_profile_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along )
+static gboolean track_et_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr )
 {
-  track_graph_click(event_box, event, pass_along, FALSE);
+  track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_ELEVATION_TIME);
   return TRUE;  /* don't call other (further) callbacks */
 }
 
-static gboolean track_vt_click( GtkWidget *event_box, GdkEventButton *event, gpointer *pass_along )
+static gboolean track_sd_click( GtkWidget *event_box, GdkEventButton *event, gpointer ptr )
 {
-  track_graph_click(event_box, event, pass_along, TRUE);
+  track_graph_click(event_box, event, ptr, PROPWIN_GRAPH_TYPE_SPEED_DISTANCE);
   return TRUE;  /* don't call other (further) callbacks */
 }
 
-void track_profile_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass_along )
+/**
+ * Calculate y position for blob on elevation graph
+ */
+static gint blobby_altitude ( gdouble x_blob, PropWidgets *widgets )
+{
+  gint ix = (gint)x_blob;
+  // Ensure ix is inbounds
+  if (ix == widgets->profile_width)
+    ix--;
+
+  gint y_blob = widgets->profile_height-widgets->profile_height*(widgets->altitudes[ix]-widgets->draw_min_altitude)/(chunksa[widgets->cia]*LINES);
+
+  return y_blob;
+}
+
+/**
+ * Calculate y position for blob on gradient graph
+ */
+static gint blobby_gradient ( gdouble x_blob, PropWidgets *widgets )
+{
+  gint ix = (gint)x_blob;
+  // Ensure ix is inbounds
+  if (ix == widgets->profile_width)
+    ix--;
+
+  gint y_blob = widgets->profile_height-widgets->profile_height*(widgets->gradients[ix]-widgets->draw_min_gradient)/(chunksg[widgets->cig]*LINES);
+
+  return y_blob;
+}
+
+/**
+ * Calculate y position for blob on speed graph
+ */
+static gint blobby_speed ( gdouble x_blob, PropWidgets *widgets )
+{
+  gint ix = (gint)x_blob;
+  // Ensure ix is inbounds
+  if (ix == widgets->profile_width)
+    ix--;
+
+  gint y_blob = widgets->profile_height-widgets->profile_height*(widgets->speeds[ix]-widgets->draw_min_speed)/(chunkss[widgets->cis]*LINES);
+
+  return y_blob;
+}
+
+/**
+ * Calculate y position for blob on distance graph
+ */
+static gint blobby_distance ( gdouble x_blob, PropWidgets *widgets )
+{
+  gint ix = (gint)x_blob;
+  // Ensure ix is inbounds
+  if (ix == widgets->profile_width)
+    ix--;
+
+  gint y_blob = widgets->profile_height-widgets->profile_height*(widgets->distances[ix])/(chunksd[widgets->cid]*LINES);
+  //NB min distance is always 0, so no need to subtract that from this  ______/
+
+  return y_blob;
+}
+
+/**
+ * Calculate y position for blob on elevation/time graph
+ */
+static gint blobby_altitude_time ( gdouble x_blob, PropWidgets *widgets )
+{
+  gint ix = (gint)x_blob;
+  // Ensure ix is inbounds
+  if (ix == widgets->profile_width)
+    ix--;
+
+  gint y_blob = widgets->profile_height-widgets->profile_height*(widgets->ats[ix]-widgets->draw_min_altitude_time)/(chunksa[widgets->ciat]*LINES);
+  return y_blob;
+}
+
+/**
+ * Calculate y position for blob on speed/dist graph
+ */
+static gint blobby_speed_dist ( gdouble x_blob, PropWidgets *widgets )
+{
+  gint ix = (gint)x_blob;
+  // Ensure ix is inbounds
+  if (ix == widgets->profile_width)
+    ix--;
+
+  gint y_blob = widgets->profile_height-widgets->profile_height*(widgets->speeds_dist[ix]-widgets->draw_min_speed)/(chunkss[widgets->cisd]*LINES);
+
+  return y_blob;
+}
+
+
+void track_profile_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets )
 {
-  VikTrack *tr = pass_along[0];
-  PropWidgets *widgets = pass_along[2];
   int mouse_x, mouse_y;
   GdkModifierType state;
 
@@ -255,25 +728,81 @@ void track_profile_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass
   else
     mouse_x = event->x;
 
-  gdouble x = mouse_x - image->allocation.width / 2 + PROFILE_WIDTH / 2 - MARGIN / 2;
+  GtkAllocation allocation;
+  gtk_widget_get_allocation ( event_box, &allocation );
+
+  gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2;
   if (x < 0)
     x = 0;
-  if (x > PROFILE_WIDTH)
-    x = PROFILE_WIDTH;
+  if (x > widgets->profile_width)
+    x = widgets->profile_width;
 
   gdouble meters_from_start;
-  VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( tr, (gdouble) x / PROFILE_WIDTH, &meters_from_start );
+  VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( widgets->tr, (gdouble) x / widgets->profile_width, &meters_from_start );
   if (trackpoint && widgets->w_cur_dist) {
     static gchar tmp_buf[20];
-    g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m", meters_from_start);
+    vik_units_distance_t dist_units = a_vik_get_units_distance ();
+    switch (dist_units) {
+    case VIK_UNITS_DISTANCE_KILOMETRES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km", meters_from_start/1000.0);
+      break;
+    case VIK_UNITS_DISTANCE_MILES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", VIK_METERS_TO_MILES(meters_from_start) );
+      break;
+    case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f NM", VIK_METERS_TO_NAUTICAL_MILES(meters_from_start) );
+      break;
+    default:
+      g_critical("Houston, we've had a problem. distance=%d", dist_units);
+    }
     gtk_label_set_text(GTK_LABEL(widgets->w_cur_dist), tmp_buf);
   }
+
+  // Show track elevation for this position - to the nearest whole number
+  if (trackpoint && widgets->w_cur_elevation) {
+    static gchar tmp_buf[20];
+    if (a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET)
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%d ft", (int)VIK_METERS_TO_FEET(trackpoint->altitude));
+    else
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%d m", (int)trackpoint->altitude);
+    gtk_label_set_text(GTK_LABEL(widgets->w_cur_elevation), tmp_buf);
+  }
+
+  widgets->blob_tp = trackpoint;
+
+  if ( widgets->altitudes == NULL )
+    return;
+
+  GtkWidget *window = gtk_widget_get_toplevel (event_box);
+  GList *child = gtk_container_get_children(GTK_CONTAINER(event_box));
+  GtkWidget *image = GTK_WIDGET(child->data);
+
+  gint y_blob = blobby_altitude (x, widgets);
+
+  gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+  if (widgets->is_marker_drawn) {
+    gdouble pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps );
+    if (!isnan(pc)) {
+      marker_x = (pc * widgets->profile_width) + MARGIN_X;
+    }
+  }
+
+  save_image_and_draw_graph_marks (image,
+                                  marker_x,
+                                  gtk_widget_get_style(window)->black_gc,
+                                  MARGIN_X+x,
+                                  MARGIN_Y+y_blob,
+                                  &widgets->elev_graph_saved_img,
+                                  widgets->profile_width,
+                                  widgets->profile_height,
+                                  &widgets->is_marker_drawn,
+                                  &widgets->is_blob_drawn);
+
+  g_list_free(child);
 }
 
-void track_vt_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass_along )
+void track_gradient_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets )
 {
-  VikTrack *tr = pass_along[0];
-  PropWidgets *widgets = pass_along[2];
   int mouse_x, mouse_y;
   GdkModifierType state;
 
@@ -282,299 +811,2050 @@ void track_vt_move( GtkWidget *image, GdkEventMotion *event, gpointer *pass_alon
   else
     mouse_x = event->x;
 
-  gdouble x = mouse_x - image->allocation.width / 2 + PROFILE_WIDTH / 2 - MARGIN / 2;
+  GtkAllocation allocation;
+  gtk_widget_get_allocation ( event_box, &allocation );
+
+  gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2;
   if (x < 0)
     x = 0;
-  if (x > PROFILE_WIDTH)
-    x = PROFILE_WIDTH;
+  if (x > widgets->profile_width)
+    x = widgets->profile_width;
+
+  gdouble meters_from_start;
+  VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( widgets->tr, (gdouble) x / widgets->profile_width, &meters_from_start );
+  if (trackpoint && widgets->w_cur_gradient_dist) {
+    static gchar tmp_buf[20];
+    vik_units_distance_t dist_units = a_vik_get_units_distance ();
+    switch (dist_units) {
+    case VIK_UNITS_DISTANCE_KILOMETRES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km", meters_from_start/1000.0);
+      break;
+    case VIK_UNITS_DISTANCE_MILES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", VIK_METERS_TO_MILES(meters_from_start) );
+      break;
+    case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f NM", VIK_METERS_TO_NAUTICAL_MILES(meters_from_start) );
+      break;
+    default:
+      g_critical("Houston, we've had a problem. distance=%d", dist_units);
+    }
+    gtk_label_set_text(GTK_LABEL(widgets->w_cur_gradient_dist), tmp_buf);
+  }
+
+  // Show track gradient for this position - to the nearest whole number
+  if (trackpoint && widgets->w_cur_gradient_gradient) {
+    static gchar tmp_buf[20];
+    
+    double gradient = widgets->gradients[(int) x];
+
+    g_snprintf(tmp_buf, sizeof(tmp_buf), "%d%%", (int)gradient);
+    gtk_label_set_text(GTK_LABEL(widgets->w_cur_gradient_gradient), tmp_buf);
+  }
+
+  widgets->blob_tp = trackpoint;
+
+  if ( widgets->gradients == NULL )
+    return;
+
+  GtkWidget *window = gtk_widget_get_toplevel (event_box);
+  GList *child = gtk_container_get_children(GTK_CONTAINER(event_box));
+  GtkWidget *image = GTK_WIDGET(child->data);
+
+  gint y_blob = blobby_gradient (x, widgets);
+
+  gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+  if (widgets->is_marker_drawn) {
+    gdouble pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps );
+    if (!isnan(pc)) {
+      marker_x = (pc * widgets->profile_width) + MARGIN_X;
+    }
+  }
+
+  save_image_and_draw_graph_marks (image,
+                                  marker_x,
+                                  gtk_widget_get_style(window)->black_gc,
+                                  MARGIN_X+x,
+                                  MARGIN_Y+y_blob,
+                                  &widgets->gradient_graph_saved_img,
+                                  widgets->profile_width,
+                                  widgets->profile_height,
+                                  &widgets->is_marker_drawn,
+                                  &widgets->is_blob_drawn);
+
+  g_list_free(child);
+}
+
+//
+static void time_label_update (GtkWidget *widget, time_t seconds_from_start)
+{
+  static gchar tmp_buf[20];
+  guint h = seconds_from_start/3600;
+  guint m = (seconds_from_start - h*3600)/60;
+  guint s = seconds_from_start - (3600*h) - (60*m);
+  g_snprintf(tmp_buf, sizeof(tmp_buf), "%02d:%02d:%02d", h, m, s);
+  gtk_label_set_text(GTK_LABEL(widget), tmp_buf);
+}
+
+//
+static void real_time_label_update ( PropWidgets *widgets, GtkWidget *widget, VikTrackpoint *trackpoint)
+{
+  static gchar tmp_buf[64];
+  if ( trackpoint->has_timestamp ) {
+    // Alternatively could use %c format but I prefer a slightly more compact form here
+    //  The full date can of course be seen on the Statistics tab
+    strftime (tmp_buf, sizeof(tmp_buf), "%X %x %Z", localtime(&(trackpoint->timestamp)));
+  }
+  else
+    g_snprintf (tmp_buf, sizeof(tmp_buf), _("No Data"));
+  gtk_label_set_text(GTK_LABEL(widget), tmp_buf);
+}
+
+void track_vt_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets )
+{
+  int mouse_x, mouse_y;
+  GdkModifierType state;
+
+  if (event->is_hint)
+    gdk_window_get_pointer (event->window, &mouse_x, &mouse_y, &state);
+  else
+    mouse_x = event->x;
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation ( event_box, &allocation );
+  gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2;
+  if (x < 0)
+    x = 0;
+  if (x > widgets->profile_width)
+    x = widgets->profile_width;
 
   time_t seconds_from_start;
-  VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( tr, (gdouble) x / PROFILE_WIDTH, &seconds_from_start );
+  VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( widgets->tr, (gdouble) x / widgets->profile_width, &seconds_from_start );
   if (trackpoint && widgets->w_cur_time) {
+    time_label_update ( widgets->w_cur_time, seconds_from_start );
+  }
+
+  if (trackpoint && widgets->w_cur_time_real) {
+    real_time_label_update ( widgets, widgets->w_cur_time_real, trackpoint );
+  }
+
+  gint ix = (gint)x;
+  // Ensure ix is inbounds
+  if (ix == widgets->profile_width)
+    ix--;
+
+  // Show track speed for this position
+  if (trackpoint && widgets->w_cur_speed) {
     static gchar tmp_buf[20];
-    guint h, m, s;
-    h = seconds_from_start/3600;
-    m = (seconds_from_start - h*3600)/60;
-    s = seconds_from_start - (3600*h) - (60*m);
-    g_snprintf(tmp_buf, sizeof(tmp_buf), "%02d:%02d:%02d", h, m, s);
+    // Even if GPS speed available (trackpoint->speed), the text will correspond to the speed map shown
+    // No conversions needed as already in appropriate units
+    vik_units_speed_t speed_units = a_vik_get_units_speed ();
+    switch (speed_units) {
+    case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), _("%.1f kph"), widgets->speeds[ix]);
+      break;
+    case VIK_UNITS_SPEED_MILES_PER_HOUR:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), _("%.1f mph"), widgets->speeds[ix]);
+      break;
+    case VIK_UNITS_SPEED_KNOTS:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), _("%.1f knots"), widgets->speeds[ix]);
+      break;
+    default:
+      // VIK_UNITS_SPEED_METRES_PER_SECOND:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), _("%.1f m/s"), widgets->speeds[ix]);
+      break;
+    }
+    gtk_label_set_text(GTK_LABEL(widgets->w_cur_speed), tmp_buf);
+  }
 
-    gtk_label_set_text(GTK_LABEL(widgets->w_cur_time), tmp_buf);
+  widgets->blob_tp = trackpoint;
+
+  if ( widgets->speeds == NULL )
+    return;
+
+  GtkWidget *window = gtk_widget_get_toplevel (event_box);
+  GList *child = gtk_container_get_children(GTK_CONTAINER(event_box));
+  GtkWidget *image = GTK_WIDGET(child->data);
+
+  gint y_blob = blobby_speed (x, widgets);
+
+  gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+  if (widgets->is_marker_drawn) {
+    gdouble pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp );
+    if (!isnan(pc)) {
+      marker_x = (pc * widgets->profile_width) + MARGIN_X;
+    }
   }
+
+  save_image_and_draw_graph_marks (image,
+                                  marker_x,
+                                  gtk_widget_get_style(window)->black_gc,
+                                  MARGIN_X+x,
+                                  MARGIN_Y+y_blob,
+                                  &widgets->speed_graph_saved_img,
+                                  widgets->profile_width,
+                                  widgets->profile_height,
+                                  &widgets->is_marker_drawn,
+                                  &widgets->is_blob_drawn);
+
+  g_list_free(child);
 }
 
-static void draw_dem_alt_speed_dist(VikTrack *tr, GdkDrawable *pix, GdkGC *alt_gc, GdkGC *speed_gc, gdouble alt_offset, gdouble alt_diff, gint width, gint height, gint margin)
+/**
+ * Update labels and blob marker on mouse moves in the distance/time graph
+ */
+void track_dt_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets )
 {
-  GList *iter;
-  gdouble dist = 0;
-  gdouble max_speed = 0;
-  gdouble total_length = vik_track_get_length_including_gaps(tr);
+  int mouse_x, mouse_y;
+  GdkModifierType state;
 
-  for (iter = tr->trackpoints->next; iter; iter = iter->next) {
-    if (!isnan(VIK_TRACKPOINT(iter->data)->speed))
-      max_speed = MAX(max_speed, VIK_TRACKPOINT(iter->data)->speed);
+  if (event->is_hint)
+    gdk_window_get_pointer (event->window, &mouse_x, &mouse_y, &state);
+  else
+    mouse_x = event->x;
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation ( event_box, &allocation );
+
+  gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2;
+  if (x < 0)
+    x = 0;
+  if (x > widgets->profile_width)
+    x = widgets->profile_width;
+
+  time_t seconds_from_start;
+  VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( widgets->tr, (gdouble) x / widgets->profile_width, &seconds_from_start );
+  if (trackpoint && widgets->w_cur_dist_time) {
+    time_label_update ( widgets->w_cur_dist_time, seconds_from_start );
   }
-  max_speed = max_speed * 110 / 100;
 
-  for (iter = tr->trackpoints->next; iter; iter = iter->next) {
-    int x, y_alt, y_speed;
-    gint16 elev = a_dems_get_elev_by_coord(&(VIK_TRACKPOINT(iter->data)->coord), VIK_DEM_INTERPOL_BEST);
-    elev -= alt_offset;
-    dist += vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord),
-      &(VIK_TRACKPOINT(iter->prev->data)->coord) );
-    x = (width * dist)/total_length + margin;
-    if ( elev != VIK_DEM_INVALID_ELEVATION ) {
-      y_alt = height - ((height * elev)/alt_diff);
-      gdk_draw_rectangle(GDK_DRAWABLE(pix), alt_gc, TRUE, x-2, y_alt-2, 4, 4);
+  if (trackpoint && widgets->w_cur_dist_time_real) {
+    real_time_label_update ( widgets, widgets->w_cur_dist_time_real, trackpoint );
+  }
+
+  gint ix = (gint)x;
+  // Ensure ix is inbounds
+  if (ix == widgets->profile_width)
+    ix--;
+
+  if (trackpoint && widgets->w_cur_dist_dist) {
+    static gchar tmp_buf[20];
+    switch ( a_vik_get_units_distance () ) {
+    case VIK_UNITS_DISTANCE_MILES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", widgets->distances[ix]);
+      break;
+    case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f NM", widgets->distances[ix]);
+      break;
+    default:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km", widgets->distances[ix]);
+      break;
+    }
+    gtk_label_set_text(GTK_LABEL(widgets->w_cur_dist_dist), tmp_buf);
+  }
+
+  widgets->blob_tp = trackpoint;
+
+  if ( widgets->distances == NULL )
+    return;
+
+  GtkWidget *window = gtk_widget_get_toplevel (event_box);
+  GList *child = gtk_container_get_children(GTK_CONTAINER(event_box));
+  GtkWidget *image = GTK_WIDGET(child->data);
+
+  gint y_blob = blobby_distance (x, widgets);
+
+  gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+  if (widgets->is_marker_drawn) {
+    gdouble pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp );
+    if (!isnan(pc)) {
+      marker_x = (pc * widgets->profile_width) + MARGIN_X;
+    }
+  }
+
+  save_image_and_draw_graph_marks (image,
+                                  marker_x,
+                                  gtk_widget_get_style(window)->black_gc,
+                                  MARGIN_X+x,
+                                  MARGIN_Y+y_blob,
+                                  &widgets->dist_graph_saved_img,
+                                  widgets->profile_width,
+                                  widgets->profile_height,
+                                  &widgets->is_marker_drawn,
+                                  &widgets->is_blob_drawn);
+
+  g_list_free(child);
+}
+
+/**
+ * Update labels and blob marker on mouse moves in the elevation/time graph
+ */
+void track_et_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets )
+{
+  int mouse_x, mouse_y;
+  GdkModifierType state;
+
+  if (event->is_hint)
+    gdk_window_get_pointer (event->window, &mouse_x, &mouse_y, &state);
+  else
+    mouse_x = event->x;
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation ( event_box, &allocation );
+
+  gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2;
+  if (x < 0)
+    x = 0;
+  if (x > widgets->profile_width)
+    x = widgets->profile_width;
+
+  time_t seconds_from_start;
+  VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_time ( widgets->tr, (gdouble) x / widgets->profile_width, &seconds_from_start );
+  if (trackpoint && widgets->w_cur_elev_time) {
+    time_label_update ( widgets->w_cur_elev_time, seconds_from_start );
+  }
+
+  if (trackpoint && widgets->w_cur_elev_time_real) {
+    real_time_label_update ( widgets, widgets->w_cur_elev_time_real, trackpoint );
+  }
+
+  gint ix = (gint)x;
+  // Ensure ix is inbounds
+  if (ix == widgets->profile_width)
+    ix--;
+
+  if (trackpoint && widgets->w_cur_elev_elev) {
+    static gchar tmp_buf[20];
+    if (a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET)
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%d ft", (int)VIK_METERS_TO_FEET(trackpoint->altitude));
+    else
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%d m", (int)trackpoint->altitude);
+    gtk_label_set_text(GTK_LABEL(widgets->w_cur_elev_elev), tmp_buf);
+  }
+
+  widgets->blob_tp = trackpoint;
+
+  if ( widgets->ats == NULL )
+    return;
+
+  GtkWidget *window = gtk_widget_get_toplevel (event_box);
+  GList *child = gtk_container_get_children(GTK_CONTAINER(event_box));
+  GtkWidget *image = GTK_WIDGET(child->data);
+
+  gint y_blob = blobby_altitude_time (x, widgets);
+
+  gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+  if (widgets->is_marker_drawn) {
+    gdouble pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp );
+    if (!isnan(pc)) {
+      marker_x = (pc * widgets->profile_width) + MARGIN_X;
+    }
+  }
+
+  save_image_and_draw_graph_marks (image,
+                                  marker_x,
+                                  gtk_widget_get_style(window)->black_gc,
+                                  MARGIN_X+x,
+                                  MARGIN_Y+y_blob,
+                                  &widgets->elev_time_graph_saved_img,
+                                  widgets->profile_width,
+                                  widgets->profile_height,
+                                  &widgets->is_marker_drawn,
+                                  &widgets->is_blob_drawn);
+
+  g_list_free(child);
+}
+
+void track_sd_move( GtkWidget *event_box, GdkEventMotion *event, PropWidgets *widgets )
+{
+  int mouse_x, mouse_y;
+  GdkModifierType state;
+
+  if (event->is_hint)
+    gdk_window_get_pointer (event->window, &mouse_x, &mouse_y, &state);
+  else
+    mouse_x = event->x;
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation ( event_box, &allocation );
+
+  gdouble x = mouse_x - allocation.width / 2 + widgets->profile_width / 2 - MARGIN_X / 2;
+  if (x < 0)
+    x = 0;
+  if (x > widgets->profile_width)
+    x = widgets->profile_width;
+
+  gdouble meters_from_start;
+  VikTrackpoint *trackpoint = vik_track_get_closest_tp_by_percentage_dist ( widgets->tr, (gdouble) x / widgets->profile_width, &meters_from_start );
+  if (trackpoint && widgets->w_cur_speed_dist) {
+    static gchar tmp_buf[20];
+    vik_units_distance_t dist_units = a_vik_get_units_distance ();
+    switch (dist_units) {
+    case VIK_UNITS_DISTANCE_KILOMETRES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km", meters_from_start/1000.0);
+      break;
+    case VIK_UNITS_DISTANCE_MILES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", VIK_METERS_TO_MILES(meters_from_start) );
+      break;
+    case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f NM", VIK_METERS_TO_NAUTICAL_MILES(meters_from_start) );
+      break;
+    default:
+      g_critical("Houston, we've had a problem. distance=%d", dist_units);
+    }
+    gtk_label_set_text(GTK_LABEL(widgets->w_cur_speed_dist), tmp_buf);
+  }
+
+  gint ix = (gint)x;
+  // Ensure ix is inbounds
+  if (ix == widgets->profile_width)
+    ix--;
+
+  if ( widgets->speeds_dist == NULL )
+    return;
+
+  // Show track speed for this position
+  if (widgets->w_cur_speed_speed) {
+    static gchar tmp_buf[20];
+    // Even if GPS speed available (trackpoint->speed), the text will correspond to the speed map shown
+    // No conversions needed as already in appropriate units
+    vik_units_speed_t speed_units = a_vik_get_units_speed ();
+    switch (speed_units) {
+    case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), _("%.1f kph"), widgets->speeds_dist[ix]);
+      break;
+    case VIK_UNITS_SPEED_MILES_PER_HOUR:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), _("%.1f mph"), widgets->speeds_dist[ix]);
+      break;
+    case VIK_UNITS_SPEED_KNOTS:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), _("%.1f knots"), widgets->speeds_dist[ix]);
+      break;
+    default:
+      // VIK_UNITS_SPEED_METRES_PER_SECOND:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), _("%.1f m/s"), widgets->speeds_dist[ix]);
+      break;
+    }
+    gtk_label_set_text(GTK_LABEL(widgets->w_cur_speed_speed), tmp_buf);
+  }
+
+  widgets->blob_tp = trackpoint;
+
+  GtkWidget *window = gtk_widget_get_toplevel (event_box);
+  GList *child = gtk_container_get_children(GTK_CONTAINER(event_box));
+  GtkWidget *image = GTK_WIDGET(child->data);
+
+  gint y_blob = blobby_speed_dist (x, widgets);
+
+  gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+  if (widgets->is_marker_drawn) {
+    gdouble pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps );
+    if (!isnan(pc)) {
+      marker_x = (pc * widgets->profile_width) + MARGIN_X;
+    }
+  }
+
+  save_image_and_draw_graph_marks (image,
+                                  marker_x,
+                                  gtk_widget_get_style(window)->black_gc,
+                                  MARGIN_X+x,
+                                  MARGIN_Y+y_blob,
+                                  &widgets->speed_dist_graph_saved_img,
+                                  widgets->profile_width,
+                                  widgets->profile_height,
+                                  &widgets->is_marker_drawn,
+                                  &widgets->is_blob_drawn);
+
+  g_list_free(child);
+}
+
+/**
+ * Draws DEM points and a respresentative speed on the supplied pixmap
+ *   (which is the elevations graph)
+ */
+static void draw_dem_alt_speed_dist(VikTrack *tr,
+                                   GdkDrawable *pix,
+                                   GdkGC *alt_gc,
+                                   GdkGC *speed_gc,
+                                   gdouble alt_offset,
+                                   gdouble alt_diff,
+                                   gdouble max_speed_in,
+                                   gint cia,
+                                   gint width,
+                                   gint height,
+                                   gint margin,
+                                   gboolean do_dem,
+                                   gboolean do_speed)
+{
+  GList *iter;
+  gdouble max_speed = 0;
+  gdouble total_length = vik_track_get_length_including_gaps(tr);
+
+  // Calculate the max speed factor
+  if (do_speed)
+    max_speed = max_speed_in * 110 / 100;
+
+  gdouble dist = 0;
+  gint h2 = height + MARGIN_Y; // Adjust height for x axis labelling offset
+  gint achunk = chunksa[cia]*LINES;
+
+  for (iter = tr->trackpoints->next; iter; iter = iter->next) {
+    int x;
+    dist += vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord),
+                            &(VIK_TRACKPOINT(iter->prev->data)->coord) );
+    x = (width * dist)/total_length + margin;
+    if (do_dem) {
+      gint16 elev = a_dems_get_elev_by_coord(&(VIK_TRACKPOINT(iter->data)->coord), VIK_DEM_INTERPOL_BEST);
+      elev -= alt_offset;
+      if ( elev != VIK_DEM_INVALID_ELEVATION ) {
+       // Convert into height units
+       if (a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET)
+         elev =  VIK_METERS_TO_FEET(elev);
+       // No conversion needed if already in metres
+
+        // consider chunk size
+        int y_alt = h2 - ((height * elev)/achunk );
+        gdk_draw_rectangle(GDK_DRAWABLE(pix), alt_gc, TRUE, x-2, y_alt-2, 4, 4);
+      }
+    }
+    if (do_speed) {
+      // This is just a speed indicator - no actual values can be inferred by user
+      if (!isnan(VIK_TRACKPOINT(iter->data)->speed)) {
+        int y_speed = h2 - (height * VIK_TRACKPOINT(iter->data)->speed)/max_speed;
+        gdk_draw_rectangle(GDK_DRAWABLE(pix), speed_gc, TRUE, x-2, y_speed-2, 4, 4);
+      }
+    }
+  }
+}
+
+/**
+ * draw_grid_y:
+ *
+ * A common way to draw the grid with y axis labels
+ *
+ */
+static void draw_grid_y ( GtkWidget *window, GtkWidget *image, PropWidgets *widgets, GdkPixmap *pix, gchar *ss, gint i )
+{
+  PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL);
+
+  pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT);
+  pango_layout_set_font_description (pl, gtk_widget_get_style(window)->font_desc);
+
+  gchar *label_markup = g_strdup_printf ( "<span size=\"small\">%s</span>", ss );
+  pango_layout_set_markup ( pl, label_markup, -1 );
+  g_free ( label_markup );
+
+  int w, h;
+  pango_layout_get_pixel_size ( pl, &w, &h );
+
+  gdk_draw_layout ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->fg_gc[0],
+                    MARGIN_X-w-3,
+                    CLAMP((int)i*widgets->profile_height/LINES - h/2 + MARGIN_Y, 0, widgets->profile_height-h+MARGIN_Y),
+                    pl );
+  g_object_unref ( G_OBJECT ( pl ) );
+
+  gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[0],
+                  MARGIN_X, MARGIN_Y + widgets->profile_height/LINES * i,
+                  MARGIN_X + widgets->profile_width, MARGIN_Y + widgets->profile_height/LINES * i );
+}
+
+/**
+ * draw_grid_x_time:
+ *
+ * A common way to draw the grid with x axis labels for time graphs
+ *
+ */
+static void draw_grid_x_time ( GtkWidget *window, GtkWidget *image, PropWidgets *widgets, GdkPixmap *pix, guint ii, guint tt, guint xx )
+{
+  gchar *label_markup = NULL;
+  switch (ii) {
+    case 0:
+    case 1:
+    case 2:
+    case 3:
+      // Minutes
+      label_markup = g_strdup_printf ( "<span size=\"small\">%d %s</span>", tt/60, _("mins") );
+      break;
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+      // Hours
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", (gdouble)tt/(60*60), _("h") );
+      break;
+    case 8:
+    case 9:
+    case 10:
+      // Days
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", (gdouble)tt/(60*60*24), _("d") );
+      break;
+    case 11:
+    case 12:
+      // Weeks
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", (gdouble)tt/(60*60*24*7), _("w") );
+      break;
+    case 13:
+      // 'Months'
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", (gdouble)tt/(60*60*24*28), _("M") );
+      break;
+    default:
+      break;
+  }
+  if ( label_markup ) {
+
+    PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL);
+    pango_layout_set_font_description (pl, gtk_widget_get_style(window)->font_desc);
+
+    pango_layout_set_markup ( pl, label_markup, -1 );
+    g_free ( label_markup );
+    int ww, hh;
+    pango_layout_get_pixel_size ( pl, &ww, &hh );
+
+    gdk_draw_layout ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->fg_gc[0],
+                      MARGIN_X+xx-ww/2, MARGIN_Y/2-hh/2, pl );
+    g_object_unref ( G_OBJECT ( pl ) );
+  }
+
+  gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[0],
+                  MARGIN_X+xx, MARGIN_Y, MARGIN_X+xx, MARGIN_Y+widgets->profile_height );
+}
+
+/**
+ * draw_grid_x_distance:
+ *
+ * A common way to draw the grid with x axis labels for distance graphs
+ *
+ */
+static void draw_grid_x_distance ( GtkWidget *window, GtkWidget *image, PropWidgets *widgets, GdkPixmap *pix, guint ii, gdouble dd, guint xx, vik_units_distance_t dist_units )
+{
+  gchar *label_markup = NULL;
+  switch ( dist_units ) {
+  case VIK_UNITS_DISTANCE_MILES:
+    if ( ii > 4 )
+      label_markup = g_strdup_printf ( "<span size=\"small\">%d %s</span>", (guint)dd, _("miles") );
+    else
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", dd, _("miles") );
+    break;
+  case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+    if ( ii > 4 )
+      label_markup = g_strdup_printf ( "<span size=\"small\">%d %s</span>", (guint)dd, _("NM") );
+    else
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", dd, _("NM") );
+    break;
+  default:
+    // VIK_UNITS_DISTANCE_KILOMETRES:
+    if ( ii > 4 )
+      label_markup = g_strdup_printf ( "<span size=\"small\">%d %s</span>", (guint)dd, _("km") );
+    else
+      label_markup = g_strdup_printf ( "<span size=\"small\">%.1f %s</span>", dd, _("km") );
+    break;
+  }
+
+  if ( label_markup ) {
+    PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL);
+    pango_layout_set_font_description (pl, gtk_widget_get_style(window)->font_desc);
+
+    pango_layout_set_markup ( pl, label_markup, -1 );
+    g_free ( label_markup );
+    int ww, hh;
+    pango_layout_get_pixel_size ( pl, &ww, &hh );
+
+    gdk_draw_layout ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->fg_gc[0],
+                      MARGIN_X+xx-ww/2, MARGIN_Y/2-hh/2, pl );
+    g_object_unref ( G_OBJECT ( pl ) );
+  }
+
+  gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[0],
+                  MARGIN_X+xx, MARGIN_Y, MARGIN_X+xx, MARGIN_Y+widgets->profile_height );
+}
+
+/**
+ * clear the images (scale texts & actual graph)
+ */
+static void clear_images (GdkPixmap *pix, GtkWidget *window, PropWidgets *widgets)
+{
+  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->bg_gc[0],
+                     TRUE, 0, 0, widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y);
+  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->mid_gc[0],
+                     TRUE, 0, 0, widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y);
+}
+
+/**
+ *
+ */
+static void draw_distance_divisions ( GtkWidget *window, GtkWidget *image, GdkPixmap *pix, PropWidgets *widgets, vik_units_distance_t dist_units )
+{
+  // Set to display units from length in metres.
+  gdouble length = widgets->track_length_inc_gaps;
+  switch (dist_units) {
+    case VIK_UNITS_DISTANCE_MILES:
+      length = VIK_METERS_TO_MILES(length);
+      break;
+    case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+      length = VIK_METERS_TO_NAUTICAL_MILES(length);
+      break;
+    default:
+      // KM
+      length = length/1000.0;
+      break;
+  }
+  guint index = get_distance_chunk_index ( length );
+  gdouble dist_per_pixel = length/widgets->profile_width;
+
+  for (guint i=1; chunksd[index]*i <= length; i++) {
+    draw_grid_x_distance ( window, image, widgets, pix, index, chunksd[index]*i, (guint)(chunksd[index]*i/dist_per_pixel), dist_units );
+  }
+}
+
+/**
+ * Draw just the height profile image
+ */
+static void draw_elevations (GtkWidget *image, VikTrack *tr, PropWidgets *widgets )
+{
+  guint i;
+
+  GdkGC *no_alt_info;
+  GdkColor color;
+
+  // Free previous allocation
+  if ( widgets->altitudes )
+    g_free ( widgets->altitudes );
+
+  widgets->altitudes = vik_track_make_elevation_map ( tr, widgets->profile_width );
+
+  if ( widgets->altitudes == NULL )
+    return;
+
+  // Convert into appropriate units
+  vik_units_height_t height_units = a_vik_get_units_height ();
+  if ( height_units == VIK_UNITS_HEIGHT_FEET ) {
+    // Convert altitudes into feet units
+    for ( i = 0; i < widgets->profile_width; i++ ) {
+      widgets->altitudes[i] = VIK_METERS_TO_FEET(widgets->altitudes[i]);
+    }
+  }
+  // Otherwise leave in metres
+
+  minmax_array(widgets->altitudes, &widgets->min_altitude, &widgets->max_altitude, TRUE, widgets->profile_width);
+
+  get_new_min_and_chunk_index (widgets->min_altitude, widgets->max_altitude, chunksa, G_N_ELEMENTS(chunksa), &widgets->draw_min_altitude, &widgets->cia);
+
+  // Assign locally
+  gdouble mina = widgets->draw_min_altitude;
+
+  GtkWidget *window = gtk_widget_get_toplevel (widgets->elev_box);
+  GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
+
+  gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL );
+
+  no_alt_info = gdk_gc_new ( gtk_widget_get_window(window) );
+  gdk_color_parse ( "yellow", &color );
+  gdk_gc_set_rgb_fg_color ( no_alt_info, &color);
+
+  // Reset before redrawing
+  clear_images (pix, window, widgets);
+
+  /* draw grid */
+  for (i=0; i<=LINES; i++) {
+    gchar s[32];
+
+    switch (height_units) {
+    case VIK_UNITS_HEIGHT_METRES:
+      sprintf(s, "%8dm", (int)(mina + (LINES-i)*chunksa[widgets->cia]));
+      break;
+    case VIK_UNITS_HEIGHT_FEET:
+      // NB values already converted into feet
+      sprintf(s, "%8dft", (int)(mina + (LINES-i)*chunksa[widgets->cia]));
+      break;
+    default:
+      sprintf(s, "--");
+      g_critical("Houston, we've had a problem. height=%d", height_units);
+    }
+
+    draw_grid_y ( window, image, widgets, pix, s, i );
+  }
+
+  draw_distance_divisions ( window, image, pix, widgets, a_vik_get_units_distance() );
+
+  /* draw elevations */
+  guint height = MARGIN_Y+widgets->profile_height;
+  for ( i = 0; i < widgets->profile_width; i++ )
+    if ( widgets->altitudes[i] == VIK_DEFAULT_ALTITUDE )
+      gdk_draw_line ( GDK_DRAWABLE(pix), no_alt_info, 
+                      i + MARGIN_X, MARGIN_Y, i + MARGIN_X, height );
+    else 
+      gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3],
+                      i + MARGIN_X, height, i + MARGIN_X, height-widgets->profile_height*(widgets->altitudes[i]-mina)/(chunksa[widgets->cia]*LINES) );
+
+  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_dem)) ||
+       gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_alt_gps_speed)) ) {
+
+    GdkGC *dem_alt_gc = gdk_gc_new ( gtk_widget_get_window(window) );
+    GdkGC *gps_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) );
+
+    gdk_color_parse ( "green", &color );
+    gdk_gc_set_rgb_fg_color ( dem_alt_gc, &color);
+
+    gdk_color_parse ( "red", &color );
+    gdk_gc_set_rgb_fg_color ( gps_speed_gc, &color);
+
+    // Ensure somekind of max speed when not set
+    if ( widgets->max_speed < 0.01 )
+      widgets->max_speed = vik_track_get_max_speed(tr);
+
+    draw_dem_alt_speed_dist(tr,
+                           GDK_DRAWABLE(pix),
+                           dem_alt_gc,
+                           gps_speed_gc,
+                           mina,
+                           widgets->max_altitude - mina,
+                           widgets->max_speed,
+                           widgets->cia,
+                           widgets->profile_width,
+                           widgets->profile_height,
+                           MARGIN_X,
+                           gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_dem)),
+                           gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_alt_gps_speed)));
+    
+    g_object_unref ( G_OBJECT(dem_alt_gc) );
+    g_object_unref ( G_OBJECT(gps_speed_gc) );
+  }
+
+  /* draw border */
+  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1);
+
+  g_object_unref ( G_OBJECT(pix) );
+  g_object_unref ( G_OBJECT(no_alt_info) );
+}
+
+/**
+ * Draws representative speed on the supplied pixmap
+ *   (which is the gradients graph)
+ */
+static void draw_speed_dist(VikTrack *tr,
+                                   GdkDrawable *pix,
+                                   GdkGC *speed_gc,
+                                   gdouble max_speed_in,
+                                   gint width,
+                                   gint height,
+                                   gint margin,
+                                   gboolean do_speed)
+{
+  GList *iter;
+  gdouble max_speed = 0;
+  gdouble total_length = vik_track_get_length_including_gaps(tr);
+
+  // Calculate the max speed factor
+  if (do_speed)
+    max_speed = max_speed_in * 110 / 100;
+
+  gdouble dist = 0;
+  for (iter = tr->trackpoints->next; iter; iter = iter->next) {
+    int x;
+    dist += vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord),
+                            &(VIK_TRACKPOINT(iter->prev->data)->coord) );
+    x = (width * dist)/total_length + MARGIN_X;
+    if (do_speed) {
+      // This is just a speed indicator - no actual values can be inferred by user
+      if (!isnan(VIK_TRACKPOINT(iter->data)->speed)) {
+       int y_speed = height - (height * VIK_TRACKPOINT(iter->data)->speed)/max_speed;
+       gdk_draw_rectangle(GDK_DRAWABLE(pix), speed_gc, TRUE, x-2, y_speed-2, 4, 4);
+      }
+    }
+  }
+}
+
+/**
+ * Draw just the gradient image
+ */
+static void draw_gradients (GtkWidget *image, VikTrack *tr, PropWidgets *widgets )
+{
+  guint i;
+
+  // Free previous allocation
+  if ( widgets->gradients )
+    g_free ( widgets->gradients );
+
+  widgets->gradients = vik_track_make_gradient_map ( tr, widgets->profile_width );
+
+  if ( widgets->gradients == NULL )
+    return;
+
+  minmax_array(widgets->gradients, &widgets->min_gradient, &widgets->max_gradient, TRUE, widgets->profile_width);
+
+  get_new_min_and_chunk_index (widgets->min_gradient, widgets->max_gradient, chunksg, G_N_ELEMENTS(chunksg), &widgets->draw_min_gradient, &widgets->cig);
+
+  // Assign locally
+  gdouble mina = widgets->draw_min_gradient;
+
+  GtkWidget *window = gtk_widget_get_toplevel (widgets->gradient_box);
+  GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
+
+  gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL );
+
+  // Reset before redrawing
+  clear_images (pix, window, widgets);
+
+  /* draw grid */
+  for (i=0; i<=LINES; i++) {
+    gchar s[32];
+
+    sprintf(s, "%8d%%", (int)(mina + (LINES-i)*chunksg[widgets->cig]));
+
+    draw_grid_y ( window, image, widgets, pix, s, i );
+  }
+
+  draw_distance_divisions ( window, image, pix, widgets, a_vik_get_units_distance() );
+
+  /* draw gradients */
+  guint height = widgets->profile_height + MARGIN_Y;
+  for ( i = 0; i < widgets->profile_width; i++ )
+    gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3],
+                    i + MARGIN_X, height, i + MARGIN_X, height - widgets->profile_height*(widgets->gradients[i]-mina)/(chunksg[widgets->cig]*LINES) );
+
+  if ( gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_gradient_gps_speed)) ) {
+    GdkGC *gps_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) );
+
+    GdkColor color;
+    gdk_color_parse ( "red", &color );
+    gdk_gc_set_rgb_fg_color ( gps_speed_gc, &color);
+
+    // Ensure somekind of max speed when not set
+    if ( widgets->max_speed < 0.01 )
+      widgets->max_speed = vik_track_get_max_speed(tr);
+
+    draw_speed_dist(tr,
+                           GDK_DRAWABLE(pix),
+                           gps_speed_gc,
+                           widgets->max_speed,
+                           widgets->profile_width,
+                           widgets->profile_height,
+                           MARGIN_X,
+                           gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(widgets->w_show_alt_gps_speed)));
+    
+    g_object_unref ( G_OBJECT(gps_speed_gc) );
+  }
+
+  /* draw border */
+  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1);
+
+  g_object_unref ( G_OBJECT(pix) );
+}
+
+static void draw_time_lines ( GtkWidget *window, GtkWidget *image, GdkPixmap *pix, PropWidgets *widgets )
+{
+  guint index = get_time_chunk_index ( widgets->duration );
+  gdouble time_per_pixel = (gdouble)(widgets->duration)/widgets->profile_width;
+
+  // If stupidly long track in time - don't bother trying to draw grid lines
+  if ( widgets->duration > chunkst[G_N_ELEMENTS(chunkst)-1]*LINES*LINES )
+    return;
+
+  for (guint i=1; chunkst[index]*i <= widgets->duration; i++) {
+    draw_grid_x_time ( window, image, widgets, pix, index, chunkst[index]*i, (guint)(chunkst[index]*i/time_per_pixel) );
+  }
+}
+
+/**
+ * Draw just the speed (velocity)/time image
+ */
+static void draw_vt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets)
+{
+  guint i;
+
+  // Free previous allocation
+  if ( widgets->speeds )
+    g_free ( widgets->speeds );
+
+  widgets->speeds = vik_track_make_speed_map ( tr, widgets->profile_width );
+  if ( widgets->speeds == NULL )
+    return;
+
+  widgets->duration = vik_track_get_duration ( tr );
+  // Negative time or other problem
+  if ( widgets->duration <= 0 )
+    return;
+
+  // Convert into appropriate units
+  vik_units_speed_t speed_units = a_vik_get_units_speed ();
+  switch (speed_units) {
+  case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+    for ( i = 0; i < widgets->profile_width; i++ ) {
+      widgets->speeds[i] = VIK_MPS_TO_KPH(widgets->speeds[i]);
+    }
+    break;
+  case VIK_UNITS_SPEED_MILES_PER_HOUR:
+    for ( i = 0; i < widgets->profile_width; i++ ) {
+      widgets->speeds[i] = VIK_MPS_TO_MPH(widgets->speeds[i]);
+    }
+    break;
+  case VIK_UNITS_SPEED_KNOTS:
+    for ( i = 0; i < widgets->profile_width; i++ ) {
+      widgets->speeds[i] = VIK_MPS_TO_KNOTS(widgets->speeds[i]);
+    }
+    break;
+  default:
+    // VIK_UNITS_SPEED_METRES_PER_SECOND:
+    // No need to convert as already in m/s
+    break;
+  }
+
+  GtkWidget *window = gtk_widget_get_toplevel (widgets->speed_box);
+  GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
+
+  gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL );
+
+  minmax_array(widgets->speeds, &widgets->min_speed, &widgets->max_speed, FALSE, widgets->profile_width);
+  if (widgets->min_speed < 0.0)
+    widgets->min_speed = 0; /* splines sometimes give negative speeds */
+
+  /* Find suitable chunk index */
+  get_new_min_and_chunk_index (widgets->min_speed, widgets->max_speed, chunkss, G_N_ELEMENTS(chunkss), &widgets->draw_min_speed, &widgets->cis);
+
+  // Assign locally
+  gdouble mins = widgets->draw_min_speed;
+
+  // Reset before redrawing
+  clear_images (pix, window, widgets);
+
+  /* draw grid */
+  for (i=0; i<=LINES; i++) {
+    gchar s[32];
+
+    // NB: No need to convert here anymore as numbers are in the appropriate units
+    switch (speed_units) {
+    case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+      sprintf(s, "%8dkm/h", (int)(mins + (LINES-i)*chunkss[widgets->cis]));
+      break;
+    case VIK_UNITS_SPEED_MILES_PER_HOUR:
+      sprintf(s, "%8dmph", (int)(mins + (LINES-i)*chunkss[widgets->cis]));
+      break;
+    case VIK_UNITS_SPEED_METRES_PER_SECOND:
+      sprintf(s, "%8dm/s", (int)(mins + (LINES-i)*chunkss[widgets->cis]));
+      break;
+    case VIK_UNITS_SPEED_KNOTS:
+      sprintf(s, "%8dknots", (int)(mins + (LINES-i)*chunkss[widgets->cis]));
+      break;
+    default:
+      sprintf(s, "--");
+      g_critical("Houston, we've had a problem. speed=%d", speed_units);
+    }
+
+    draw_grid_y ( window, image, widgets, pix, s, i );
+  }
+
+  draw_time_lines ( window, image, pix, widgets );
+
+  /* draw speeds */
+  guint height = widgets->profile_height + MARGIN_Y;
+  for ( i = 0; i < widgets->profile_width; i++ )
+    gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3],
+                    i + MARGIN_X, height, i + MARGIN_X, height - widgets->profile_height*(widgets->speeds[i]-mins)/(chunkss[widgets->cis]*LINES) );
+
+  if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->w_show_gps_speed)) ) {
+
+    GdkGC *gps_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) );
+    GdkColor color;
+    gdk_color_parse ( "red", &color );
+    gdk_gc_set_rgb_fg_color ( gps_speed_gc, &color);
+
+    time_t beg_time = VIK_TRACKPOINT(tr->trackpoints->data)->timestamp;
+    time_t dur =  VIK_TRACKPOINT(g_list_last(tr->trackpoints)->data)->timestamp - beg_time;
+
+    GList *iter;
+    for (iter = tr->trackpoints; iter; iter = iter->next) {
+      gdouble gps_speed = VIK_TRACKPOINT(iter->data)->speed;
+      if (isnan(gps_speed))
+        continue;
+      switch (speed_units) {
+      case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+       gps_speed = VIK_MPS_TO_KPH(gps_speed);
+       break;
+      case VIK_UNITS_SPEED_MILES_PER_HOUR:
+       gps_speed = VIK_MPS_TO_MPH(gps_speed);
+       break;
+      case VIK_UNITS_SPEED_KNOTS:
+       gps_speed = VIK_MPS_TO_KNOTS(gps_speed);
+       break;
+      default:
+       // VIK_UNITS_SPEED_METRES_PER_SECOND:
+       // No need to convert as already in m/s
+       break;
+      }
+      int x = MARGIN_X + widgets->profile_width * (VIK_TRACKPOINT(iter->data)->timestamp - beg_time) / dur;
+      int y = height - widgets->profile_height*(gps_speed - mins)/(chunkss[widgets->cis]*LINES);
+      gdk_draw_rectangle(GDK_DRAWABLE(pix), gps_speed_gc, TRUE, x-2, y-2, 4, 4);
+    }
+    g_object_unref ( G_OBJECT(gps_speed_gc) );
+  }
+
+  /* draw border */
+  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1);
+
+  g_object_unref ( G_OBJECT(pix) );
+}
+
+/**
+ * Draw just the distance/time image
+ */
+static void draw_dt ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets )
+{
+  guint i;
+
+  // Free previous allocation
+  if ( widgets->distances )
+    g_free ( widgets->distances );
+
+  widgets->distances = vik_track_make_distance_map ( tr, widgets->profile_width );
+  if ( widgets->distances == NULL )
+    return;
+
+  // Convert into appropriate units
+  vik_units_distance_t dist_units = a_vik_get_units_distance ();
+  switch ( dist_units ) {
+    case VIK_UNITS_DISTANCE_MILES:
+      for ( i = 0; i < widgets->profile_width; i++ ) {
+        widgets->distances[i] = VIK_METERS_TO_MILES(widgets->distances[i]);
+      }
+      break;
+    case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+      for ( i = 0; i < widgets->profile_width; i++ ) {
+        widgets->distances[i] = VIK_METERS_TO_NAUTICAL_MILES(widgets->distances[i]);
+      }
+      break;
+    default:
+      // Metres - but want in kms
+      for ( i = 0; i < widgets->profile_width; i++ ) {
+        widgets->distances[i] = widgets->distances[i]/1000.0;
+      }
+      break;
+  }
+
+  widgets->duration = vik_track_get_duration ( widgets->tr );
+  // Negative time or other problem
+  if ( widgets->duration <= 0 )
+    return;
+
+  GtkWidget *window = gtk_widget_get_toplevel (widgets->dist_box);
+  GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
+
+  gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL );
+
+  // easy to work out min / max of distance!
+  // Assign locally
+  // mind = 0.0; - Thus not used
+  gdouble maxd;
+  switch ( dist_units ) {
+  case VIK_UNITS_DISTANCE_MILES:
+    maxd = VIK_METERS_TO_MILES(vik_track_get_length_including_gaps (tr));
+    break;
+  case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+    maxd = VIK_METERS_TO_NAUTICAL_MILES(vik_track_get_length_including_gaps (tr));
+    break;
+  default:
+    maxd = vik_track_get_length_including_gaps (tr) / 1000.0;
+    break;
+  }
+
+  /* Find suitable chunk index */
+  gdouble dummy = 0.0; // expect this to remain the same! (not that it's used)
+  get_new_min_and_chunk_index (0, maxd, chunksd, G_N_ELEMENTS(chunksd), &dummy, &widgets->cid);
+
+  // Reset before redrawing
+  clear_images (pix, window, widgets);
+
+  /* draw grid */
+  for (i=0; i<=LINES; i++) {
+    gchar s[32];
+
+    switch ( dist_units ) {
+    case VIK_UNITS_DISTANCE_MILES:
+      sprintf(s, _("%.1f miles"), ((LINES-i)*chunksd[widgets->cid]));
+      break;
+    case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+      sprintf(s, _("%.1f NM"), ((LINES-i)*chunksd[widgets->cid]));
+      break;
+    default:
+      sprintf(s, _("%.1f km"), ((LINES-i)*chunksd[widgets->cid]));
+      break;
+    }
+
+    draw_grid_y ( window, image, widgets, pix, s, i );
+  }
+  
+  draw_time_lines ( window, image, pix, widgets );
+
+  /* draw distance */
+  guint height = widgets->profile_height + MARGIN_Y;
+  for ( i = 0; i < widgets->profile_width; i++ )
+    gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3],
+                    i + MARGIN_X, height, i + MARGIN_X, height - widgets->profile_height*(widgets->distances[i])/(chunksd[widgets->cid]*LINES) );
+
+  // Show speed indicator
+  if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->w_show_dist_speed)) ) {
+    GdkGC *dist_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) );
+    GdkColor color;
+    gdk_color_parse ( "red", &color );
+    gdk_gc_set_rgb_fg_color ( dist_speed_gc, &color);
+
+    gdouble max_speed = 0;
+    max_speed = widgets->max_speed * 110 / 100;
+
+    // This is just an indicator - no actual values can be inferred by user
+    for ( i = 0; i < widgets->profile_width; i++ ) {
+      int y_speed = widgets->profile_height - (widgets->profile_height * widgets->speeds[i])/max_speed;
+      gdk_draw_rectangle(GDK_DRAWABLE(pix), dist_speed_gc, TRUE, i+MARGIN_X-2, y_speed-2, 4, 4);
+    }
+    g_object_unref ( G_OBJECT(dist_speed_gc) );
+  }
+
+  /* draw border */
+  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1);
+
+  g_object_unref ( G_OBJECT(pix) );
+
+}
+
+/**
+ * Draw just the elevation/time image
+ */
+static void draw_et ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets )
+{
+  guint i;
+
+  // Free previous allocation
+  if ( widgets->ats )
+    g_free ( widgets->ats );
+
+  widgets->ats = vik_track_make_elevation_time_map ( tr, widgets->profile_width );
+
+  if ( widgets->ats == NULL )
+    return;
+
+  // Convert into appropriate units
+  vik_units_height_t height_units = a_vik_get_units_height ();
+  if ( height_units == VIK_UNITS_HEIGHT_FEET ) {
+    // Convert altitudes into feet units
+    for ( i = 0; i < widgets->profile_width; i++ ) {
+      widgets->ats[i] = VIK_METERS_TO_FEET(widgets->ats[i]);
+    }
+  }
+  // Otherwise leave in metres
+
+  minmax_array(widgets->ats, &widgets->min_altitude, &widgets->max_altitude, TRUE, widgets->profile_width);
+
+  get_new_min_and_chunk_index (widgets->min_altitude, widgets->max_altitude, chunksa, G_N_ELEMENTS(chunksa), &widgets->draw_min_altitude_time, &widgets->ciat);
+
+  // Assign locally
+  gdouble mina = widgets->draw_min_altitude_time;
+
+  widgets->duration = vik_track_get_duration ( widgets->tr );
+  // Negative time or other problem
+  if ( widgets->duration <= 0 )
+    return;
+
+  GtkWidget *window = gtk_widget_get_toplevel (widgets->elev_time_box);
+  GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
+
+  gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL );
+
+  // Reset before redrawing
+  clear_images (pix, window, widgets);
+
+  /* draw grid */
+  for (i=0; i<=LINES; i++) {
+    gchar s[32];
+
+    switch (height_units) {
+    case VIK_UNITS_HEIGHT_METRES:
+      sprintf(s, "%8dm", (int)(mina + (LINES-i)*chunksa[widgets->ciat]));
+      break;
+    case VIK_UNITS_HEIGHT_FEET:
+      // NB values already converted into feet
+      sprintf(s, "%8dft", (int)(mina + (LINES-i)*chunksa[widgets->ciat]));
+      break;
+    default:
+      sprintf(s, "--");
+      g_critical("Houston, we've had a problem. height=%d", height_units);
+    }
+
+    draw_grid_y ( window, image, widgets, pix, s, i );
+  }
+
+  draw_time_lines ( window, image, pix, widgets );
+
+  /* draw elevations */
+  guint height = widgets->profile_height + MARGIN_Y;
+  for ( i = 0; i < widgets->profile_width; i++ )
+    gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3],
+                    i + MARGIN_X, height, i + MARGIN_X, height-widgets->profile_height*(widgets->ats[i]-mina)/(chunksa[widgets->ciat]*LINES) );
+
+  // Show DEMS
+  if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->w_show_elev_dem)) )  {
+    GdkColor color;
+    GdkGC *dem_alt_gc = gdk_gc_new ( gtk_widget_get_window(window) );
+    gdk_color_parse ( "green", &color );
+    gdk_gc_set_rgb_fg_color ( dem_alt_gc, &color);
+
+    gint h2 = widgets->profile_height + MARGIN_Y; // Adjust height for x axis labelling offset
+    gint achunk = chunksa[widgets->ciat]*LINES;
+
+    for ( i = 0; i < widgets->profile_width; i++ ) {
+      // This could be slow doing this each time...
+      VikTrackpoint *tp = vik_track_get_closest_tp_by_percentage_time ( widgets->tr, ((gdouble)i/(gdouble)widgets->profile_width), NULL );
+      if ( tp ) {
+        gint16 elev = a_dems_get_elev_by_coord(&(tp->coord), VIK_DEM_INTERPOL_SIMPLE);
+        elev -= mina; //?
+        if ( elev != VIK_DEM_INVALID_ELEVATION ) {
+          // Convert into height units
+          if ( a_vik_get_units_height () == VIK_UNITS_HEIGHT_FEET )
+            elev = VIK_METERS_TO_FEET(elev);
+          // No conversion needed if already in metres
+
+          // consider chunk size
+          int y_alt = h2 - ((widgets->profile_height * elev)/achunk );
+          gdk_draw_rectangle(GDK_DRAWABLE(pix), dem_alt_gc, TRUE, i+MARGIN_X-2, y_alt-2, 4, 4);
+        }
+      }
+    }
+    g_object_unref ( G_OBJECT(dem_alt_gc) );
+  }
+
+  // Show speeds
+  if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->w_show_elev_speed)) ) {
+    GdkColor color;
+    // This is just an indicator - no actual values can be inferred by user
+    GdkGC *elev_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) );
+    gdk_color_parse ( "red", &color );
+    gdk_gc_set_rgb_fg_color ( elev_speed_gc, &color);
+
+    gdouble max_speed = widgets->max_speed * 110 / 100;
+
+    for ( i = 0; i < widgets->profile_width; i++ ) {
+      int y_speed = widgets->profile_height - (widgets->profile_height * widgets->speeds[i])/max_speed;
+      gdk_draw_rectangle(GDK_DRAWABLE(pix), elev_speed_gc, TRUE, i+MARGIN_X-2, y_speed-2, 4, 4);
+    }
+
+    g_object_unref ( G_OBJECT(elev_speed_gc) );
+  }
+
+  /* draw border */
+  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1);
+
+  g_object_unref ( G_OBJECT(pix) );
+}
+
+/**
+ * Draw just the speed/distance image
+ */
+static void draw_sd ( GtkWidget *image, VikTrack *tr, PropWidgets *widgets)
+{
+  gdouble mins;
+  guint i;
+
+  // Free previous allocation
+  if ( widgets->speeds_dist )
+    g_free ( widgets->speeds_dist );
+
+  widgets->speeds_dist = vik_track_make_speed_dist_map ( tr, widgets->profile_width );
+  if ( widgets->speeds_dist == NULL )
+    return;
+
+  // Convert into appropriate units
+  vik_units_speed_t speed_units = a_vik_get_units_speed ();
+  switch (speed_units) {
+  case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+    for ( i = 0; i < widgets->profile_width; i++ ) {
+      widgets->speeds_dist[i] = VIK_MPS_TO_KPH(widgets->speeds_dist[i]);
+    }
+    break;
+  case VIK_UNITS_SPEED_MILES_PER_HOUR:
+    for ( i = 0; i < widgets->profile_width; i++ ) {
+      widgets->speeds_dist[i] = VIK_MPS_TO_MPH(widgets->speeds_dist[i]);
+    }
+    break;
+  case VIK_UNITS_SPEED_KNOTS:
+    for ( i = 0; i < widgets->profile_width; i++ ) {
+      widgets->speeds_dist[i] = VIK_MPS_TO_KNOTS(widgets->speeds_dist[i]);
+    }
+    break;
+  default:
+    // VIK_UNITS_SPEED_METRES_PER_SECOND:
+    // No need to convert as already in m/s
+    break;
+  }
+
+  GtkWidget *window = gtk_widget_get_toplevel (widgets->speed_dist_box);
+  GdkPixmap *pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
+
+  gtk_image_set_from_pixmap ( GTK_IMAGE(image), pix, NULL );
+
+  // OK to resuse min_speed here
+  minmax_array(widgets->speeds_dist, &widgets->min_speed, &widgets->max_speed_dist, FALSE, widgets->profile_width);
+  if (widgets->min_speed < 0.0)
+    widgets->min_speed = 0; /* splines sometimes give negative speeds */
+
+  /* Find suitable chunk index */
+  get_new_min_and_chunk_index (widgets->min_speed, widgets->max_speed_dist, chunkss, G_N_ELEMENTS(chunkss), &widgets->draw_min_speed, &widgets->cisd);
+
+  // Assign locally
+  mins = widgets->draw_min_speed;
+  
+  // Reset before redrawing
+  clear_images (pix, window, widgets);
+
+  /* draw grid */
+  for (i=0; i<=LINES; i++) {
+    gchar s[32];
+
+    // NB: No need to convert here anymore as numbers are in the appropriate units
+    switch (speed_units) {
+    case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+      sprintf(s, "%8dkm/h", (int)(mins + (LINES-i)*chunkss[widgets->cisd]));
+      break;
+    case VIK_UNITS_SPEED_MILES_PER_HOUR:
+      sprintf(s, "%8dmph", (int)(mins + (LINES-i)*chunkss[widgets->cisd]));
+      break;
+    case VIK_UNITS_SPEED_METRES_PER_SECOND:
+      sprintf(s, "%8dm/s", (int)(mins + (LINES-i)*chunkss[widgets->cisd]));
+      break;
+    case VIK_UNITS_SPEED_KNOTS:
+      sprintf(s, "%8dknots", (int)(mins + (LINES-i)*chunkss[widgets->cisd]));
+      break;
+    default:
+      sprintf(s, "--");
+      g_critical("Houston, we've had a problem. speed=%d", speed_units);
+    }
+
+    draw_grid_y ( window, image, widgets, pix, s, i );
+  }
+
+  draw_distance_divisions ( window, image, pix, widgets, a_vik_get_units_distance() );
+
+  /* draw speeds */
+  guint height = widgets->profile_height + MARGIN_Y;
+  for ( i = 0; i < widgets->profile_width; i++ )
+    gdk_draw_line ( GDK_DRAWABLE(pix), gtk_widget_get_style(window)->dark_gc[3],
+                    i + MARGIN_X, height, i + MARGIN_X, height - widgets->profile_height*(widgets->speeds_dist[i]-mins)/(chunkss[widgets->cisd]*LINES) );
+
+
+  if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->w_show_sd_gps_speed)) ) {
+
+    GdkGC *gps_speed_gc = gdk_gc_new ( gtk_widget_get_window(window) );
+    GdkColor color;
+    gdk_color_parse ( "red", &color );
+    gdk_gc_set_rgb_fg_color ( gps_speed_gc, &color);
+
+    gdouble dist = vik_track_get_length_including_gaps(tr);
+    gdouble dist_tp = 0.0;
+
+    GList *iter = tr->trackpoints;
+    for (iter = iter->next; iter; iter = iter->next) {
+      gdouble gps_speed = VIK_TRACKPOINT(iter->data)->speed;
+      if (isnan(gps_speed))
+        continue;
+      switch (speed_units) {
+      case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+       gps_speed = VIK_MPS_TO_KPH(gps_speed);
+       break;
+      case VIK_UNITS_SPEED_MILES_PER_HOUR:
+       gps_speed = VIK_MPS_TO_MPH(gps_speed);
+       break;
+      case VIK_UNITS_SPEED_KNOTS:
+       gps_speed = VIK_MPS_TO_KNOTS(gps_speed);
+       break;
+      default:
+       // VIK_UNITS_SPEED_METRES_PER_SECOND:
+       // No need to convert as already in m/s
+       break;
+      }
+      dist_tp += vik_coord_diff ( &(VIK_TRACKPOINT(iter->data)->coord), &(VIK_TRACKPOINT(iter->prev->data)->coord) );
+      int x = MARGIN_X + (widgets->profile_width * dist_tp / dist);
+      int y = height - widgets->profile_height*(gps_speed - mins)/(chunkss[widgets->cisd]*LINES);
+      gdk_draw_rectangle(GDK_DRAWABLE(pix), gps_speed_gc, TRUE, x-2, y-2, 4, 4);
+    }
+    g_object_unref ( G_OBJECT(gps_speed_gc) );
+  }
+
+  /* draw border */
+  gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc, FALSE, MARGIN_X, MARGIN_Y, widgets->profile_width-1, widgets->profile_height-1);
+
+  g_object_unref ( G_OBJECT(pix) );
+}
+#undef LINES
+
+/**
+ * Draw all graphs
+ */
+static void draw_all_graphs ( GtkWidget *widget, PropWidgets *widgets, gboolean resized )
+{
+  // Draw graphs even if they are not visible
+
+  GList *child = NULL;
+  GtkWidget *image = NULL;
+  GtkWidget *window = gtk_widget_get_toplevel(widget);
+  gdouble pc = NAN;
+  gdouble pc_blob = NAN;
+
+  // Draw elevations
+  if (widgets->elev_box != NULL) {
+
+    // Saved image no longer any good as we've resized, so we remove it here
+    if (resized && widgets->elev_graph_saved_img.img) {
+      g_object_unref(widgets->elev_graph_saved_img.img);
+      widgets->elev_graph_saved_img.img = NULL;
+      widgets->elev_graph_saved_img.saved = FALSE;
+    }
+
+    child = gtk_container_get_children(GTK_CONTAINER(widgets->elev_box));
+    draw_elevations (GTK_WIDGET(child->data), widgets->tr, widgets );
+
+    image = GTK_WIDGET(child->data);
+    g_list_free(child);
+
+    // Ensure marker or blob are redrawn if necessary
+    if (widgets->is_marker_drawn || widgets->is_blob_drawn) {
+
+      pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps );
+      gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value
+      gint y_blob = 0;
+      if (widgets->is_blob_drawn) {
+       pc_blob = tp_percentage_by_distance ( widgets->tr, widgets->blob_tp, widgets->track_length_inc_gaps );
+       if (!isnan(pc_blob)) {
+         x_blob = (pc_blob * widgets->profile_width);
+       }
+       y_blob = blobby_altitude (x_blob, widgets);
+      }
+
+      gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+      if (!isnan(pc)) {
+        marker_x = (pc * widgets->profile_width) + MARGIN_X;
+      }
+
+      save_image_and_draw_graph_marks (image,
+                                      marker_x,
+                                      gtk_widget_get_style(window)->black_gc,
+                                      x_blob+MARGIN_X,
+                                      y_blob+MARGIN_Y,
+                                      &widgets->elev_graph_saved_img,
+                                      widgets->profile_width,
+                                      widgets->profile_height,
+                                      &widgets->is_marker_drawn,
+                                      &widgets->is_blob_drawn);
+    }
+  }
+
+  // Draw gradients
+  if (widgets->gradient_box != NULL) {
+
+    // Saved image no longer any good as we've resized, so we remove it here
+    if (resized && widgets->gradient_graph_saved_img.img) {
+      g_object_unref(widgets->gradient_graph_saved_img.img);
+      widgets->gradient_graph_saved_img.img = NULL;
+      widgets->gradient_graph_saved_img.saved = FALSE;
+    }
+
+    child = gtk_container_get_children(GTK_CONTAINER(widgets->gradient_box));
+    draw_gradients (GTK_WIDGET(child->data), widgets->tr, widgets );
+
+    image = GTK_WIDGET(child->data);
+    g_list_free(child);
+
+    // Ensure marker or blob are redrawn if necessary
+    if (widgets->is_marker_drawn || widgets->is_blob_drawn) {
+
+      pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps );
+      gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value
+      gint y_blob = 0;
+      if (widgets->is_blob_drawn) {
+       pc_blob = tp_percentage_by_distance ( widgets->tr, widgets->blob_tp, widgets->track_length_inc_gaps );
+       if (!isnan(pc_blob)) {
+         x_blob = (pc_blob * widgets->profile_width);
+       }
+       y_blob = blobby_gradient (x_blob, widgets);
+      }
+
+      gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+      if (!isnan(pc)) {
+        marker_x = (pc * widgets->profile_width) + MARGIN_X;
+      }
+
+      save_image_and_draw_graph_marks (image,
+                                      marker_x,
+                                      gtk_widget_get_style(window)->black_gc,
+                                      x_blob+MARGIN_X,
+                                      y_blob+MARGIN_Y,
+                                      &widgets->gradient_graph_saved_img,
+                                      widgets->profile_width,
+                                      widgets->profile_height,
+                                      &widgets->is_marker_drawn,
+                                      &widgets->is_blob_drawn);
+    }
+  }
+
+  // Draw speeds
+  if (widgets->speed_box != NULL) {
+
+    // Saved image no longer any good as we've resized
+    if (resized && widgets->speed_graph_saved_img.img) {
+      g_object_unref(widgets->speed_graph_saved_img.img);
+      widgets->speed_graph_saved_img.img = NULL;
+      widgets->speed_graph_saved_img.saved = FALSE;
+    }
+
+    child = gtk_container_get_children(GTK_CONTAINER(widgets->speed_box));
+    draw_vt (GTK_WIDGET(child->data), widgets->tr, widgets );
+
+    image = GTK_WIDGET(child->data);
+    g_list_free(child);
+
+    // Ensure marker or blob are redrawn if necessary
+    if (widgets->is_marker_drawn || widgets->is_blob_drawn) {
+
+      pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp );
+
+      gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value
+      gint    y_blob = 0;
+      if (widgets->is_blob_drawn) {
+       pc_blob = tp_percentage_by_time ( widgets->tr, widgets->blob_tp );
+       if (!isnan(pc_blob)) {
+         x_blob = (pc_blob * widgets->profile_width);
+       }
+        
+       y_blob = blobby_speed (x_blob, widgets);
+      }
+
+      gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+      if (!isnan(pc)) {
+        marker_x = (pc * widgets->profile_width) + MARGIN_X;
+      }
+
+      save_image_and_draw_graph_marks (image,
+                                      marker_x,
+                                      gtk_widget_get_style(window)->black_gc,
+                                      x_blob+MARGIN_X,
+                                      y_blob+MARGIN_Y,
+                                      &widgets->speed_graph_saved_img,
+                                      widgets->profile_width,
+                                      widgets->profile_height,
+                                      &widgets->is_marker_drawn,
+                                      &widgets->is_blob_drawn);
+    }
+  }
+
+  // Draw Distances
+  if (widgets->dist_box != NULL) {
+
+    // Saved image no longer any good as we've resized
+    if (resized && widgets->dist_graph_saved_img.img) {
+      g_object_unref(widgets->dist_graph_saved_img.img);
+      widgets->dist_graph_saved_img.img = NULL;
+      widgets->dist_graph_saved_img.saved = FALSE;
+    }
+
+    child = gtk_container_get_children(GTK_CONTAINER(widgets->dist_box));
+    draw_dt (GTK_WIDGET(child->data), widgets->tr, widgets );
+
+    image = GTK_WIDGET(child->data);
+    g_list_free(child);
+
+    // Ensure marker or blob are redrawn if necessary
+    if (widgets->is_marker_drawn || widgets->is_blob_drawn) {
+
+      pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp );
+
+      gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value
+      gint    y_blob = 0;
+      if (widgets->is_blob_drawn) {
+       pc_blob = tp_percentage_by_time ( widgets->tr, widgets->blob_tp );
+       if (!isnan(pc_blob)) {
+         x_blob = (pc_blob * widgets->profile_width);
+       }
+        
+       y_blob = blobby_distance (x_blob, widgets);
+      }
+
+      gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+      if (!isnan(pc)) {
+        marker_x = (pc * widgets->profile_width) + MARGIN_X;
+      }
+
+      save_image_and_draw_graph_marks (image,
+                                      marker_x,
+                                      gtk_widget_get_style(window)->black_gc,
+                                      x_blob+MARGIN_X,
+                                      y_blob+MARGIN_Y,
+                                      &widgets->dist_graph_saved_img,
+                                      widgets->profile_width,
+                                      widgets->profile_height,
+                                      &widgets->is_marker_drawn,
+                                      &widgets->is_blob_drawn);
+    }
+  }
+
+  // Draw Elevations in timely manner
+  if (widgets->elev_time_box != NULL) {
+
+    // Saved image no longer any good as we've resized
+    if (resized && widgets->elev_time_graph_saved_img.img) {
+      g_object_unref(widgets->elev_time_graph_saved_img.img);
+      widgets->elev_time_graph_saved_img.img = NULL;
+      widgets->elev_time_graph_saved_img.saved = FALSE;
+    }
+
+    child = gtk_container_get_children(GTK_CONTAINER(widgets->elev_time_box));
+    draw_et (GTK_WIDGET(child->data), widgets->tr, widgets );
+
+    image = GTK_WIDGET(child->data);
+    g_list_free(child);
+
+    // Ensure marker or blob are redrawn if necessary
+    if (widgets->is_marker_drawn || widgets->is_blob_drawn) {
+
+      pc = tp_percentage_by_time ( widgets->tr, widgets->marker_tp );
+
+      gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value
+      gint    y_blob = 0;
+      if (widgets->is_blob_drawn) {
+       pc_blob = tp_percentage_by_time ( widgets->tr, widgets->blob_tp );
+       if (!isnan(pc_blob)) {
+         x_blob = (pc_blob * widgets->profile_width);
+       }
+       y_blob = blobby_altitude_time (x_blob, widgets);
+      }
+
+      gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+      if (!isnan(pc)) {
+        marker_x = (pc * widgets->profile_width) + MARGIN_X;
+      }
+
+      save_image_and_draw_graph_marks (image,
+                                      marker_x,
+                                      gtk_widget_get_style(window)->black_gc,
+                                      x_blob+MARGIN_X,
+                                      y_blob+MARGIN_Y,
+                                      &widgets->elev_time_graph_saved_img,
+                                      widgets->profile_width,
+                                      widgets->profile_height,
+                                      &widgets->is_marker_drawn,
+                                      &widgets->is_blob_drawn);
+    }
+  }
+
+  // Draw speed distances
+  if (widgets->speed_dist_box != NULL) {
+
+    // Saved image no longer any good as we've resized, so we remove it here
+    if (resized && widgets->speed_dist_graph_saved_img.img) {
+      g_object_unref(widgets->speed_dist_graph_saved_img.img);
+      widgets->speed_dist_graph_saved_img.img = NULL;
+      widgets->speed_dist_graph_saved_img.saved = FALSE;
     }
-    if (!isnan(VIK_TRACKPOINT(iter->data)->speed)) {
-      y_speed = height - (height * VIK_TRACKPOINT(iter->data)->speed)/max_speed;
-      gdk_draw_rectangle(GDK_DRAWABLE(pix), speed_gc, TRUE, x-2, y_speed-2, 4, 4);
+
+    child = gtk_container_get_children(GTK_CONTAINER(widgets->speed_dist_box));
+    draw_sd (GTK_WIDGET(child->data), widgets->tr, widgets );
+
+    image = GTK_WIDGET(child->data);
+    g_list_free(child);
+
+    // Ensure marker or blob are redrawn if necessary
+    if (widgets->is_marker_drawn || widgets->is_blob_drawn) {
+
+      pc = tp_percentage_by_distance ( widgets->tr, widgets->marker_tp, widgets->track_length_inc_gaps );
+      gdouble x_blob = -MARGIN_X - 1.0; // i.e. Don't draw unless we get a valid value
+      gint y_blob = 0;
+      if (widgets->is_blob_drawn) {
+       pc_blob = tp_percentage_by_distance ( widgets->tr, widgets->blob_tp, widgets->track_length_inc_gaps );
+       if (!isnan(pc_blob)) {
+         x_blob = (pc_blob * widgets->profile_width);
+       }
+       y_blob = blobby_speed_dist (x_blob, widgets);
+      }
+
+      gdouble marker_x = -1.0; // i.e. Don't draw unless we get a valid value
+      if (!isnan(pc)) {
+        marker_x = (pc * widgets->profile_width) + MARGIN_X;
+      }
+
+      save_image_and_draw_graph_marks (image,
+                                      marker_x,
+                                      gtk_widget_get_style(window)->black_gc,
+                                      x_blob+MARGIN_X,
+                                      y_blob+MARGIN_Y,
+                                      &widgets->speed_dist_graph_saved_img,
+                                      widgets->profile_width,
+                                      widgets->profile_height,
+                                      &widgets->is_marker_drawn,
+                                      &widgets->is_blob_drawn);
     }
   }
+
+}
+
+/**
+ * Configure/Resize the profile & speed/time images
+ */
+static gboolean configure_event ( GtkWidget *widget, GdkEventConfigure *event, PropWidgets *widgets )
+{
+  if (widgets->configure_dialog) {
+    // Determine size offsets between dialog size and size for images
+    // Only on the initialisation of the dialog
+    widgets->profile_width_offset = event->width - widgets->profile_width;
+    widgets->profile_height_offset = event->height - widgets->profile_height;
+    widgets->configure_dialog = FALSE;
+
+    // Without this the settting, the dialog will only grow in vertical size - one can not then make it smaller!
+    gtk_widget_set_size_request ( widget, widgets->profile_width+widgets->profile_width_offset, widgets->profile_height+widgets->profile_height_offset );
+
+    // Allow resizing back down to a minimal size (especially useful if the initial size has been made bigger after restoring from the saved settings)
+    GdkGeometry geom = { 600+widgets->profile_width_offset, 300+widgets->profile_height_offset, 0, 0, 0, 0, 0, 0, 0, 0, GDK_GRAVITY_STATIC };
+    gdk_window_set_geometry_hints ( gtk_widget_get_window(widget), &geom, GDK_HINT_MIN_SIZE );
+  }
+  else {
+    widgets->profile_width_old = widgets->profile_width;
+    widgets->profile_height_old = widgets->profile_height;
+  }
+
+  // Now adjust From Dialog size to get image size
+  widgets->profile_width = event->width - widgets->profile_width_offset;
+  widgets->profile_height = event->height - widgets->profile_height_offset;
+
+  // ATM we receive configure_events when the dialog is moved and so no further action is necessary
+  if ( !widgets->configure_dialog &&
+       (widgets->profile_width_old == widgets->profile_width) && (widgets->profile_height_old == widgets->profile_height) )
+    return FALSE;
+
+  // Draw stuff
+  draw_all_graphs ( widget, widgets, TRUE );
+
+  return FALSE;
 }
 
-GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, VikTrack *tr, gpointer vlp, PropWidgets *widgets, gdouble *min_alt, gdouble *max_alt)
+/**
+ * Create height profile widgets including the image and callbacks
+ */
+GtkWidget *vik_trw_layer_create_profile ( GtkWidget *window, PropWidgets *widgets, gdouble *min_alt, gdouble *max_alt)
 {
   GdkPixmap *pix;
   GtkWidget *image;
-  gdouble *altitudes = vik_track_make_elevation_map ( tr, PROFILE_WIDTH );
-  gdouble mina, maxa;
   GtkWidget *eventbox;
-  gpointer *pass_along;
-  guint i;
 
-  if ( altitudes == NULL ) {
+  // First allocation
+  widgets->altitudes = vik_track_make_elevation_map ( widgets->tr, widgets->profile_width );
+
+  if ( widgets->altitudes == NULL ) {
     *min_alt = *max_alt = VIK_DEFAULT_ALTITUDE;
     return NULL;
   }
 
-  pix = gdk_pixmap_new( window->window, PROFILE_WIDTH + MARGIN, PROFILE_HEIGHT, -1 );
+  minmax_array(widgets->altitudes, min_alt, max_alt, TRUE, widgets->profile_width);
+  
+  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
   image = gtk_image_new_from_pixmap ( pix, NULL );
 
-  GdkGC *no_alt_info = gdk_gc_new ( window->window );
-  GdkGC *dem_alt_gc = gdk_gc_new ( window->window );
-  GdkGC *gps_speed_gc = gdk_gc_new ( window->window );
-  GdkColor color;
-
-  gdk_color_parse ( "yellow", &color );
-  gdk_gc_set_rgb_fg_color ( no_alt_info, &color);
-  gdk_color_parse ( "green", &color );
-  gdk_gc_set_rgb_fg_color ( dem_alt_gc, &color);
-  gdk_color_parse ( "red", &color );
-  gdk_gc_set_rgb_fg_color ( gps_speed_gc, &color);
+  g_object_unref ( G_OBJECT(pix) );
 
+  eventbox = gtk_event_box_new ();
+  g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_profile_click), widgets );
+  g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_profile_move), widgets );
+  gtk_container_add ( GTK_CONTAINER(eventbox), image );
+  gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_STRUCTURE_MASK);
 
-  minmax_alt(altitudes, min_alt, max_alt);
-  mina = *min_alt;
-  maxa = *max_alt + ((*max_alt - *min_alt) * 0.25);
-  
-  /* clear the image */
-  gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->bg_gc[0], 
-                    TRUE, 0, 0, MARGIN, PROFILE_HEIGHT);
-  gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->mid_gc[0], 
-                    TRUE, MARGIN, 0, PROFILE_WIDTH, PROFILE_HEIGHT);
+  return eventbox;
+}
 
-  /* draw grid */
-#define LABEL_FONT "Sans 7"
-  for (i=0; i<=LINES; i++) {
-    PangoFontDescription *pfd;
-    PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL);
-    gchar s[32];
-    int w, h;
+/**
+ * Create height profile widgets including the image and callbacks
+ */
+GtkWidget *vik_trw_layer_create_gradient ( GtkWidget *window, PropWidgets *widgets)
+{
+  GdkPixmap *pix;
+  GtkWidget *image;
+  GtkWidget *eventbox;
 
-    pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT);
-    pfd = pango_font_description_from_string (LABEL_FONT);
-    pango_layout_set_font_description (pl, pfd);
-    pango_font_description_free (pfd);
-    sprintf(s, "%8dm", (int)(mina + (LINES-i)*(maxa-mina)/LINES));
-    pango_layout_set_text(pl, s, -1);
-    pango_layout_get_pixel_size (pl, &w, &h);
-    gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3, 
-                   CLAMP((int)i*PROFILE_HEIGHT/LINES - h/2, 0, PROFILE_HEIGHT-h), pl);
+  // First allocation
+  widgets->gradients = vik_track_make_gradient_map ( widgets->tr, widgets->profile_width );
 
-    gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], 
-                  MARGIN, PROFILE_HEIGHT/LINES * i, MARGIN + PROFILE_WIDTH, PROFILE_HEIGHT/LINES * i);
+  if ( widgets->gradients == NULL ) {
+    return NULL;
   }
 
-  /* draw elevations */
-  for ( i = 0; i < PROFILE_WIDTH; i++ )
-    if ( altitudes[i] == VIK_DEFAULT_ALTITUDE ) 
-      gdk_draw_line ( GDK_DRAWABLE(pix), no_alt_info, 
-                     i + MARGIN, 0, i + MARGIN, PROFILE_HEIGHT );
-    else 
-      gdk_draw_line ( GDK_DRAWABLE(pix), window->style->dark_gc[3], 
-                     i + MARGIN, PROFILE_HEIGHT, i + MARGIN, PROFILE_HEIGHT-PROFILE_HEIGHT*(altitudes[i]-mina)/(maxa-mina) );
-
-  draw_dem_alt_speed_dist(tr, GDK_DRAWABLE(pix), dem_alt_gc, gps_speed_gc, mina, maxa - mina, PROFILE_WIDTH, PROFILE_HEIGHT, MARGIN);
-
-  /* draw border */
-  gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc, FALSE, MARGIN, 0, PROFILE_WIDTH-1, PROFILE_HEIGHT-1);
-
-
+  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
+  image = gtk_image_new_from_pixmap ( pix, NULL );
 
   g_object_unref ( G_OBJECT(pix) );
-  g_free ( altitudes );
-  g_object_unref ( G_OBJECT(no_alt_info) );
-  g_object_unref ( G_OBJECT(dem_alt_gc) );
-  g_object_unref ( G_OBJECT(gps_speed_gc) );
-
-  pass_along = g_malloc ( sizeof(gpointer) * 3 ); /* FIXME: mem leak -- never be freed */
-  pass_along[0] = tr;
-  pass_along[1] = vlp;
-  pass_along[2] = widgets;
 
   eventbox = gtk_event_box_new ();
-  g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_profile_click), pass_along );
-  g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_profile_move), pass_along );
-  g_signal_connect_swapped ( G_OBJECT(eventbox), "destroy", G_CALLBACK(g_free), pass_along );
+  g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_gradient_click), widgets );
+  g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_gradient_move), widgets );
   gtk_container_add ( GTK_CONTAINER(eventbox), image );
-  gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK
-                         | GDK_POINTER_MOTION_MASK
-                         | GDK_POINTER_MOTION_HINT_MASK);
+  gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_STRUCTURE_MASK);
 
   return eventbox;
 }
 
-#define METRIC 1
-#ifdef METRIC 
-#define MTOK(v) ( (v)*3.6) /* m/s to km/h */
-#else
-#define MTOK(v) ( (v)*3600.0/1000.0 * 0.6214) /* m/s to mph - we'll handle this globally eventually but for now ...*/
-#endif
-
-GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, VikTrack *tr, gpointer vlp, PropWidgets *widgets)
+/**
+ * Create speed/time widgets including the image and callbacks
+ */
+GtkWidget *vik_trw_layer_create_vtdiag ( GtkWidget *window, PropWidgets *widgets)
 {
   GdkPixmap *pix;
   GtkWidget *image;
-  gdouble mins, maxs;
-  guint i;
   GtkWidget *eventbox;
-  gpointer *pass_along;
-
-  pass_along = g_malloc ( sizeof(gpointer) * 3 ); /* FIXME: mem leak -- never be freed */
-  pass_along[0] = tr;
-  pass_along[1] = vlp;
-  pass_along[2] = widgets;
 
-  gdouble *speeds = vik_track_make_speed_map ( tr, PROFILE_WIDTH );
-  if ( speeds == NULL )
+  // First allocation
+  widgets->speeds = vik_track_make_speed_map ( widgets->tr, widgets->profile_width );
+  if ( widgets->speeds == NULL )
     return NULL;
 
-  pix = gdk_pixmap_new( window->window, PROFILE_WIDTH + MARGIN, PROFILE_HEIGHT, -1 );
+  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
   image = gtk_image_new_from_pixmap ( pix, NULL );
 
-  for (i=0; i<PROFILE_WIDTH; i++) {
-    speeds[i] = MTOK(speeds[i]);
-  }
-
-  minmax_alt(speeds, &mins, &maxs);
-  if (mins < 0.0)
-    mins = 0; /* splines sometimes give negative speeds */
-  maxs = maxs + ((maxs - mins) * 0.1);
-  if  (maxs-mins < MIN_SPEED_DIFF) {
-    maxs = mins + MIN_SPEED_DIFF;
-  }
-  
-  /* clear the image */
-  gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->bg_gc[0], 
-                    TRUE, 0, 0, MARGIN, PROFILE_HEIGHT);
-  gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->mid_gc[0], 
-                    TRUE, MARGIN, 0, PROFILE_WIDTH, PROFILE_HEIGHT);
-
 #if 0
   /* XXX this can go out, it's just a helpful dev tool */
   {
     int j;
-    GdkGC **colors[8] = { window->style->bg_gc, window->style->fg_gc, 
-                        window->style->light_gc, 
-                        window->style->dark_gc, window->style->mid_gc, 
-                        window->style->text_gc, window->style->base_gc,
-                        window->style->text_aa_gc };
+    GdkGC **colors[8] = { gtk_widget_get_style(window)->bg_gc,
+                         gtk_widget_get_style(window)->fg_gc,
+                         gtk_widget_get_style(window)->light_gc,
+                         gtk_widget_get_style(window)->dark_gc,
+                         gtk_widget_get_style(window)->mid_gc,
+                         gtk_widget_get_style(window)->text_gc,
+                         gtk_widget_get_style(window)->base_gc,
+                         gtk_widget_get_style(window)->text_aa_gc };
     for (i=0; i<5; i++) {
       for (j=0; j<8; j++) {
        gdk_draw_rectangle(GDK_DRAWABLE(pix), colors[j][i],
                           TRUE, i*20, j*20, 20, 20);
-       gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc,
+       gdk_draw_rectangle(GDK_DRAWABLE(pix), gtk_widget_get_style(window)->black_gc,
                           FALSE, i*20, j*20, 20, 20);
       }
     }
   }
-#else
-
-  /* draw grid */
-#define LABEL_FONT "Sans 7"
-  for (i=0; i<=LINES; i++) {
-    PangoFontDescription *pfd;
-    PangoLayout *pl = gtk_widget_create_pango_layout (GTK_WIDGET(image), NULL);
-    gchar s[32];
-    int w, h;
-
-    pango_layout_set_alignment (pl, PANGO_ALIGN_RIGHT);
-    pfd = pango_font_description_from_string (LABEL_FONT);
-    pango_layout_set_font_description (pl, pfd);
-    pango_font_description_free (pfd);
-#ifdef METRIC 
-    sprintf(s, "%5dkm/h", (int)(mins + (LINES-i)*(maxs-mins)/LINES));
-#else
-    sprintf(s, "%8dmph", (int)(mins + (LINES-i)*(maxs-mins)/LINES));
 #endif
-    pango_layout_set_text(pl, s, -1);
-    pango_layout_get_pixel_size (pl, &w, &h);
-    gdk_draw_layout(GDK_DRAWABLE(pix), window->style->fg_gc[0], MARGIN-w-3, 
-                   CLAMP((int)i*PROFILE_HEIGHT/LINES - h/2, 0, PROFILE_HEIGHT-h), pl);
 
-    gdk_draw_line (GDK_DRAWABLE(pix), window->style->dark_gc[0], 
-                  MARGIN, PROFILE_HEIGHT/LINES * i, MARGIN + PROFILE_WIDTH, PROFILE_HEIGHT/LINES * i);
-  }
-  
+  g_object_unref ( G_OBJECT(pix) );
 
-  /* draw speeds */
-  for ( i = 0; i < PROFILE_WIDTH; i++ )
-      gdk_draw_line ( GDK_DRAWABLE(pix), window->style->dark_gc[3], 
-                     i + MARGIN, PROFILE_HEIGHT, i + MARGIN, PROFILE_HEIGHT-PROFILE_HEIGHT*(speeds[i]-mins)/(maxs-mins) );
-#endif
+  eventbox = gtk_event_box_new ();
+  g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_vt_click), widgets );
+  g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_vt_move), widgets );
+  gtk_container_add ( GTK_CONTAINER(eventbox), image );
+  gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
 
+  return eventbox;
+}
 
-  GdkGC *gps_speed_gc = gdk_gc_new ( window->window );
-  GdkColor color;
+/**
+ * Create distance / time widgets including the image and callbacks
+ */
+GtkWidget *vik_trw_layer_create_dtdiag ( GtkWidget *window, PropWidgets *widgets)
+{
+  GdkPixmap *pix;
+  GtkWidget *image;
+  GtkWidget *eventbox;
 
-  gdk_color_parse ( "red", &color );
-  gdk_gc_set_rgb_fg_color ( gps_speed_gc, &color);
+  // First allocation
+  widgets->distances = vik_track_make_distance_map ( widgets->tr, widgets->profile_width );
+  if ( widgets->distances == NULL )
+    return NULL;
 
-  time_t beg_time = VIK_TRACKPOINT(tr->trackpoints->data)->timestamp;
-  time_t dur =  VIK_TRACKPOINT(g_list_last(tr->trackpoints)->data)->timestamp - beg_time;
-  GList *iter;
-  for (iter = tr->trackpoints; iter; iter = iter->next) {
-    gdouble gps_speed = VIK_TRACKPOINT(iter->data)->speed;
-    if (isnan(gps_speed))
-        continue;
-    int x = MARGIN + PROFILE_WIDTH * (VIK_TRACKPOINT(iter->data)->timestamp - beg_time) / dur;
-    int y = PROFILE_HEIGHT - PROFILE_HEIGHT*(MTOK(gps_speed) - mins)/(maxs - mins);
-    gdk_draw_rectangle(GDK_DRAWABLE(pix), gps_speed_gc, TRUE, x-2, y-2, 4, 4);
-  }
+  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
+  image = gtk_image_new_from_pixmap ( pix, NULL );
 
-  /* draw border */
-  gdk_draw_rectangle(GDK_DRAWABLE(pix), window->style->black_gc, FALSE, MARGIN, 0, PROFILE_WIDTH-1, PROFILE_HEIGHT-1);
+  g_object_unref ( G_OBJECT(pix) );
+
+  eventbox = gtk_event_box_new ();
+  g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_dt_click), widgets );
+  g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_dt_move), widgets );
+  //g_signal_connect_swapped ( G_OBJECT(eventbox), "destroy", G_CALLBACK(g_free), widgets );
+  gtk_container_add ( GTK_CONTAINER(eventbox), image );
+  gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
+
+  return eventbox;
+}
+
+/**
+ * Create elevation / time widgets including the image and callbacks
+ */
+GtkWidget *vik_trw_layer_create_etdiag ( GtkWidget *window, PropWidgets *widgets)
+{
+  GdkPixmap *pix;
+  GtkWidget *image;
+  GtkWidget *eventbox;
+
+  // First allocation
+  widgets->ats = vik_track_make_elevation_time_map ( widgets->tr, widgets->profile_width );
+  if ( widgets->ats == NULL )
+    return NULL;
+
+  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
+  image = gtk_image_new_from_pixmap ( pix, NULL );
 
   g_object_unref ( G_OBJECT(pix) );
-  g_object_unref ( G_OBJECT(gps_speed_gc) );
-  g_free ( speeds );
 
   eventbox = gtk_event_box_new ();
-  g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_vt_click), pass_along );
-  g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_vt_move), pass_along );
-  g_signal_connect_swapped ( G_OBJECT(eventbox), "destroy", G_CALLBACK(g_free), pass_along );
+  g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_et_click), widgets );
+  g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_et_move), widgets );
   gtk_container_add ( GTK_CONTAINER(eventbox), image );
-  gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK
-                         | GDK_POINTER_MOTION_MASK
-                         | GDK_POINTER_MOTION_HINT_MASK);
+  gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
 
   return eventbox;
 }
-#undef MARGIN
-#undef LINES
 
-static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widgets)
+/**
+ * Create speed/distance widgets including the image and callbacks
+ */
+GtkWidget *vik_trw_layer_create_sddiag ( GtkWidget *window, PropWidgets *widgets)
+{
+  GdkPixmap *pix;
+  GtkWidget *image;
+  GtkWidget *eventbox;
+
+  // First allocation
+  widgets->speeds_dist = vik_track_make_speed_dist_map ( widgets->tr, widgets->profile_width );
+  if ( widgets->speeds_dist == NULL )
+    return NULL;
+
+  pix = gdk_pixmap_new( gtk_widget_get_window(window), widgets->profile_width+MARGIN_X, widgets->profile_height+MARGIN_Y, -1 );
+  image = gtk_image_new_from_pixmap ( pix, NULL );
+
+  g_object_unref ( G_OBJECT(pix) );
+
+  eventbox = gtk_event_box_new ();
+  g_signal_connect ( G_OBJECT(eventbox), "button_press_event", G_CALLBACK(track_sd_click), widgets );
+  g_signal_connect ( G_OBJECT(eventbox), "motion_notify_event", G_CALLBACK(track_sd_move), widgets );
+  gtk_container_add ( GTK_CONTAINER(eventbox), image );
+  gtk_widget_set_events (eventbox, GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
+
+  return eventbox;
+}
+#undef MARGIN_X
+
+#define VIK_SETTINGS_TRACK_PROFILE_WIDTH "track_profile_display_width"
+#define VIK_SETTINGS_TRACK_PROFILE_HEIGHT "track_profile_display_height"
+
+static void save_values ( PropWidgets *widgets )
+{
+  // Session settings
+  a_settings_set_integer ( VIK_SETTINGS_TRACK_PROFILE_WIDTH, widgets->profile_width );
+  a_settings_set_integer ( VIK_SETTINGS_TRACK_PROFILE_HEIGHT, widgets->profile_height );
+
+  // Just for this session ATM
+  show_dem                = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_dem) );
+  show_alt_gps_speed      = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_alt_gps_speed) );
+  show_gps_speed          = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_gps_speed) );
+  show_gradient_gps_speed = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_gradient_gps_speed) );
+  show_dist_speed         = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_dist_speed) );
+  show_elev_dem           = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_elev_dem) );
+  show_elev_speed         = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_elev_speed) );
+  show_sd_gps_speed       = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON(widgets->w_show_sd_gps_speed) );
+}
+
+static void destroy_cb ( GtkDialog *dialog, PropWidgets *widgets )
+{
+  save_values(widgets);
+  prop_widgets_free(widgets);
+}
+
+static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widgets )
 {
   VikTrack *tr = widgets->tr;
   VikTrwLayer *vtl = widgets->vtl;
@@ -588,52 +2868,58 @@ static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widg
       break;
     case GTK_RESPONSE_ACCEPT:
       vik_track_set_comment(tr, gtk_entry_get_text(GTK_ENTRY(widgets->w_comment)));
+      vik_track_set_description(tr, gtk_entry_get_text(GTK_ENTRY(widgets->w_description)));
+      gtk_color_button_get_color ( GTK_COLOR_BUTTON(widgets->w_color), &(tr->color) );
+      tr->draw_name_mode = gtk_combo_box_get_active ( GTK_COMBO_BOX(widgets->w_namelabel) );
+      tr->max_number_dist_labels = gtk_spin_button_get_value_as_int ( GTK_SPIN_BUTTON(widgets->w_number_distlabels) );
+      trw_layer_update_treeview ( widgets->vtl, widgets->tr );
+      vik_layer_emit_update ( VIK_LAYER(vtl) );
       break;
     case VIK_TRW_LAYER_PROPWIN_REVERSE:
       vik_track_reverse(tr);
       vik_layer_emit_update ( VIK_LAYER(vtl) );
       break;
     case VIK_TRW_LAYER_PROPWIN_DEL_DUP:
-      vik_track_remove_dup_points(tr);
+      vik_track_remove_dup_points(tr); // NB ignore the returned answer
+      // As we could have seen the nuber of dulplicates that would be deleted in the properties statistics tab,
+      //   choose not to inform the user unnecessarily
+
       /* above operation could have deleted current_tp or last_tp */
-      trw_layer_cancel_tps_of_track ( vtl, widgets->track_name );
+      trw_layer_cancel_tps_of_track ( vtl, tr );
       vik_layer_emit_update ( VIK_LAYER(vtl) );
       break;
     case VIK_TRW_LAYER_PROPWIN_SPLIT:
       {
-        /* get new tracks, add them, resolve naming conflicts (free if cancel), and delete old. old can still exist on clipboard. */
+        /* get new tracks, add them and then the delete old one. old can still exist on clipboard. */
         guint ntracks;
+       
         VikTrack **tracks = vik_track_split_into_segments(tr, &ntracks);
         gchar *new_tr_name;
         guint i;
         for ( i = 0; i < ntracks; i++ )
         {
-          g_assert ( tracks[i] );
-          new_tr_name = g_strdup_printf("%s #%d", widgets->track_name, i+1);
-          /* if ( (wp_exists) && (! overwrite) ) */
-          /* don't need to upper case new_tr_name because old tr name was uppercase */
-          if ( vik_trw_layer_get_track(vtl, new_tr_name ) && 
-             ( ! a_dialog_overwrite ( VIK_GTK_WINDOW_FROM_LAYER(vtl), "The track \"%s\" exists, do you wish to overwrite it?", new_tr_name ) ) )
-          {
-            gchar *new_new_tr_name = a_dialog_new_track ( VIK_GTK_WINDOW_FROM_LAYER(vtl), vik_trw_layer_get_tracks(vtl) );
-            g_free ( new_tr_name );
-            if (new_new_tr_name)
-              new_tr_name = new_new_tr_name;
+          if ( tracks[i] ) {
+           new_tr_name = trw_layer_new_unique_sublayer_name ( vtl,
+                                                               widgets->tr->is_route ? VIK_TRW_LAYER_SUBLAYER_ROUTE : VIK_TRW_LAYER_SUBLAYER_TRACK,
+                                                               widgets->tr->name);
+            if ( widgets->tr->is_route )
+              vik_trw_layer_add_route ( vtl, new_tr_name, tracks[i] );
             else
-            {
-              new_tr_name = NULL;
-              vik_track_free ( tracks[i] );
-            }
-          }
-          if ( new_tr_name )
-            vik_trw_layer_add_track ( vtl, new_tr_name, tracks[i] );
+              vik_trw_layer_add_track ( vtl, new_tr_name, tracks[i] );
+            vik_track_calculate_bounds ( tracks[i] );
+
+            g_free ( new_tr_name );
+         }
         }
         if ( tracks )
         {
           g_free ( tracks );
           /* Don't let track destroy this dialog */
           vik_track_clear_property_dialog(tr);
-          vik_trw_layer_delete_track ( vtl, widgets->track_name );
+          if ( widgets->tr->is_route )
+            vik_trw_layer_delete_route ( vtl, tr );
+          else
+            vik_trw_layer_delete_track ( vtl, tr );
           vik_layer_emit_update ( VIK_LAYER(vtl) ); /* chase thru the hoops */
         }
       }
@@ -652,32 +2938,27 @@ static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widg
           break;
         }
 
-        gchar *r_name = g_strdup_printf("%s #R", widgets->track_name);
-        if (vik_trw_layer_get_track(vtl, r_name ) && 
-             ( ! a_dialog_overwrite( VIK_GTK_WINDOW_FROM_LAYER(vtl),
-              "The track \"%s\" exists, do you wish to overwrite it?", r_name)))
-        {
-            gchar *new_r_name = a_dialog_new_track( VIK_GTK_WINDOW_FROM_LAYER(vtl), vik_trw_layer_get_tracks(vtl) );
-            if (new_r_name) {
-              g_free( r_name );
-              r_name = new_r_name;
-            }
-            else {
-              a_dialog_msg(VIK_GTK_WINDOW_FROM_LAYER(vtl), GTK_MESSAGE_WARNING,
-                  _("Operation Aborted. Track unchanged"), NULL);
-              keep_dialog = TRUE;
-              break;
-            }
-        }
+        gchar *r_name = trw_layer_new_unique_sublayer_name(vtl,
+                                                           widgets->tr->is_route ? VIK_TRW_LAYER_SUBLAYER_ROUTE : VIK_TRW_LAYER_SUBLAYER_TRACK,
+                                                           widgets->tr->name);
         iter->prev->next = NULL;
         iter->prev = NULL;
         VikTrack *tr_right = vik_track_new();
         if ( tr->comment )
           vik_track_set_comment ( tr_right, tr->comment );
         tr_right->visible = tr->visible;
+        tr_right->is_route = tr->is_route;
         tr_right->trackpoints = iter;
 
-        vik_trw_layer_add_track(vtl, r_name, tr_right);
+        if ( widgets->tr->is_route )
+          vik_trw_layer_add_route(vtl, r_name, tr_right);
+        else
+          vik_trw_layer_add_track(vtl, r_name, tr_right);
+        vik_track_calculate_bounds ( tr );
+        vik_track_calculate_bounds ( tr_right );
+
+        g_free ( r_name );
+
         vik_layer_emit_update ( VIK_LAYER(vtl) );
       }
       break;
@@ -688,122 +2969,381 @@ static void propwin_response_cb( GtkDialog *dialog, gint resp, PropWidgets *widg
 
   /* Keep same behaviour for now: destroy dialog if click on any button */
   if (!keep_dialog) {
-    prop_widgets_free(widgets);
     vik_track_clear_property_dialog(tr);
     gtk_widget_destroy ( GTK_WIDGET(dialog) );
   }
 }
 
+/**
+ * Force a redraw when checkbutton has been toggled to show/hide that information
+ */
+static void checkbutton_toggle_cb ( GtkToggleButton *togglebutton, PropWidgets *widgets, gpointer dummy )
+{
+  // Even though not resized, we'll pretend it is -
+  //  as this invalidates the saved images (since the image may have changed)
+  draw_all_graphs ( widgets->dialog, widgets, TRUE );
+}
+
+/**
+ *  Create the widgets for the given graph tab
+ */
 static GtkWidget *create_graph_page ( GtkWidget *graph,
                                      const gchar *markup,
-                                     GtkWidget *value)
+                                     GtkWidget *value,
+                                     const gchar *markup2,
+                                     GtkWidget *value2,
+                                     const gchar *markup3,
+                                     GtkWidget *value3,
+                                     GtkWidget *checkbutton1,
+                                     gboolean checkbutton1_default,
+                                     GtkWidget *checkbutton2,
+                                     gboolean checkbutton2_default )
 {
   GtkWidget *hbox = gtk_hbox_new ( FALSE, 10 );
   GtkWidget *vbox = gtk_vbox_new ( FALSE, 10 );
   GtkWidget *label = gtk_label_new (NULL);
+  GtkWidget *label2 = gtk_label_new (NULL);
+  GtkWidget *label3 = gtk_label_new (NULL);
   gtk_box_pack_start (GTK_BOX(vbox), graph, FALSE, FALSE, 0);
   gtk_label_set_markup ( GTK_LABEL(label), markup );
+  gtk_label_set_markup ( GTK_LABEL(label2), markup2 );
+  gtk_label_set_markup ( GTK_LABEL(label3), markup3 );
   gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX(hbox), value, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX(hbox), label2, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX(hbox), value2, FALSE, FALSE, 0);
+  if ( value3 ) {
+    gtk_box_pack_start (GTK_BOX(hbox), label3, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX(hbox), value3, FALSE, FALSE, 0);
+  }
+  if (checkbutton2) {
+    gtk_box_pack_end (GTK_BOX(hbox), checkbutton2, FALSE, FALSE, 0);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkbutton2), checkbutton2_default);
+  }
+  if (checkbutton1) {
+    gtk_box_pack_end (GTK_BOX(hbox), checkbutton1, FALSE, FALSE, 0);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkbutton1), checkbutton1_default);
+  }
   gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-  
+
   return vbox;
 }
 
-void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *tr, gpointer vlp, gchar *track_name )
+static GtkWidget *create_table (int cnt, char *labels[], GtkWidget *contents[])
+{
+  GtkTable *table;
+  int i;
+
+  table = GTK_TABLE(gtk_table_new (cnt, 2, FALSE));
+  gtk_table_set_col_spacing (table, 0, 10);
+  for (i=0; i<cnt; i++) {
+    GtkWidget *label;
+
+    // Settings so the text positioning only moves around vertically when the dialog is resized
+    // This also gives more room to see the track comment
+    label = gtk_label_new(NULL);
+    gtk_misc_set_alignment ( GTK_MISC(label), 1, 0.5 ); // Position text centrally in vertical plane
+    gtk_label_set_markup ( GTK_LABEL(label), _(labels[i]) );
+    gtk_table_attach ( table, label, 0, 1, i, i+1, GTK_FILL, GTK_SHRINK, 0, 0 );
+    if (GTK_IS_MISC(contents[i])) {
+      gtk_misc_set_alignment ( GTK_MISC(contents[i]), 0, 0.5 );
+    }
+    if ( GTK_IS_COLOR_BUTTON(contents[i]) || GTK_IS_COMBO_BOX(contents[i]) )
+      // Buttons compressed - otherwise look weird (to me) if vertically massive
+      gtk_table_attach ( table, contents[i], 1, 2, i, i+1, GTK_FILL, GTK_SHRINK, 0, 5 );
+    else
+      // Expand for comments + descriptions / labels
+      gtk_table_attach_defaults ( table, contents[i], 1, 2, i, i+1 );
+  }
+
+  return GTK_WIDGET (table);
+}
+
+void vik_trw_layer_propwin_run ( GtkWindow *parent,
+                                 VikTrwLayer *vtl,
+                                 VikTrack *tr,
+                                 gpointer vlp,
+                                 VikViewport *vvp,
+                                 gboolean start_on_stats )
 {
-  /* FIXME: free widgets when destroy signal received */
   PropWidgets *widgets = prop_widgets_new();
   widgets->vtl = vtl;
-  widgets->tr = tr;
+  widgets->vvp = vvp;
   widgets->vlp = vlp;
-  widgets->track_name = track_name;
-  gchar *title = g_strdup_printf(_("%s - Track Properties"), track_name);
+  widgets->tr = tr;
+
+  gint profile_size_value;
+  // Ensure minimum values
+  widgets->profile_width = 600;
+  if ( a_settings_get_integer ( VIK_SETTINGS_TRACK_PROFILE_WIDTH, &profile_size_value ) )
+    if ( profile_size_value > widgets->profile_width )
+      widgets->profile_width = profile_size_value;
+
+  widgets->profile_height = 300;
+  if ( a_settings_get_integer ( VIK_SETTINGS_TRACK_PROFILE_HEIGHT, &profile_size_value ) )
+    if ( profile_size_value > widgets->profile_height )
+      widgets->profile_height = profile_size_value;
+
+  gchar *title = g_strdup_printf(_("%s - Track Properties"), tr->name);
   GtkWidget *dialog = gtk_dialog_new_with_buttons (title,
                          parent,
                          GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
                          GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
-                         _("Split at Marker"), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER,
-                         _("Split Segments"), VIK_TRW_LAYER_PROPWIN_SPLIT,
-                         _("Reverse"),        VIK_TRW_LAYER_PROPWIN_REVERSE,
-                         _("Delete Dupl."),   VIK_TRW_LAYER_PROPWIN_DEL_DUP,
+                         _("Split at _Marker"), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER,
+                         _("Split _Segments"), VIK_TRW_LAYER_PROPWIN_SPLIT,
+                         _("_Reverse"),        VIK_TRW_LAYER_PROPWIN_REVERSE,
+                         _("_Delete Dupl."),   VIK_TRW_LAYER_PROPWIN_DEL_DUP,
                          GTK_STOCK_OK,     GTK_RESPONSE_ACCEPT,
                          NULL);
   widgets->dialog = dialog;
+  g_signal_connect( G_OBJECT(dialog), "response", G_CALLBACK(propwin_response_cb), widgets);
+
   g_free(title);
-  g_signal_connect(dialog, "response", G_CALLBACK(propwin_response_cb), widgets);
-  //fprintf(stderr, "DEBUG: dialog=0x%p\n", dialog);
-  GtkTable *table;
+  GtkWidget *table;
   gdouble tr_len;
-  guint32 tp_count, seg_count;
+  gulong tp_count;
+  guint seg_count;
 
   gdouble min_alt, max_alt;
-  GtkWidget *profile = vik_trw_layer_create_profile(GTK_WIDGET(parent),tr, vlp, widgets, &min_alt,&max_alt);
-  GtkWidget *vtdiag = vik_trw_layer_create_vtdiag(GTK_WIDGET(parent), tr, vlp, widgets);
+  widgets->elev_box = vik_trw_layer_create_profile(GTK_WIDGET(parent), widgets, &min_alt, &max_alt);
+  widgets->gradient_box = vik_trw_layer_create_gradient(GTK_WIDGET(parent), widgets);
+  widgets->speed_box = vik_trw_layer_create_vtdiag(GTK_WIDGET(parent), widgets);
+  widgets->dist_box = vik_trw_layer_create_dtdiag(GTK_WIDGET(parent), widgets);
+  widgets->elev_time_box = vik_trw_layer_create_etdiag(GTK_WIDGET(parent), widgets);
+  widgets->speed_dist_box = vik_trw_layer_create_sddiag(GTK_WIDGET(parent), widgets);
   GtkWidget *graphs = gtk_notebook_new();
 
-  widgets->elev_box = profile;
-  widgets->speed_box = vtdiag;
-
-  GtkWidget *content[20];
-  int cnt;
-  int i;
-
-  static gchar *label_texts[] = { N_("<b>Comment:</b>"), N_("<b>Track Length:</b>"), N_("<b>Trackpoints:</b>"), N_("<b>Segments:</b>"), N_("<b>Duplicate Points:</b>"), N_("<b>Max Speed:</b>"), N_("<b>Avg. Speed:</b>"), N_("<b>Avg. Dist. Between TPs:</b>"), N_("<b>Elevation Range:</b>"), N_("<b>Total Elevation Gain/Loss:</b>"), N_("<b>Start:</b>"), N_("<b>End:</b>"), N_("<b>Duration:</b>") };
+  GtkWidget *content_prop[20];
+  int cnt_prop = 0;
+
+  static gchar *label_texts[] = {
+    N_("<b>Comment:</b>"),
+    N_("<b>Description:</b>"),
+    N_("<b>Color:</b>"),
+    N_("<b>Draw Name:</b>"),
+    N_("<b>Distance Labels:</b>"),
+  };
+  static gchar *stats_texts[] = {
+    N_("<b>Track Length:</b>"),
+    N_("<b>Trackpoints:</b>"),
+    N_("<b>Segments:</b>"),
+    N_("<b>Duplicate Points:</b>"),
+    N_("<b>Max Speed:</b>"),
+    N_("<b>Avg. Speed:</b>"),
+    N_("<b>Moving Avg. Speed:</b>"),
+    N_("<b>Avg. Dist. Between TPs:</b>"),
+    N_("<b>Elevation Range:</b>"),
+    N_("<b>Total Elevation Gain/Loss:</b>"),
+    N_("<b>Start:</b>"),
+    N_("<b>End:</b>"),
+    N_("<b>Duration:</b>"),
+  };
   static gchar tmp_buf[50];
   gdouble tmp_speed;
 
-  cnt = 0;
+  // Properties
   widgets->w_comment = gtk_entry_new ();
   if ( tr->comment )
     gtk_entry_set_text ( GTK_ENTRY(widgets->w_comment), tr->comment );
   g_signal_connect_swapped ( widgets->w_comment, "activate", G_CALLBACK(a_dialog_response_accept), GTK_DIALOG(dialog) );
-  content[cnt++] = widgets->w_comment;
+  content_prop[cnt_prop++] = widgets->w_comment;
+
+  widgets->w_description = gtk_entry_new ();
+  if ( tr->description )
+    gtk_entry_set_text ( GTK_ENTRY(widgets->w_description), tr->description );
+  g_signal_connect_swapped ( widgets->w_description, "activate", G_CALLBACK(a_dialog_response_accept), GTK_DIALOG(dialog) );
+  content_prop[cnt_prop++] = widgets->w_description;
+
+  widgets->w_color = content_prop[cnt_prop++] = gtk_color_button_new_with_color ( &(tr->color) );
+
+  static gchar *draw_name_labels[] = {
+    N_("No"),
+    N_("Centre"),
+    N_("Start only"),
+    N_("End only"),
+    N_("Start and End"),
+    N_("Centre, Start and End"),
+    NULL
+  };
+
+  widgets->w_namelabel = content_prop[cnt_prop++] = vik_combo_box_text_new ();
+  gchar **pstr = draw_name_labels;
+  while ( *pstr )
+    vik_combo_box_text_append ( widgets->w_namelabel, *(pstr++) );
+  gtk_combo_box_set_active ( GTK_COMBO_BOX(widgets->w_namelabel), tr->draw_name_mode );
+
+  widgets->w_number_distlabels = content_prop[cnt_prop++] =
+   gtk_spin_button_new ( GTK_ADJUSTMENT(gtk_adjustment_new(tr->max_number_dist_labels, 0, 100, 1, 1, 0)), 1, 0 );
+  gtk_widget_set_tooltip_text ( GTK_WIDGET(widgets->w_number_distlabels), _("Maximum number of distance labels to be shown") );
+
+  table = create_table (cnt_prop, label_texts, content_prop);
+
+  gtk_notebook_append_page(GTK_NOTEBOOK(graphs), GTK_WIDGET(table), gtk_label_new(_("Properties")));
+
+  // Statistics
+  GtkWidget *content[20];
+  int cnt = 0;
+
+  vik_units_distance_t dist_units = a_vik_get_units_distance ();
+
+  // NB This value not shown yet - but is used by internal calculations
+  widgets->track_length_inc_gaps = vik_track_get_length_including_gaps(tr);
 
   tr_len = widgets->track_length = vik_track_get_length(tr);
-  g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m", tr_len );
-  widgets->w_track_length = content[cnt++] = gtk_label_new ( tmp_buf );
+  switch (dist_units) {
+  case VIK_UNITS_DISTANCE_KILOMETRES:
+    g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km", tr_len/1000.0 );
+    break;
+  case VIK_UNITS_DISTANCE_MILES:
+    g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f miles", VIK_METERS_TO_MILES(tr_len) );
+    break;
+  case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+    g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f NM", VIK_METERS_TO_NAUTICAL_MILES(tr_len) );
+    break;
+  default:
+    g_critical("Houston, we've had a problem. distance=%d", dist_units);
+  }
+  widgets->w_track_length = content[cnt++] = ui_label_new_selectable ( tmp_buf );
 
   tp_count = vik_track_get_tp_count(tr);
-  g_snprintf(tmp_buf, sizeof(tmp_buf), "%u", tp_count );
-  widgets->w_tp_count = content[cnt++] = gtk_label_new ( tmp_buf );
+  g_snprintf(tmp_buf, sizeof(tmp_buf), "%lu", tp_count );
+  widgets->w_tp_count = content[cnt++] = ui_label_new_selectable ( tmp_buf );
 
   seg_count = vik_track_get_segment_count(tr) ;
   g_snprintf(tmp_buf, sizeof(tmp_buf), "%u", seg_count );
-  widgets->w_segment_count = content[cnt++] = gtk_label_new ( tmp_buf );
+  widgets->w_segment_count = content[cnt++] = ui_label_new_selectable ( tmp_buf );
 
   g_snprintf(tmp_buf, sizeof(tmp_buf), "%lu", vik_track_get_dup_point_count(tr) );
-  widgets->w_duptp_count = content[cnt++] = gtk_label_new ( tmp_buf );
+  widgets->w_duptp_count = content[cnt++] = ui_label_new_selectable ( tmp_buf );
 
+  vik_units_speed_t speed_units = a_vik_get_units_speed ();
   tmp_speed = vik_track_get_max_speed(tr);
   if ( tmp_speed == 0 )
     g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data"));
-  else
-    g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m/s   (%.0f km/h)", tmp_speed, MTOK(tmp_speed) );
-  widgets->w_max_speed = content[cnt++] = gtk_label_new ( tmp_buf );
+  else {
+    switch (speed_units) {
+    case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km/h", VIK_MPS_TO_KPH(tmp_speed));
+      break;
+    case VIK_UNITS_SPEED_MILES_PER_HOUR:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f mph", VIK_MPS_TO_MPH(tmp_speed));
+      break;
+    case VIK_UNITS_SPEED_METRES_PER_SECOND:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m/s", tmp_speed );
+      break;
+    case VIK_UNITS_SPEED_KNOTS:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f knots", VIK_MPS_TO_KNOTS(tmp_speed));
+      break;
+    default:
+      g_snprintf (tmp_buf, sizeof(tmp_buf), "--" );
+      g_critical("Houston, we've had a problem. speed=%d", speed_units);
+    }
+  }
+  widgets->w_max_speed = content[cnt++] = ui_label_new_selectable ( tmp_buf );
 
   tmp_speed = vik_track_get_average_speed(tr);
   if ( tmp_speed == 0 )
     g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data"));
-  else
-    g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m/s   (%.0f km/h)", tmp_speed, MTOK(tmp_speed) );
-  widgets->w_avg_speed = content[cnt++] = gtk_label_new ( tmp_buf );
+  else {
+    switch (speed_units) {
+    case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km/h", VIK_MPS_TO_KPH(tmp_speed));
+      break;
+    case VIK_UNITS_SPEED_MILES_PER_HOUR:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f mph", VIK_MPS_TO_MPH(tmp_speed));
+      break;
+    case VIK_UNITS_SPEED_METRES_PER_SECOND:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m/s", tmp_speed );
+      break;
+    case VIK_UNITS_SPEED_KNOTS:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f knots", VIK_MPS_TO_KNOTS(tmp_speed));
+      break;
+    default:
+      g_snprintf (tmp_buf, sizeof(tmp_buf), "--" );
+      g_critical("Houston, we've had a problem. speed=%d", speed_units);
+    }
+  }
+  widgets->w_avg_speed = content[cnt++] = ui_label_new_selectable ( tmp_buf );
 
-  g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m", (tp_count - seg_count) == 0 ? 0 : tr_len / ( tp_count - seg_count ) );
-  widgets->w_avg_dist = content[cnt++] = gtk_label_new ( tmp_buf );
+  // Use 60sec as the default period to be considered stopped
+  //  this is the TrackWaypoint draw stops default value 'vtl->stop_length'
+  //  however this variable is not directly accessible - and I don't expect it's often changed from the default
+  //  so ATM just put in the number
+  tmp_speed = vik_track_get_average_speed_moving(tr, 60);
+  if ( tmp_speed == 0 )
+    g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data"));
+  else {
+    switch (speed_units) {
+    case VIK_UNITS_SPEED_KILOMETRES_PER_HOUR:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f km/h", VIK_MPS_TO_KPH(tmp_speed));
+      break;
+    case VIK_UNITS_SPEED_MILES_PER_HOUR:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f mph", VIK_MPS_TO_MPH(tmp_speed));
+      break;
+    case VIK_UNITS_SPEED_METRES_PER_SECOND:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m/s", tmp_speed );
+      break;
+    case VIK_UNITS_SPEED_KNOTS:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f knots", VIK_MPS_TO_KNOTS(tmp_speed));
+      break;
+    default:
+      g_snprintf (tmp_buf, sizeof(tmp_buf), "--" );
+      g_critical("Houston, we've had a problem. speed=%d", speed_units);
+    }
+  }
+  widgets->w_mvg_speed = content[cnt++] = ui_label_new_selectable ( tmp_buf );
+
+  switch (dist_units) {
+  case VIK_UNITS_DISTANCE_KILOMETRES:
+    // Even though kilometres, the average distance between points is going to be quite small so keep in metres
+    g_snprintf(tmp_buf, sizeof(tmp_buf), "%.2f m", (tp_count - seg_count) == 0 ? 0 : tr_len / ( tp_count - seg_count ) );
+    break;
+  case VIK_UNITS_DISTANCE_MILES:
+    g_snprintf(tmp_buf, sizeof(tmp_buf), "%.3f miles", (tp_count - seg_count) == 0 ? 0 : VIK_METERS_TO_MILES(tr_len / ( tp_count - seg_count )) );
+    break;
+  case VIK_UNITS_DISTANCE_NAUTICAL_MILES:
+    g_snprintf(tmp_buf, sizeof(tmp_buf), "%.3f NM", (tp_count - seg_count) == 0 ? 0 : VIK_METERS_TO_NAUTICAL_MILES(tr_len / ( tp_count - seg_count )) );
+    break;
+  default:
+    g_critical("Houston, we've had a problem. distance=%d", dist_units);
+  }
+  widgets->w_avg_dist = content[cnt++] = ui_label_new_selectable ( tmp_buf );
 
+  vik_units_height_t height_units = a_vik_get_units_height ();
   if ( min_alt == VIK_DEFAULT_ALTITUDE )
     g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data"));
-  else
-    g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m - %.0f m", min_alt, max_alt );
-  widgets->w_elev_range = content[cnt++] = gtk_label_new ( tmp_buf );
+  else {
+    switch (height_units) {
+    case VIK_UNITS_HEIGHT_METRES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m - %.0f m", min_alt, max_alt );
+      break;
+    case VIK_UNITS_HEIGHT_FEET:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f feet - %.0f feet", VIK_METERS_TO_FEET(min_alt), VIK_METERS_TO_FEET(max_alt) );
+      break;
+    default:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "--" );
+      g_critical("Houston, we've had a problem. height=%d", height_units);
+    }
+  }
+  widgets->w_elev_range = content[cnt++] = ui_label_new_selectable ( tmp_buf );
 
   vik_track_get_total_elevation_gain(tr, &max_alt, &min_alt );
   if ( min_alt == VIK_DEFAULT_ALTITUDE )
     g_snprintf(tmp_buf, sizeof(tmp_buf), _("No Data"));
-  else
-    g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m / %.0f m", max_alt, min_alt );
-  widgets->w_elev_gain = content[cnt++] = gtk_label_new ( tmp_buf );
+  else {
+    switch (height_units) {
+    case VIK_UNITS_HEIGHT_METRES:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m / %.0f m", max_alt, min_alt );
+      break;
+    case VIK_UNITS_HEIGHT_FEET:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f feet / %.0f feet", VIK_METERS_TO_FEET(max_alt), VIK_METERS_TO_FEET(min_alt) );
+      break;
+    default:
+      g_snprintf(tmp_buf, sizeof(tmp_buf), "--" );
+      g_critical("Houston, we've had a problem. height=%d", height_units);
+    }
+  }
+  widgets->w_elev_gain = content[cnt++] = ui_label_new_selectable ( tmp_buf );
 
 #if 0
 #define PACK(w) gtk_box_pack_start (GTK_BOX(right_vbox), w, FALSE, FALSE, 0);
@@ -826,56 +3366,132 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *
     t1 = VIK_TRACKPOINT(tr->trackpoints->data)->timestamp;
     t2 = VIK_TRACKPOINT(g_list_last(tr->trackpoints)->data)->timestamp;
 
-    strncpy(tmp_buf, ctime(&t1), sizeof(tmp_buf));
-    tmp_buf[sizeof(tmp_buf)-1] = 0;
-    g_strchomp(tmp_buf);
-    widgets->w_time_start = content[cnt++] = gtk_label_new(tmp_buf);
+    VikCoord vc;
+    // Notional center of a track is simply an average of the bounding box extremities
+    struct LatLon center = { (tr->bbox.north+tr->bbox.south)/2, (tr->bbox.east+tr->bbox.west)/2 };
+    vik_coord_load_from_latlon ( &vc, vik_trw_layer_get_coord_mode(vtl), &center );
+
+    widgets->tz = vu_get_tz_at_location ( &vc );
+
+    gchar *msg;
+    msg = vu_get_time_string ( &t1, "%c", &vc, widgets->tz );
+    widgets->w_time_start = content[cnt++] = ui_label_new_selectable(msg);
+    g_free ( msg );
 
-    strncpy(tmp_buf, ctime(&t2), sizeof(tmp_buf));
-    tmp_buf[sizeof(tmp_buf)-1] = 0;
-    g_strchomp(tmp_buf);
-    widgets->w_time_end = content[cnt++] = gtk_label_new(tmp_buf);
+    msg = vu_get_time_string ( &t2, "%c", &vc, widgets->tz );
+    widgets->w_time_end = content[cnt++] = ui_label_new_selectable(msg);
+    g_free ( msg );
 
     g_snprintf(tmp_buf, sizeof(tmp_buf), _("%d minutes"), (int)(t2-t1)/60);
-    widgets->w_time_dur = content[cnt++] = gtk_label_new(tmp_buf);
+    widgets->w_time_dur = content[cnt++] = ui_label_new_selectable(tmp_buf);
   } else {
     widgets->w_time_start = content[cnt++] = gtk_label_new(_("No Data"));
     widgets->w_time_end = content[cnt++] = gtk_label_new(_("No Data"));
     widgets->w_time_dur = content[cnt++] = gtk_label_new(_("No Data"));
   }
 
-  table = GTK_TABLE(gtk_table_new (cnt, 2, FALSE));
-  gtk_table_set_col_spacing (table, 0, 10);
-  for (i=0; i<cnt; i++) {
-    GtkWidget *label;
-
-    label = gtk_label_new(NULL);
-    gtk_misc_set_alignment ( GTK_MISC(label), 1, 0 );
-    gtk_label_set_markup ( GTK_LABEL(label), _(label_texts[i]) );
-    gtk_table_attach_defaults ( table, label, 0, 1, i, i+1 );
-    if (GTK_IS_MISC(content[i])) {
-      gtk_misc_set_alignment ( GTK_MISC(content[i]), 0, 0 );
-    }
-    gtk_table_attach_defaults ( table, content[i], 1, 2, i, i+1 );
-  }
+  table = create_table (cnt, stats_texts, content);
 
   gtk_notebook_append_page(GTK_NOTEBOOK(graphs), GTK_WIDGET(table), gtk_label_new(_("Statistics")));
 
-  if ( profile ) {
+  if ( widgets->elev_box ) {
     GtkWidget *page = NULL;
-    widgets->w_cur_dist = gtk_label_new(_("No Data"));
-    page = create_graph_page (profile, _("<b>Track Distance:</b>"), widgets->w_cur_dist );
+    widgets->w_cur_dist = ui_label_new_selectable(_("No Data"));
+    widgets->w_cur_elevation = ui_label_new_selectable(_("No Data"));
+    widgets->w_show_dem = gtk_check_button_new_with_mnemonic(_("Show D_EM"));
+    widgets->w_show_alt_gps_speed = gtk_check_button_new_with_mnemonic(_("Show _GPS Speed"));
+    page = create_graph_page (widgets->elev_box,
+                              _("<b>Track Distance:</b>"), widgets->w_cur_dist,
+                              _("<b>Track Height:</b>"), widgets->w_cur_elevation,
+                              NULL, NULL,
+                              widgets->w_show_dem, show_dem,
+                              widgets->w_show_alt_gps_speed, show_alt_gps_speed);
+    g_signal_connect (widgets->w_show_dem, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets);
+    g_signal_connect (widgets->w_show_alt_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets);
     gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Elevation-distance")));
   }
 
-  if ( vtdiag ) {
+  if ( widgets->gradient_box ) {
     GtkWidget *page = NULL;
-    widgets->w_cur_time = gtk_label_new(_("No Data"));
-    page = create_graph_page (vtdiag, _("<b>Track Time:</b>"), widgets->w_cur_time );
+    widgets->w_cur_gradient_dist = ui_label_new_selectable(_("No Data"));
+    widgets->w_cur_gradient_gradient = ui_label_new_selectable(_("No Data"));
+    widgets->w_show_gradient_gps_speed = gtk_check_button_new_with_mnemonic(_("Show _GPS Speed"));
+    page = create_graph_page (widgets->gradient_box,
+                              _("<b>Track Distance:</b>"), widgets->w_cur_gradient_dist,
+                              _("<b>Track Gradient:</b>"), widgets->w_cur_gradient_gradient,
+                              NULL, NULL,
+                              widgets->w_show_gradient_gps_speed, show_gradient_gps_speed,
+                              NULL, FALSE);
+    g_signal_connect (widgets->w_show_gradient_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets);
+    gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Gradient-distance")));
+  }
+
+  if ( widgets->speed_box ) {
+    GtkWidget *page = NULL;
+    widgets->w_cur_time = ui_label_new_selectable(_("No Data"));
+    widgets->w_cur_speed = ui_label_new_selectable(_("No Data"));
+    widgets->w_cur_time_real = ui_label_new_selectable(_("No Data"));
+    widgets->w_show_gps_speed = gtk_check_button_new_with_mnemonic(_("Show _GPS Speed"));
+    page = create_graph_page (widgets->speed_box,
+                              _("<b>Track Time:</b>"), widgets->w_cur_time,
+                              _("<b>Track Speed:</b>"), widgets->w_cur_speed,
+                              _("<b>Time/Date:</b>"), widgets->w_cur_time_real,
+                              widgets->w_show_gps_speed, show_gps_speed,
+                              NULL, FALSE);
+    g_signal_connect (widgets->w_show_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets);
     gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Speed-time")));
   }
 
-  gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), graphs, FALSE, FALSE, 0);
+  if ( widgets->dist_box ) {
+    GtkWidget *page = NULL;
+    widgets->w_cur_dist_time = ui_label_new_selectable(_("No Data"));
+    widgets->w_cur_dist_dist = ui_label_new_selectable(_("No Data"));
+    widgets->w_cur_dist_time_real = ui_label_new_selectable(_("No Data"));
+    widgets->w_show_dist_speed = gtk_check_button_new_with_mnemonic(_("Show S_peed"));
+    page = create_graph_page (widgets->dist_box,
+                              _("<b>Track Distance:</b>"), widgets->w_cur_dist_dist,
+                              _("<b>Track Time:</b>"), widgets->w_cur_dist_time,
+                              _("<b>Time/Date:</b>"), widgets->w_cur_dist_time_real,
+                              widgets->w_show_dist_speed, show_dist_speed,
+                              NULL, FALSE);
+    g_signal_connect (widgets->w_show_dist_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets);
+    gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Distance-time")));
+  }
+
+  if ( widgets->elev_time_box ) {
+    GtkWidget *page = NULL;
+    widgets->w_cur_elev_time = ui_label_new_selectable(_("No Data"));
+    widgets->w_cur_elev_elev = ui_label_new_selectable(_("No Data"));
+    widgets->w_cur_elev_time_real = ui_label_new_selectable(_("No Data"));
+    widgets->w_show_elev_speed = gtk_check_button_new_with_mnemonic(_("Show S_peed"));
+    widgets->w_show_elev_dem = gtk_check_button_new_with_mnemonic(_("Show D_EM"));
+    page = create_graph_page (widgets->elev_time_box,
+                              _("<b>Track Time:</b>"), widgets->w_cur_elev_time,
+                              _("<b>Track Height:</b>"), widgets->w_cur_elev_elev,
+                              _("<b>Time/Date:</b>"), widgets->w_cur_elev_time_real,
+                              widgets->w_show_elev_dem, show_elev_dem,
+                              widgets->w_show_elev_speed, show_elev_speed);
+    g_signal_connect (widgets->w_show_elev_dem, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets);
+    g_signal_connect (widgets->w_show_elev_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets);
+    gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Elevation-time")));
+  }
+
+  if ( widgets->speed_dist_box ) {
+    GtkWidget *page = NULL;
+    widgets->w_cur_speed_dist = ui_label_new_selectable(_("No Data"));
+    widgets->w_cur_speed_speed = ui_label_new_selectable(_("No Data"));
+    widgets->w_show_sd_gps_speed = gtk_check_button_new_with_mnemonic(_("Show _GPS Speed"));
+    page = create_graph_page (widgets->speed_dist_box,
+                              _("<b>Track Distance:</b>"), widgets->w_cur_speed_dist,
+                              _("<b>Track Speed:</b>"), widgets->w_cur_speed_speed,
+                              NULL, NULL,
+                              widgets->w_show_sd_gps_speed, show_sd_gps_speed,
+                              NULL, FALSE);
+    g_signal_connect (widgets->w_show_sd_gps_speed, "toggled", G_CALLBACK (checkbutton_toggle_cb), widgets);
+    gtk_notebook_append_page(GTK_NOTEBOOK(graphs), page, gtk_label_new(_("Speed-distance")));
+  }
+
+  gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), graphs, FALSE, FALSE, 0);
 
   gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_SPLIT_MARKER, FALSE);
   if (seg_count <= 1)
@@ -883,6 +3499,37 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent, VikTrwLayer *vtl, VikTrack *
   if (vik_track_get_dup_point_count(tr) <= 0)
     gtk_dialog_set_response_sensitive(GTK_DIALOG(dialog), VIK_TRW_LAYER_PROPWIN_DEL_DUP, FALSE);
 
+  // On dialog realization configure_event causes the graphs to be initially drawn
+  widgets->configure_dialog = TRUE;
+  g_signal_connect ( G_OBJECT(dialog), "configure-event", G_CALLBACK (configure_event), widgets );
+
+  g_signal_connect ( G_OBJECT(dialog), "destroy", G_CALLBACK (destroy_cb), widgets );
+
   vik_track_set_property_dialog(tr, dialog);
+  gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
   gtk_widget_show_all ( dialog );
+
+  // Gtk note: due to historical reasons, this must be done after widgets are shown
+  if ( start_on_stats )
+    gtk_notebook_set_current_page ( GTK_NOTEBOOK(graphs), 1 );
+}
+
+
+/**
+ * Update this property dialog
+ * e.g. if the track has been renamed
+ */
+void vik_trw_layer_propwin_update ( VikTrack *trk )
+{
+  // If not displayed do nothing
+  if ( !trk->property_dialog )
+    return;
+
+  // Update title with current name
+  if ( trk->name ) {
+    gchar *title = g_strdup_printf ( _("%s - Track Properties"), trk->name );
+    gtk_window_set_title ( GTK_WINDOW(trk->property_dialog), title );
+    g_free(title);
+  }
+
 }