[Pkg-running-devel] [pytrainer] 01/03: Imported Upstream version 1.11.0

Christian Perrier bubulle at moszumanska.debian.org
Sun Oct 15 06:49:20 UTC 2017


This is an automated email from the git hooks/post-receive script.

bubulle pushed a commit to branch master
in repository pytrainer.

commit 44d754f73d4522c36260c38d34437d28b044c9df
Author: Christian Perrier <bubulle at debian.org>
Date:   Mon Oct 2 08:01:08 2017 +0200

    Imported Upstream version 1.11.0
---
 .gitignore                                         |    4 +
 .travis.yml                                        |   14 +
 CHANGES                                            |   41 +
 bin/pytrainer                                      |   17 +-
 extensions/dotclear/main.py                        |    5 +-
 extensions/wordpress/wordpress.py                  |   12 +-
 glade/calendar.glade                               |  128 -
 glade/{equipment.glade => equipment.ui}            |  560 ++-
 glade/{extensions.glade => extensions.ui}          |  100 +-
 glade/filechooserdialog.glade                      |   66 -
 glade/{importdata.glade => importdata.ui}          |  968 +++--
 glade/{newrecord.glade => newrecord.ui}            |  689 ++-
 glade/{plugins.glade => plugins.ui}                |   94 +-
 glade/{profile.glade => profile.ui}                | 1197 +++---
 glade/{pytrainer.glade => pytrainer.ui}            | 4385 +++++++++++---------
 ...electtrackdialog.glade => selecttrackdialog.ui} |   40 +-
 glade/warning.glade                                |   99 -
 imports/file_garminfit.py                          |    9 +-
 imports/file_garmintcxv1.py                        |    9 +-
 imports/file_garmintcxv2.py                        |    9 +-
 imports/file_garmintools.py                        |    9 +-
 imports/file_gpxplus.py                            |   11 +-
 imports/file_gpxplusNokia.py                       |    9 +-
 imports/file_kml20.py                              |    5 -
 imports/tool_gant.py                               |   18 -
 imports/tool_garmintools.py                        |   18 -
 imports/tool_gpsbabel.py                           |   18 -
 locale/ca/LC_MESSAGES/pytrainer.mo                 |  Bin 1989 -> 1948 bytes
 locale/ca/LC_MESSAGES/pytrainer_ca.po              | 2090 +++++-----
 locale/cs/LC_MESSAGES/pytrainer.mo                 |  Bin 3616 -> 3446 bytes
 locale/cs/LC_MESSAGES/pytrainer_cs.po              | 2098 +++++-----
 locale/da/LC_MESSAGES/pytrainer.mo                 |  Bin 3988 -> 3683 bytes
 locale/da/LC_MESSAGES/pytrainer_da.po              | 2126 +++++-----
 locale/de/LC_MESSAGES/pytrainer.mo                 |  Bin 31216 -> 29677 bytes
 locale/de/LC_MESSAGES/pytrainer_de.po              | 2315 ++++++-----
 locale/es/LC_MESSAGES/pytrainer.mo                 |  Bin 30450 -> 29013 bytes
 locale/es/LC_MESSAGES/pytrainer_es.po              | 2317 ++++++-----
 locale/eu/LC_MESSAGES/pytrainer.mo                 |  Bin 3704 -> 3516 bytes
 locale/eu/LC_MESSAGES/pytrainer_eu.po              | 2113 +++++-----
 locale/fr/LC_MESSAGES/pytrainer.mo                 |  Bin 31283 -> 29807 bytes
 locale/fr/LC_MESSAGES/pytrainer_fr.po              | 2337 ++++++-----
 locale/gl/LC_MESSAGES/pytrainer.mo                 |  Bin 30766 -> 29312 bytes
 locale/gl/LC_MESSAGES/pytrainer_gl.po              | 2317 ++++++-----
 locale/no/LC_MESSAGES/pytrainer.mo                 |  Bin 2362 -> 2368 bytes
 locale/no/LC_MESSAGES/pytrainer_no.po              | 2036 +++++----
 locale/pl/LC_MESSAGES/pytrainer.mo                 |  Bin 1871 -> 1830 bytes
 locale/pl/LC_MESSAGES/pytrainer_pl.po              | 2096 +++++-----
 locale/pt/LC_MESSAGES/pytrainer.mo                 |  Bin 29544 -> 28118 bytes
 locale/pt/LC_MESSAGES/pytrainer_pt.po              | 2321 ++++++-----
 locale/ru/LC_MESSAGES/pytrainer.mo                 |  Bin 5913 -> 5867 bytes
 locale/ru/LC_MESSAGES/pytrainer_ru.po              | 2115 +++++-----
 locale/sv/LC_MESSAGES/pytrainer.mo                 |  Bin 20301 -> 19207 bytes
 locale/sv/LC_MESSAGES/pytrainer_sv.po              | 2311 ++++++-----
 pytrainer/__init__.py                              |    5 +-
 pytrainer/activitypool.py                          |   71 -
 pytrainer/athlete.py                               |   14 +-
 pytrainer/core/activity.py                         |  618 +++
 pytrainer/core/equipment.py                        |    3 +-
 pytrainer/environment.py                           |   57 +-
 pytrainer/extensions/googlemaps.py                 |    4 +-
 pytrainer/extensions/osm.py                        |    4 +-
 pytrainer/gui/SimpleGladeApp.py                    |  195 +-
 pytrainer/gui/aboutdialog.py                       |    2 +-
 pytrainer/gui/dialogs.py                           |   87 +-
 pytrainer/gui/dialogselecttrack.py                 |    8 +-
 pytrainer/gui/drawArea.py                          |    2 +-
 pytrainer/gui/drawGraph.py                         |    6 +-
 pytrainer/gui/equipment.py                         |    2 +-
 pytrainer/gui/filechooser.py                       |   72 -
 pytrainer/gui/popupmenu.py                         |   43 +-
 pytrainer/gui/warning.py                           |   91 +-
 pytrainer/gui/windowcalendar.py                    |   36 +-
 pytrainer/gui/windowextensions.py                  |    9 +-
 pytrainer/gui/windowimportdata.py                  |   13 +-
 pytrainer/gui/windowmain.py                        |  277 +-
 pytrainer/gui/windowplugins.py                     |    9 +-
 pytrainer/gui/windowprofile.py                     |   59 +-
 pytrainer/gui/windowrecord.py                      |   31 +-
 pytrainer/lib/activity.py                          |  687 ---
 pytrainer/lib/date.py                              |  120 +-
 pytrainer/lib/ddbb.py                              |   10 +-
 pytrainer/lib/gpx.py                               |   14 +-
 pytrainer/lib/localization.py                      |   24 +
 pytrainer/lib/sqliteUtils.py                       |   22 +-
 pytrainer/lib/test_gpx.py                          |   83 -
 pytrainer/lib/uc.py                                |   27 +-
 pytrainer/lib/unitsconversor.py                    |  184 -
 pytrainer/main.py                                  |  105 +-
 pytrainer/platform.py                              |    6 +
 pytrainer/profile.py                               |  159 +-
 pytrainer/record.py                                |   20 +-
 pytrainer/save.py                                  |   10 +-
 pytrainer/test/core/test_activity.py               |  105 +
 .../core/{equipment_test.py => test_equipment.py}  |   91 +-
 .../test/core/{sport_test.py => test_sport.py}     |  127 +-
 pytrainer/test/environment_test.py                 |   75 -
 .../test/gui/{color_test.py => test_color.py}      |    0
 .../gui/{equipment_test.py => test_equipment.py}   |    0
 .../{garmin-fit_test.py => test_garminfit.py}      |    0
 .../{garmin-tcxv2_test.py => test_garmintcxv2.py}  |    0
 pytrainer/test/lib/test_date.py                    |   48 +
 pytrainer/test/lib/{gpx_test.py => test_gpx.py}    |   53 +
 pytrainer/test/lib/test_uc.py                      |   67 +
 pytrainer/test/test_athlete.py                     |   77 +
 pytrainer/test/test_environment.py                 |   67 +
 pytrainer/test/test_waypoint.py                    |   75 +
 .../test/upgrade/{data_test.py => test_data.py}    |    0
 .../{version014_test.py => test_version014.py}     |    0
 .../test/util/{color_test.py => test_color.py}     |    0
 pytrainer/test/util/{date_test.py => test_date.py} |    0
 pytrainer/upgrade/data.py                          |    5 +-
 pytrainer/upgrade/migratedb.py                     |   12 +-
 pytrainer/waypoint.py                              |    3 +-
 setup.py                                           |   20 +-
 utils/translator.sh                                |    2 +-
 utils/update_localizations.sh                      |    2 +-
 116 files changed, 20725 insertions(+), 20419 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..76d6381
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.pyc
+/messages.pot
+build
+*~
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..c7d6a97
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+sudo: required
+language: python
+env:
+  - TZ=Europe/Kaliningrad
+before_install:
+  - sudo apt-get install python-gtk2 python-glade2 python-lxml python-matplotlib
+python:
+  - "2.7"
+script: "python setup.py test"
+virtualenv:
+  system_site_packages: true
+notifications:
+  irc:
+    channels: "ircs://chat.freenode.net:7000/#pytrainer"
diff --git a/CHANGES b/CHANGES
index 0e2713e..36f6c43 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,46 @@
 We have migrated to GitHub, for more details about changelog please see git log documentation (http://git-scm.com/docs/git-log). One simple approach: git log --oneline --stat --decorate <since>..<until>
 
+- pytrainer changes for 1.11.0:
+
+- Known issues:
+  Gtk outputs warnings about extra properties when loading the main window
+
+- Improvements:
+  1a237adba0fb, 640ef4e55da8, 30fdfd9e83eb Performance improvements
+  fcc8f3361d4f FIT conversion updated to work with Perl 5.22
+  92d6a33aed16 Setuptools is now used for installation where available
+  4bb91436522b Start screen can now be configured (ticket #12)
+  086a0dd81549 The map functionality is now optional (and python-webkit is no
+               longer required)
+
+- Bugs fixed:
+  9d1c670ea1ac Logging now works as configured
+  10b04c8b38e1 Sports list stays up to date
+  0a23585c2d25 Prior usage is included in equipment usage stats
+  acbe61ddbf16 Strings are now quoted correctly with sqlite
+  8ca54a97a9f6 Fix pace unit conversion
+  f52235a9d921 Missing import in gpxplus
+  c2f41e97022f Check that Activity.gpx exists before using it
+
+- Internals:
+  a6f80a252a1d All tests are now found and executed
+  d82fbeee3a06 Use DDBB with an in-memory database when testing Equipment
+  b284fdffee3a Use DDBB with an in-memory database when testing Sport
+  3ade6e1dd822 Date methods converted into simple utility functions
+  80805b326cd0 Test cases added for date utility functions
+  321206a797ea Environment converted into a singleton
+  96e471f38958 Profile converted into a singleton
+  2573955d9c0c Tests added for the Athlete class
+  29db339f41fc Tests added for the Waypoint class
+  bfacd6d55598 Tests added for unit conversion
+  f9a93daffc28, 37982f5e214b Heavily refactor the Activity class
+  4c84abf522ba Tests added for the Activity class
+  5eab5b0a38fa unitsconversor was fully replaced with UC and removed
+  1ac7db0049a1 Default log level was changed to warning
+  005accf46b2f Stop using glade for the popup menu
+  0303a92fb0ef Use the locale module instead of the gtk.glade helper
+  4601b5f1c703 Migrated from gtk.glade to gtk.Builder
+
 - pytrainer changes for 1.10.0:
 
 - Known issues
diff --git a/bin/pytrainer b/bin/pytrainer
index a28cf62..f8baff8 100755
--- a/bin/pytrainer
+++ b/bin/pytrainer
@@ -17,11 +17,7 @@
 #along with this program; if not, write to the Free Software
 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-import gettext
 import sys
-import pygtk
-pygtk.require('2.0')
-import gtk.glade
 import os
 import glob
 import commands
@@ -77,6 +73,9 @@ if (os.path.exists(base_path + "/INSTALL")
     gettext_path = base_path + "/locale"
 else:
     print("running pytrainer from egg installation")
+    parts = os.path.split(base_path)
+    if parts[1] == 'EGG-INFO':
+        base_path = parts[0]
     data_path = base_path + "/share/pytrainer/"
     site_path =  "%s/lib/python%s.%s/site-packages" % (base_path, ver[0], ver[1])
     gettext_path = base_path + "/share/locale"
@@ -85,17 +84,13 @@ print "data_path: " + data_path
 print "gettext_path: " + gettext_path
 print "site_path: " + site_path
 
-gettext.bindtextdomain("pytrainer", gettext_path)
-gtk.glade.bindtextdomain("pytrainer", gettext_path)
-gtk.glade.textdomain("pytrainer")
-gettext.textdomain("pytrainer")
-gettext.install("pytrainer", gettext_path, unicode=1)
-
 #ensure pytrainer directory is included in import path
 sys.path.insert(0, site_path)
-from pytrainer.main import pyTrainer
 
 def main():
+    import pytrainer.lib.localization
+    pytrainer.lib.localization.initialize_gettext(gettext_path)
+    from pytrainer.main import pyTrainer
     pytrainer = pyTrainer(None, data_path)
 
 if __name__ == "__main__":
diff --git a/extensions/dotclear/main.py b/extensions/dotclear/main.py
index 73897d1..5cd0825 100755
--- a/extensions/dotclear/main.py
+++ b/extensions/dotclear/main.py
@@ -20,7 +20,7 @@
 import xmlrpclib
 import SOAPpy
 import os
-from pytrainer.lib.date import Date
+from pytrainer.lib.date import second2time
 from pytrainer.lib.soapUtils import *
 
 from optparse import OptionParser
@@ -55,12 +55,11 @@ class Main:
 			print "can't connect the server"
 			
 	def loadRecordInfo(self):
-		date = Date()
       		record = self.webserviceserver.getRecordInfo(self.idrecord)
 		self.sport = record["sport"]
                 self.date = record["date"]
                 self.distance = record["distance"]
-                self.time = date.second2time(float(record["time"]))
+                self.time = second2time(float(record["time"]))
                 self.heure = self.time[0]
                 self.minute = self.time[1] 
                 self.seconde = self.time[2]
diff --git a/extensions/wordpress/wordpress.py b/extensions/wordpress/wordpress.py
index 9861f14..d98d13f 100644
--- a/extensions/wordpress/wordpress.py
+++ b/extensions/wordpress/wordpress.py
@@ -28,12 +28,14 @@ import wordpresslib     #TODO remove need for this library
 from pytrainer.extensions.googlemaps import Googlemaps
 import pytrainer.lib.points as Points
 from pytrainer.lib.date import Date
+from pytrainer.lib.uc import UC
 
 class wordpress:
     def __init__(self, parent = None, pytrainer_main = None, conf_dir = None, options = None):
         #TODO could use some logging
         self.parent = parent
         self.pytrainer_main = pytrainer_main
+        self.uc = UC()
         self.options = options
         self.conf_dir = conf_dir
         self.tmpdir = self.pytrainer_main.profile.tmpdir
@@ -189,10 +191,6 @@ class wordpress:
         self.maxpace = self.activity.maxpace
         self.pace = self.activity.pace
         self.maxbeats = self.activity.maxbeats
-        self.distance_unit = self.activity.distance_unit
-        self.speed_unit = self.activity.speed_unit
-        self.pace_unit = self.activity.pace_unit
-        self.height_unit = self.activity.height_unit
 
     def createBody(self):
         if self.comments is None or self.comments == "":
@@ -241,9 +239,9 @@ class wordpress:
                     <td>%.2f</td>
                 </tr>
             </table>
-            ''' %(  self.sport, self.date, self.distance_unit, self.distance, self.time, self.speed_unit, self.maxspeed,
-                    self.speed_unit, self.average, self.pace_unit, self.maxpace,self.pace_unit, self.pace,
-                    self.maxbeats, self.beats, self.height_unit, self.upositive, self.height_unit, self.unegative)
+            ''' %(  self.sport, self.date, self.uc.unit_distance, self.distance, self.time, self.uc.unit_speed, self.maxspeed,
+                    self.uc.unit_speed, self.average, self.uc.unit_pace, self.maxpace, self.uc.unit_pace, self.pace,
+                    self.maxbeats, self.beats, self.uc.unit_height, self.upositive, self.uc.unit_height, self.unegative)
         return description_table
 
     def createFigureHR(self):
diff --git a/glade/calendar.glade b/glade/calendar.glade
deleted file mode 100644
index f103107..0000000
--- a/glade/calendar.glade
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
-  <!-- interface-requires gtk+ 2.16 -->
-  <!-- interface-naming-policy toplevel-contextual -->
-<widget class="GtkWindow" id="calendardialog">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Calendar</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="icon">logo_mini.png</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <signal name="destroy" handler="gtk_main_quit" last_modification_time="Mon, 03 Apr 2006 18:04:31 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox6">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkCalendar" id="calendar">
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="display_options">GTK_CALENDAR_SHOW_HEADING|GTK_CALENDAR_SHOW_DAY_NAMES</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHSeparator" id="hseparator1">
-	  <property name="visible">True</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox6">
-	  <property name="border_width">3</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">5</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label29">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button9">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="on_cancel_clicked" last_modification_time="Mon, 03 Apr 2006 18:10:09 GMT"/>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button8">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <signal name="clicked" handler="on_accept_clicked" last_modification_time="Mon, 03 Apr 2006 18:09:48 GMT"/>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-</glade-interface>
diff --git a/glade/equipment.glade b/glade/equipment.ui
similarity index 50%
rename from glade/equipment.glade
rename to glade/equipment.ui
index b07a99c..8969ba6 100644
--- a/glade/equipment.glade
+++ b/glade/equipment.ui
@@ -3,99 +3,94 @@
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy project-wide -->
   <object class="GtkNotebook" id="notebookEquipment">
-    <property name="visible">True</property>
-    <property name="can_focus">True</property>
-    <property name="show_tabs">False</property>
-    <property name="show_border">False</property>
+    <property name="visible">1</property>
+    <property name="can-focus">1</property>
+    <property name="show-tabs">0</property>
+    <property name="show-border">0</property>
     <child>
       <object class="GtkFrame" id="frameEquipmentList">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="visible">1</property>
+        <property name="border-width">5</property>
+        <property name="shadow-type">none</property>
         <child>
           <object class="GtkAlignment" id="alignmentEquipmentList">
-            <property name="visible">True</property>
-            <property name="left_padding">12</property>
+            <property name="visible">1</property>
+            <property name="left-padding">12</property>
             <child>
               <object class="GtkVBox" id="vboxEquipmentList">
-                <property name="visible">True</property>
-                <property name="border_width">5</property>
+                <property name="visible">1</property>
+                <property name="border-width">5</property>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindowEquipmentList">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="shadow_type">in</property>
+                    <property name="visible">1</property>
+                    <property name="can-focus">1</property>
+                    <property name="shadow-type">in</property>
                     <child>
                       <object class="GtkTreeView" id="treeviewEquipmentList">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
+                        <property name="visible">1</property>
+                        <property name="can-focus">1</property>
                         <signal name="cursor_changed" handler="equipment_cursor_changed"/>
                         <signal name="row_activated" handler="equipment_row_activated"/>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkHBox" id="hboxEquipmentListButtons">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <child>
                       <object class="GtkButton" id="buttonEquipmentAdd">
                         <property name="label">gtk-add</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="visible">1</property>
+                        <property name="can-focus">1</property>
+                        <property name="receives-default">1</property>
+                        <property name="use-stock">1</property>
                         <signal name="clicked" handler="add_equipment_clicked"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="pack_type">end</property>
-                        <property name="position">0</property>
+                        <property name="expand">0</property>
+                        <property name="fill">0</property>
+                        <property name="pack-type">end</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="buttonEquipmentEdit">
                         <property name="label">gtk-edit</property>
-                        <property name="sensitive">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="sensitive">0</property>
+                        <property name="visible">1</property>
+                        <property name="can-focus">1</property>
+                        <property name="receives-default">1</property>
+                        <property name="use-stock">1</property>
                         <signal name="clicked" handler="edit_equipment_clicked"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="pack_type">end</property>
+                        <property name="expand">0</property>
+                        <property name="fill">0</property>
+                        <property name="pack-type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="buttonEquipmentDelete">
                         <property name="label">gtk-delete</property>
-                        <property name="sensitive">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="sensitive">0</property>
+                        <property name="visible">1</property>
+                        <property name="can-focus">1</property>
+                        <property name="receives-default">1</property>
+                        <property name="use-stock">1</property>
                         <signal name="clicked" handler="delete_equipment_clicked"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="pack_type">end</property>
+                        <property name="expand">0</property>
+                        <property name="fill">0</property>
+                        <property name="pack-type">end</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="expand">0</property>
+                    <property name="fill">0</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -105,105 +100,103 @@
         </child>
         <child type="label">
           <object class="GtkLabel" id="labelEquipmentList">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="label" translatable="yes"><b>Equipment List</b></property>
-            <property name="use_markup">True</property>
+            <property name="use-markup">1</property>
           </object>
         </child>
       </object>
       <packing>
-        <property name="tab_expand">True</property>
+        <property name="tab-expand">1</property>
       </packing>
     </child>
     <child type="tab">
-      <placeholder/>
     </child>
     <child>
       <object class="GtkFrame" id="frameEquipmentAdd">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="visible">1</property>
+        <property name="border-width">5</property>
+        <property name="shadow-type">none</property>
         <child>
           <object class="GtkAlignment" id="alignmentEquipmentAdd">
-            <property name="visible">True</property>
-            <property name="left_padding">12</property>
+            <property name="visible">1</property>
+            <property name="left-padding">12</property>
             <child>
               <object class="GtkVBox" id="vboxEquipmentAdd">
-                <property name="visible">True</property>
-                <property name="border_width">5</property>
+                <property name="visible">1</property>
+                <property name="border-width">5</property>
                 <child>
                   <object class="GtkHBox" id="hboxEquipmentAddDetails">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <child>
                       <object class="GtkTable" id="tableEquipmentAddDetails">
-                        <property name="visible">True</property>
-                        <property name="n_rows">5</property>
-                        <property name="n_columns">2</property>
-                        <property name="row_spacing">5</property>
+                        <property name="visible">1</property>
+                        <property name="n-rows">5</property>
+                        <property name="n-columns">2</property>
+                        <property name="row-spacing">5</property>
                         <child>
                           <object class="GtkLabel" id="labelEquipmentAddDescription">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">1</property>
                             <property name="xpad">5</property>
                             <property name="label" translatable="yes">Description</property>
                           </object>
                           <packing>
-                            <property name="y_options"></property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entryEquipmentAddDescription">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                            <property name="width_chars">35</property>
+                            <property name="visible">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="invisible-char">●</property>
+                            <property name="width-chars">35</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="x_options"></property>
-                            <property name="y_options"></property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="x-options"></property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="labelEquipmentAddLifeExpectancy">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">1</property>
                             <property name="xpad">5</property>
                             <property name="label" translatable="yes">Life Expectancy</property>
                           </object>
                           <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="top-attach">1</property>
+                            <property name="bottom-attach">2</property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment3">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">0</property>
                             <property name="xscale">0</property>
                             <child>
                               <object class="GtkEntry" id="entryEquipmentAddLifeExpectancy">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">&#x25CF;</property>
-                                <property name="width_chars">8</property>
+                                <property name="visible">1</property>
+                                <property name="can-focus">1</property>
+                                <property name="invisible-char">●</property>
+                                <property name="width-chars">8</property>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">1</property>
+                            <property name="bottom-attach">2</property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="labelEquipmentAddPriorUsage">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">1</property>
                             <property name="yalign">0</property>
                             <property name="xpad">5</property>
@@ -211,65 +204,61 @@
                             <property name="label" translatable="yes">Prior Usage</property>
                           </object>
                           <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="y_options"></property>
+                            <property name="top-attach">2</property>
+                            <property name="bottom-attach">3</property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment2">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">0</property>
                             <property name="xscale">0</property>
                             <child>
                               <object class="GtkEntry" id="entryEquipmentAddPriorUsage">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">•</property>
-                                <property name="width_chars">8</property>
+                                <property name="visible">1</property>
+                                <property name="can-focus">1</property>
+                                <property name="invisible-char">•</property>
+                                <property name="width-chars">8</property>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="y_options"></property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">2</property>
+                            <property name="bottom-attach">3</property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="checkbuttonEquipmentAddActive">
                             <property name="label" translatable="yes">Active</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="visible">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="draw-indicator">1</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="y_options"></property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">3</property>
+                            <property name="bottom-attach">4</property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment6">
-                            <property name="visible">True</property>
-                            <child>
-                              <placeholder/>
-                            </child>
+                            <property name="visible">1</property>
                           </object>
                           <packing>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="y_options"></property>
+                            <property name="top-attach">3</property>
+                            <property name="bottom-attach">4</property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="labelEquipmentAddNotes">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">1</property>
                             <property name="yalign">0</property>
                             <property name="xpad">5</property>
@@ -277,82 +266,76 @@
                             <property name="label" translatable="yes">Notes</property>
                           </object>
                           <packing>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="top-attach">4</property>
+                            <property name="bottom-attach">5</property>
+                            <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="shadow_type">in</property>
+                            <property name="visible">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="shadow-type">in</property>
                             <child>
                               <object class="GtkTextView" id="textviewEquipmentAddNotes">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="visible">1</property>
+                                <property name="can-focus">1</property>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">4</property>
+                            <property name="bottom-attach">5</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
+                        <property name="expand">0</property>
+                        <property name="fill">0</property>
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkHBox" id="hboxEquipmentAddButtons">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <child>
                       <object class="GtkButton" id="buttonEquipmentAddCancel">
                         <property name="label">gtk-cancel</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="visible">1</property>
+                        <property name="can-focus">1</property>
+                        <property name="receives-default">1</property>
+                        <property name="use-stock">1</property>
                         <signal name="clicked" handler="cancel_add_equipment_clicked"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="pack_type">end</property>
+                        <property name="expand">0</property>
+                        <property name="fill">0</property>
+                        <property name="pack-type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="buttonEquipmentAddConfirm">
                         <property name="label">gtk-add</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="visible">1</property>
+                        <property name="can-focus">1</property>
+                        <property name="receives-default">1</property>
+                        <property name="use-stock">1</property>
                         <signal name="clicked" handler="confirm_add_equipment_clicked"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="pack_type">end</property>
-                        <property name="position">0</property>
+                        <property name="expand">0</property>
+                        <property name="fill">0</property>
+                        <property name="pack-type">end</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="expand">0</property>
+                    <property name="fill">0</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -362,9 +345,9 @@
         </child>
         <child type="label">
           <object class="GtkLabel" id="labelEquipmentAdd">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="label" translatable="yes"><b>Add New Equipment</b></property>
-            <property name="use_markup">True</property>
+            <property name="use-markup">1</property>
           </object>
         </child>
       </object>
@@ -373,159 +356,153 @@
       </packing>
     </child>
     <child type="tab">
-      <placeholder/>
     </child>
     <child>
       <object class="GtkFrame" id="frameEquipmentEdit">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="visible">1</property>
+        <property name="border-width">5</property>
+        <property name="shadow-type">none</property>
         <child>
           <object class="GtkAlignment" id="alignmentEquipmentEdit">
-            <property name="visible">True</property>
-            <property name="left_padding">12</property>
+            <property name="visible">1</property>
+            <property name="left-padding">12</property>
             <child>
               <object class="GtkVBox" id="vboxEquipmentEdit">
-                <property name="visible">True</property>
-                <property name="border_width">5</property>
+                <property name="visible">1</property>
+                <property name="border-width">5</property>
                 <child>
                   <object class="GtkHBox" id="hboxEquipmentEditDetails">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <child>
                       <object class="GtkTable" id="tableEquipmentEditDetails">
-                        <property name="visible">True</property>
-                        <property name="n_rows">5</property>
-                        <property name="n_columns">2</property>
-                        <property name="row_spacing">5</property>
+                        <property name="visible">1</property>
+                        <property name="n-rows">5</property>
+                        <property name="n-columns">2</property>
+                        <property name="row-spacing">5</property>
                         <child>
                           <object class="GtkLabel" id="labelEquipmentEditDescription">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">1</property>
                             <property name="xpad">5</property>
                             <property name="label" translatable="yes">Description</property>
                           </object>
                           <packing>
-                            <property name="y_options"></property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="entryEquipmentEditDescription">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                            <property name="width_chars">35</property>
+                            <property name="visible">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="invisible-char">●</property>
+                            <property name="width-chars">35</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="x_options"></property>
-                            <property name="y_options"></property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="x-options"></property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="labelEquipmentEditLifeExpectancy">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">1</property>
                             <property name="xpad">5</property>
                             <property name="label" translatable="yes">Life Expectancy</property>
                           </object>
                           <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="top-attach">1</property>
+                            <property name="bottom-attach">2</property>
+                            <property name="x-options">GTK_FILL</property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment1">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">0</property>
                             <property name="xscale">0</property>
                             <child>
                               <object class="GtkEntry" id="entryEquipmentEditLifeExpectancy">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">&#x25CF;</property>
-                                <property name="width_chars">8</property>
+                                <property name="visible">1</property>
+                                <property name="can-focus">1</property>
+                                <property name="invisible-char">●</property>
+                                <property name="width-chars">8</property>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">1</property>
+                            <property name="bottom-attach">2</property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="labelEquipmentEditPriorUsage">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">1</property>
                             <property name="xpad">5</property>
                             <property name="label" translatable="yes">Prior Usage</property>
                           </object>
                           <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="top-attach">2</property>
+                            <property name="bottom-attach">3</property>
+                            <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment4">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">0</property>
                             <property name="xscale">0</property>
                             <child>
                               <object class="GtkEntry" id="entryEquipmentEditPriorUsage">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="invisible_char">•</property>
-                                <property name="width_chars">8</property>
+                                <property name="visible">1</property>
+                                <property name="can-focus">1</property>
+                                <property name="invisible-char">•</property>
+                                <property name="width-chars">8</property>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="y_options"></property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">2</property>
+                            <property name="bottom-attach">3</property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="checkbuttonEquipmentEditActive">
                             <property name="label" translatable="yes">Active</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="visible">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="draw-indicator">1</property>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="y_options"></property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">3</property>
+                            <property name="bottom-attach">4</property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkAlignment" id="alignment8">
-                            <property name="visible">True</property>
-                            <child>
-                              <placeholder/>
-                            </child>
+                            <property name="visible">1</property>
                           </object>
                           <packing>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
-                            <property name="y_options"></property>
+                            <property name="top-attach">3</property>
+                            <property name="bottom-attach">4</property>
+                            <property name="y-options"></property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="labelEquipmentEditNotes">
-                            <property name="visible">True</property>
+                            <property name="visible">1</property>
                             <property name="xalign">1</property>
                             <property name="yalign">0</property>
                             <property name="xpad">5</property>
@@ -533,82 +510,76 @@
                             <property name="label" translatable="yes">Notes</property>
                           </object>
                           <packing>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
-                            <property name="y_options">GTK_FILL</property>
+                            <property name="top-attach">4</property>
+                            <property name="bottom-attach">5</property>
+                            <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="hscrollbar_policy">automatic</property>
-                            <property name="shadow_type">in</property>
+                            <property name="visible">1</property>
+                            <property name="can-focus">1</property>
+                            <property name="shadow-type">in</property>
                             <child>
                               <object class="GtkTextView" id="textviewEquipmentEditNotes">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
+                                <property name="visible">1</property>
+                                <property name="can-focus">1</property>
                               </object>
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">4</property>
-                            <property name="bottom_attach">5</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">4</property>
+                            <property name="bottom-attach">5</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
+                        <property name="expand">0</property>
+                        <property name="fill">0</property>
                       </packing>
                     </child>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkHBox" id="hboxEquipmentEditButtons">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <child>
                       <object class="GtkButton" id="buttonEquipmentEditCancel">
                         <property name="label">gtk-cancel</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="visible">1</property>
+                        <property name="can-focus">1</property>
+                        <property name="receives-default">1</property>
+                        <property name="use-stock">1</property>
                         <signal name="clicked" handler="cancel_edit_equipment_clicked"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="pack_type">end</property>
+                        <property name="expand">0</property>
+                        <property name="fill">0</property>
+                        <property name="pack-type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="buttonEquipmentEditConfirm">
                         <property name="label">gtk-save</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="visible">1</property>
+                        <property name="can-focus">1</property>
+                        <property name="receives-default">1</property>
+                        <property name="use-stock">1</property>
                         <signal name="clicked" handler="confirm_edit_equipment_clicked"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="pack_type">end</property>
-                        <property name="position">0</property>
+                        <property name="expand">0</property>
+                        <property name="fill">0</property>
+                        <property name="pack-type">end</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="expand">0</property>
+                    <property name="fill">0</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -618,9 +589,9 @@
         </child>
         <child type="label">
           <object class="GtkLabel" id="labelEquipmentEdit">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="label" translatable="yes"><b>Edit Equipment</b></property>
-            <property name="use_markup">True</property>
+            <property name="use-markup">1</property>
           </object>
         </child>
       </object>
@@ -629,68 +600,60 @@
       </packing>
     </child>
     <child type="tab">
-      <placeholder/>
     </child>
     <child>
       <object class="GtkFrame" id="frameEquipmentDelete">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
+        <property name="visible">1</property>
+        <property name="border-width">5</property>
+        <property name="shadow-type">none</property>
         <child>
           <object class="GtkAlignment" id="alignmentEquipmentDelete">
-            <property name="visible">True</property>
-            <property name="left_padding">12</property>
+            <property name="visible">1</property>
+            <property name="left-padding">12</property>
             <child>
               <object class="GtkVBox" id="vboxEquipmentDelete">
-                <property name="visible">True</property>
-                <property name="border_width">5</property>
+                <property name="visible">1</property>
+                <property name="border-width">5</property>
                 <child>
                   <object class="GtkLabel" id="labelEquipmentDeleteConfirm">
-                    <property name="visible">True</property>
+                    <property name="visible">1</property>
                     <property name="label" translatable="yes">Really delete the equipment item?</property>
                   </object>
-                  <packing>
-                    <property name="position">0</property>
-                  </packing>
                 </child>
                 <child>
                   <object class="GtkHButtonBox" id="hbuttonboxEquipmentDeleteButtons">
-                    <property name="visible">True</property>
-                    <property name="layout_style">end</property>
+                    <property name="visible">1</property>
+                    <property name="layout-style">end</property>
                     <child>
                       <object class="GtkButton" id="buttonEquipmentDeleteCancel">
                         <property name="label">gtk-cancel</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="visible">1</property>
+                        <property name="can-focus">1</property>
+                        <property name="receives-default">1</property>
+                        <property name="use-stock">1</property>
                         <signal name="clicked" handler="cancel_delete_equipment_clicked"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
+                        <property name="fill">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="buttonEquipmentDeleteConfirm">
                         <property name="label">gtk-ok</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="visible">1</property>
+                        <property name="can-focus">1</property>
+                        <property name="receives-default">1</property>
+                        <property name="use-stock">1</property>
                         <signal name="clicked" handler="confirm_delete_equipment_clicked"/>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
+                        <property name="fill">0</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">0</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -700,9 +663,9 @@
         </child>
         <child type="label">
           <object class="GtkLabel" id="labelEquipmentDelete">
-            <property name="visible">True</property>
+            <property name="visible">1</property>
             <property name="label" translatable="yes"><b>Delete Equipment</b></property>
-            <property name="use_markup">True</property>
+            <property name="use-markup">1</property>
           </object>
         </child>
       </object>
@@ -711,7 +674,6 @@
       </packing>
     </child>
     <child type="tab">
-      <placeholder/>
     </child>
   </object>
 </interface>
diff --git a/glade/extensions.glade b/glade/extensions.ui
similarity index 78%
rename from glade/extensions.glade
rename to glade/extensions.ui
index 6bae708..fd2b2e3 100644
--- a/glade/extensions.glade
+++ b/glade/extensions.ui
@@ -1,46 +1,46 @@
 <?xml version="1.0"?>
-<glade-interface>
+<interface>
   <!-- interface-requires gtk+ 2.16 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkWindow" id="extensions">
+  <object class="GtkWindow" id="extensions">
     <property name="width_request">606</property>
     <property name="height_request">249</property>
     <property name="visible">True</property>
     <property name="title" translatable="yes">Extensions</property>
     <property name="icon">logo_mini.png</property>
-    <signal name="destroy" handler="gtk_main_quit"/>
+    <signal handler="gtk_main_quit" name="destroy"/>
     <child>
-      <widget class="GtkHBox" id="hbox32">
+      <object class="GtkHBox" id="hbox32">
         <property name="width_request">32</property>
         <property name="height_request">16</property>
         <property name="visible">True</property>
         <property name="border_width">9</property>
         <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow4">
+          <object class="GtkScrolledWindow" id="scrolledwindow4">
             <property name="width_request">230</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="shadow_type">in</property>
             <child>
-              <widget class="GtkTreeView" id="extensionsTree">
+              <object class="GtkTreeView" id="extensionsTree">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="rules_hint">True</property>
-                <signal name="button_release_event" handler="on_extensionsTree_clicked"/>
-              </widget>
+                <signal handler="on_extensionsTree_clicked" name="button_release_event"/>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkVBox" id="vbox20">
+          <object class="GtkVBox" id="vbox20">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
-              <widget class="GtkTable" id="table11">
+              <object class="GtkTable" id="table11">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="n_rows">4</property>
@@ -48,132 +48,132 @@
                 <property name="column_spacing">5</property>
                 <property name="row_spacing">5</property>
                 <child>
-                  <widget class="GtkLabel" id="label-2147483648">
+                  <object class="GtkLabel" id="label-2147483648">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes"><b>Extension Details</b></property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="right_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="nameEntry">
+                  <object class="GtkLabel" id="nameEntry">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">name-entry</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label166">
+                  <object class="GtkLabel" id="label166">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Name:</property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label168">
+                  <object class="GtkLabel" id="label168">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Status:</property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label167">
+                  <object class="GtkLabel" id="label167">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Description:</property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="statusEntry">
+                  <object class="GtkLabel" id="statusEntry">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">status-entry</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="descriptionEntry">
+                  <object class="GtkLabel" id="descriptionEntry">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">description-entry</property>
                     <property name="wrap">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox33">
+              <object class="GtkHBox" id="hbox33">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkLabel" id="label11111">
+                  <object class="GtkLabel" id="label11111">
                     <property name="visible">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="button30">
+                  <object class="GtkButton" id="button30">
                     <property name="label">gtk-help</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <signal name="clicked" handler="on_help_clicked"/>
-                  </widget>
+                    <signal handler="on_help_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -181,14 +181,14 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="button29">
+                  <object class="GtkButton" id="button29">
                     <property name="label">gtk-preferences</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <signal name="clicked" handler="on_preferences_clicked"/>
-                  </widget>
+                    <signal handler="on_preferences_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -196,32 +196,32 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="button28">
+                  <object class="GtkButton" id="button28">
                     <property name="label">gtk-ok</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <signal name="clicked" handler="on_accept_clicked"/>
-                  </widget>
+                    <signal handler="on_accept_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/glade/filechooserdialog.glade b/glade/filechooserdialog.glade
deleted file mode 100644
index 31444d4..0000000
--- a/glade/filechooserdialog.glade
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<glade-interface>
-  <widget class="GtkFileChooserDialog" id="filechooserdialog">
-    <property name="visible">True</property>
-    <property name="border_width">5</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="icon">logo_mini.png</property>
-    <property name="type_hint">dialog</property>
-    <property name="do_overwrite_confirmation">True</property>
-    <property name="local_only">False</property>
-    <signal name="destroy" handler="gtk_main_quit"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">24</property>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <widget class="GtkButton" id="button13">
-                <property name="label">gtk-cancel</property>
-                <property name="response_id">-6</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_cancel_clicked"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button14">
-                <property name="label">gtk-open</property>
-                <property name="response_id">-5</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_accept_clicked"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/glade/importdata.glade b/glade/importdata.ui
similarity index 69%
rename from glade/importdata.glade
rename to glade/importdata.ui
index c8e38e6..1019293 100644
--- a/glade/importdata.glade
+++ b/glade/importdata.ui
@@ -1,8 +1,181 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glade-interface>
+<?xml version="1.0"?>
+<interface>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Test 1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Test 2</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model10">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model11">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model12">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model13">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model14">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model15">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model16">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model17">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes"> </col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model2">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model3">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model4">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model5">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model6">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model7">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model8">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model9">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Exclude</col>
+      </row>
+    </data>
+  </object>
   <!-- interface-requires gtk+ 2.16 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkWindow" id="win_importdata">
+  <object class="GtkWindow" id="win_importdata">
     <property name="visible">True</property>
     <property name="title" translatable="yes">Import</property>
     <property name="window_position">mouse</property>
@@ -10,48 +183,50 @@
     <property name="default_height">400</property>
     <property name="destroy_with_parent">True</property>
     <property name="icon">logo_mini.png</property>
-    <signal name="destroy_event" handler="on_win_importdata_destroy_event"/>
-    <signal name="delete_event" handler="on_win_importdata_delete_event"/>
+    <signal handler="on_win_importdata_destroy_event" name="destroy_event"/>
+    <signal handler="on_win_importdata_delete_event" name="delete_event"/>
     <child>
-      <widget class="GtkNotebook" id="notebookMainTabs">
+      <object class="GtkNotebook" id="notebookMainTabs">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
-        <signal name="switch_page" handler="on_notebookMainTabs_switch_page"/>
+        <signal handler="on_notebookMainTabs_switch_page" name="switch_page"/>
         <child>
-          <widget class="GtkVBox" id="vboxImportFromDevice">
+          <object class="GtkVBox" id="vboxImportFromDevice">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkFrame" id="frameDeviceSelect">
+              <object class="GtkFrame" id="frameDeviceSelect">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment5">
+                  <object class="GtkAlignment" id="alignment5">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkComboBox" id="comboboxDevice">
+                      <object class="GtkComboBox" id="comboboxDevice">
                         <property name="visible">True</property>
                         <property name="active">0</property>
-                        <property name="items" translatable="yes">Test 1
-Test 2</property>
-                        <signal name="changed" handler="on_comboboxDevice_changed"/>
-                      </widget>
+                        <signal handler="on_comboboxDevice_changed" name="changed"/>
+                        <property name="model">model1</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="renderer1"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="labelSelectDevice">
+                <child type="label">
+                  <object class="GtkLabel" id="labelSelectDevice">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Select your GPS device</b></property>
                     <property name="use_markup">True</property>
                     <property name="single_line_mode">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -59,10 +234,10 @@ Test 2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkLabel" id="labelTemp">
+              <object class="GtkLabel" id="labelTemp">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Import from GPS Device is not yet implemented</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -70,51 +245,48 @@ Test 2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frameImportFromDevice">
+              <object class="GtkFrame" id="frameImportFromDevice">
                 <property name="label_xalign">0</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment1">
+                  <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vboxImportTools">
+                      <object class="GtkVBox" id="vboxImportTools">
                         <property name="visible">True</property>
                         <child>
                           <placeholder/>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="labelImportDeviceTools">
+                <child type="label">
+                  <object class="GtkLabel" id="labelImportDeviceTools">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Tools</b></property>
                     <property name="use_markup">True</property>
                     <property name="single_line_mode">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="pack_type">end</property>
                 <property name="position">2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hboxDeviceButtons">
+              <object class="GtkHBox" id="hboxDeviceButtons">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkButton" id="buttonDeviceToolRescan">
+                  <object class="GtkButton" id="buttonDeviceToolRescan">
                     <property name="label" translatable="yes">Rescan</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip" translatable="yes">Rescan system for available tools</property>
-                    <signal name="clicked" handler="on_buttonDeviceToolRescan_clicked"/>
-                  </widget>
+                    <property name="tooltip-text" translatable="yes">Rescan system for available tools</property>
+                    <signal handler="on_buttonDeviceToolRescan_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -124,14 +296,14 @@ Test 2</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="buttonDeviceClose">
+                  <object class="GtkButton" id="buttonDeviceClose">
                     <property name="label">gtk-close</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="use_stock">True</property>
-                    <signal name="clicked" handler="on_buttonDeviceClose_clicked"/>
-                  </widget>
+                    <signal handler="on_buttonDeviceClose_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -140,7 +312,7 @@ Test 2</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -149,80 +321,79 @@ Test 2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkStatusbar" id="statusbarDevice">
+              <object class="GtkStatusbar" id="statusbarDevice">
                 <property name="visible">True</property>
                 <property name="spacing">2</property>
                 <property name="has_resize_grip">False</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="pack_type">end</property>
                 <property name="position">0</property>
               </packing>
             </child>
-          </widget>
+          </object>
         </child>
-        <child>
-          <widget class="GtkLabel" id="labelImportFromDevice">
+        <child type="tab">
+          <object class="GtkLabel" id="labelImportFromDevice">
             <property name="visible">True</property>
             <property name="label" translatable="yes"><b>Import from GPS Device</b></property>
             <property name="use_markup">True</property>
             <property name="single_line_mode">True</property>
-          </widget>
+          </object>
           <packing>
             <property name="tab_expand">True</property>
             <property name="tab_fill">False</property>
-            <property name="type">tab</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkVBox" id="vboxImportFromFile">
+          <object class="GtkVBox" id="vboxImportFromFile">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkFrame" id="frameSelectFile">
+              <object class="GtkFrame" id="frameSelectFile">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment3">
+                  <object class="GtkAlignment" id="alignment3">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkVBox" id="vboxImportfromFileSelectFiles">
+                      <object class="GtkVBox" id="vboxImportfromFileSelectFiles">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkScrolledWindow" id="scrolledwindowImportFiles">
+                          <object class="GtkScrolledWindow" id="scrolledwindowImportFiles">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="hscrollbar_policy">automatic</property>
                             <property name="vscrollbar_policy">never</property>
                             <child>
-                              <widget class="GtkTreeView" id="treeviewImportFiles">
+                              <object class="GtkTreeView" id="treeviewImportFiles">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox2">
+                          <object class="GtkHBox" id="hbox2">
                             <property name="visible">True</property>
                             <child>
                               <placeholder/>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="buttonRemoveSelectedFiles">
+                              <object class="GtkButton" id="buttonRemoveSelectedFiles">
                                 <property name="label">gtk-remove</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip" translatable="yes">Remove selected files and the associated activities</property>
+                                <property name="tooltip-text" translatable="yes">Remove selected files and the associated activities</property>
                                 <property name="use_stock">True</property>
                                 <property name="yalign">0.4699999988079071</property>
-                                <signal name="clicked" handler="on_buttonRemoveSelectedFiles_clicked"/>
-                              </widget>
+                                <signal handler="on_buttonRemoveSelectedFiles_clicked" name="clicked"/>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="padding">5</property>
@@ -231,16 +402,16 @@ Test 2</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="buttonSelectFiles">
+                              <object class="GtkButton" id="buttonSelectFiles">
                                 <property name="label">gtk-add</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="tooltip" translatable="yes">Add files to import activities from</property>
+                                <property name="tooltip-text" translatable="yes">Add files to import activities from</property>
                                 <property name="use_stock">True</property>
                                 <property name="focus_on_click">False</property>
-                                <signal name="clicked" handler="on_buttonSelectFiles_clicked"/>
-                              </widget>
+                                <signal handler="on_buttonSelectFiles_clicked" name="clicked"/>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="padding">5</property>
@@ -248,28 +419,25 @@ Test 2</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="pack_type">end</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="labelSelectFileFrame">
+                <child type="label">
+                  <object class="GtkLabel" id="labelSelectFileFrame">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Add file(s) to import activities from</b></property>
                     <property name="use_markup">True</property>
                     <property name="single_line_mode">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -278,58 +446,55 @@ Test 2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frameFileType">
+              <object class="GtkFrame" id="frameFileType">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment2">
+                  <object class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindowImportEvents">
+                      <object class="GtkScrolledWindow" id="scrolledwindowImportEvents">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">automatic</property>
                         <property name="vscrollbar_policy">automatic</property>
                         <child>
-                          <widget class="GtkTreeView" id="treeviewImportEvents">
+                          <object class="GtkTreeView" id="treeviewImportEvents">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="labelEvents">
+                <child type="label">
+                  <object class="GtkLabel" id="labelEvents">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Select activities to import</b></property>
                     <property name="use_markup">True</property>
                     <property name="single_line_mode">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hboxImportButtons">
+              <object class="GtkHBox" id="hboxImportButtons">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkButton" id="buttonFileImport">
+                  <object class="GtkButton" id="buttonFileImport">
                     <property name="label" translatable="yes">Import</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip" translatable="yes">Import selected activities</property>
-                    <signal name="clicked" handler="on_buttonFileImport_clicked"/>
-                  </widget>
+                    <property name="tooltip-text" translatable="yes">Import selected activities</property>
+                    <signal handler="on_buttonFileImport_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -339,15 +504,15 @@ Test 2</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="buttonFileClose">
+                  <object class="GtkButton" id="buttonFileClose">
                     <property name="label">gtk-close</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip" translatable="yes">Close Import dialog</property>
+                    <property name="tooltip-text" translatable="yes">Close Import dialog</property>
                     <property name="use_stock">True</property>
-                    <signal name="clicked" handler="on_buttonFileClose_clicked"/>
-                  </widget>
+                    <signal handler="on_buttonFileClose_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -356,7 +521,7 @@ Test 2</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -364,47 +529,46 @@ Test 2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkStatusbar" id="statusbarImportFile">
+              <object class="GtkStatusbar" id="statusbarImportFile">
                 <property name="visible">True</property>
                 <property name="spacing">2</property>
                 <property name="has_resize_grip">False</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="pack_type">end</property>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
             <property name="tab_fill">False</property>
           </packing>
         </child>
-        <child>
-          <widget class="GtkLabel" id="labelImportFromFilePage">
+        <child type="tab">
+          <object class="GtkLabel" id="labelImportFromFilePage">
             <property name="visible">True</property>
             <property name="label" translatable="yes"><b>Import from File</b></property>
             <property name="use_markup">True</property>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
             <property name="tab_expand">True</property>
             <property name="tab_fill">False</property>
-            <property name="type">tab</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkVBox" id="vboxPluginsTab">
+          <object class="GtkVBox" id="vboxPluginsTab">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkVBox" id="vboxPlugins">
+              <object class="GtkVBox" id="vboxPlugins">
                 <property name="visible">True</property>
                 <child>
                   <placeholder/>
                 </child>
                 <child>
-                  <widget class="GtkHBox" id="hboxPluginsButtons">
+                  <object class="GtkHBox" id="hboxPluginsButtons">
                     <property name="visible">True</property>
                     <child>
                       <placeholder/>
@@ -413,14 +577,14 @@ Test 2</property>
                       <placeholder/>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="buttonPluginsClose">
+                      <object class="GtkButton" id="buttonPluginsClose">
                         <property name="label">gtk-close</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="clicked" handler="on_buttonPluginsClose_clicked"/>
-                      </widget>
+                        <signal handler="on_buttonPluginsClose_clicked" name="clicked"/>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -429,7 +593,7 @@ Test 2</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="pack_type">end</property>
@@ -437,64 +601,60 @@ Test 2</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkStatusbar" id="statusbarPlugins">
+                  <object class="GtkStatusbar" id="statusbarPlugins">
                     <property name="visible">True</property>
                     <property name="spacing">2</property>
                     <property name="has_resize_grip">False</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="pack_type">end</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">0</property>
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="position">3</property>
-          </packing>
+          </object>
         </child>
-        <child>
-          <widget class="GtkLabel" id="labelPluginsPage">
+        <child type="tab">
+          <object class="GtkLabel" id="labelPluginsPage">
             <property name="visible">True</property>
             <property name="label" translatable="yes"><b>Plugins</b></property>
             <property name="use_markup">True</property>
             <property name="single_line_mode">True</property>
-          </widget>
+          </object>
           <packing>
             <property name="position">3</property>
             <property name="tab_expand">True</property>
             <property name="tab_fill">False</property>
-            <property name="type">tab</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkVBox" id="vboxOptions">
+          <object class="GtkVBox" id="vboxOptions">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkFrame" id="frameDefaultTab">
+              <object class="GtkFrame" id="frameDefaultTab">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment4">
+                  <object class="GtkAlignment" id="alignment4">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkHBox" id="hboxDefaultTab">
+                      <object class="GtkHBox" id="hboxDefaultTab">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkRadioButton" id="radiobuttonTabGPSDevice">
+                          <object class="GtkRadioButton" id="radiobuttonTabGPSDevice">
                             <property name="label" translatable="yes">Import from GPS Device</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -503,17 +663,17 @@ Test 2</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox1">
+                          <object class="GtkHBox" id="hbox1">
                             <property name="visible">True</property>
                             <child>
-                              <widget class="GtkRadioButton" id="radiobuttonFile">
+                              <object class="GtkRadioButton" id="radiobuttonFile">
                                 <property name="label" translatable="yes">Import from File</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">radiobuttonTabGPSDevice</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -521,28 +681,28 @@ Test 2</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkCheckButton" id="checkbuttonAutoLaunch">
+                              <object class="GtkCheckButton" id="checkbuttonAutoLaunch">
                                 <property name="label" translatable="yes">Launch 'File Select' on start</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="tooltip" translatable="yes">Automatically start the file selection dialog</property>
+                                <property name="tooltip-text" translatable="yes">Automatically start the file selection dialog</property>
                                 <property name="xalign">0.47999998927116394</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="padding">10</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" id="radiobuttonPlugins">
+                          <object class="GtkRadioButton" id="radiobuttonPlugins">
                             <property name="label" translatable="yes">Plugins</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -551,7 +711,7 @@ Test 2</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">radiobuttonTabGPSDevice</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -562,22 +722,19 @@ Test 2</property>
                         <child>
                           <placeholder/>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="labelDefaultTab">
+                <child type="label">
+                  <object class="GtkLabel" id="labelDefaultTab">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Default to Tab</b></property>
                     <property name="use_markup">True</property>
                     <property name="single_line_mode">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="padding">5</property>
@@ -588,16 +745,16 @@ Test 2</property>
               <placeholder/>
             </child>
             <child>
-              <widget class="GtkHBox" id="hboxOptionButtons">
+              <object class="GtkHBox" id="hboxOptionButtons">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkButton" id="buttonOptionsReset">
+                  <object class="GtkButton" id="buttonOptionsReset">
                     <property name="label" translatable="yes">Reset</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <signal name="clicked" handler="on_buttonOptionsReset_clicked"/>
-                  </widget>
+                    <signal handler="on_buttonOptionsReset_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -607,13 +764,13 @@ Test 2</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="buttonOptionsSave">
+                  <object class="GtkButton" id="buttonOptionsSave">
                     <property name="label" translatable="yes">Save</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <signal name="clicked" handler="on_buttonOptionsSave_clicked"/>
-                  </widget>
+                    <signal handler="on_buttonOptionsSave_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -623,14 +780,14 @@ Test 2</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="buttonOptionsClose">
+                  <object class="GtkButton" id="buttonOptionsClose">
                     <property name="label">gtk-close</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
                     <property name="use_stock">True</property>
-                    <signal name="clicked" handler="on_buttonOptionsClose_clicked"/>
-                  </widget>
+                    <signal handler="on_buttonOptionsClose_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -639,7 +796,7 @@ Test 2</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="padding">5</property>
@@ -648,66 +805,59 @@ Test 2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkStatusbar" id="statusbarOptions">
+              <object class="GtkStatusbar" id="statusbarOptions">
                 <property name="visible">True</property>
                 <property name="spacing">2</property>
                 <property name="has_resize_grip">False</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="position">3</property>
-          </packing>
+          </object>
         </child>
-        <child>
-          <widget class="GtkLabel" id="labelOptionsPage">
+        <child type="tab">
+          <object class="GtkLabel" id="labelOptionsPage">
             <property name="visible">True</property>
             <property name="label" translatable="yes"><b>Options</b></property>
             <property name="use_markup">True</property>
             <property name="single_line_mode">True</property>
-          </widget>
+          </object>
           <packing>
             <property name="position">3</property>
             <property name="tab_fill">False</property>
-            <property name="type">tab</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkVBox" id="vboxCSVImport">
+          <object class="GtkVBox" id="vboxCSVImport">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkFrame" id="frameSelectFile1">
+              <object class="GtkFrame" id="frameSelectFile1">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment6">
+                  <object class="GtkAlignment" id="alignment6">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkFileChooserButton" id="filechooserCSVImport">
+                      <object class="GtkFileChooserButton" id="filechooserCSVImport">
                         <property name="visible">True</property>
-                        <signal name="file_set" handler="on_filechooserCSVImport_file_set"/>
-                      </widget>
+                        <signal handler="on_filechooserCSVImport_file_set" name="file_set"/>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="labelSelectFileFrame1">
+                <child type="label">
+                  <object class="GtkLabel" id="labelSelectFileFrame1">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Select file to import from</b></property>
                     <property name="use_markup">True</property>
                     <property name="single_line_mode">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -716,25 +866,25 @@ Test 2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frameSelectFile2">
+              <object class="GtkFrame" id="frameSelectFile2">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment7">
+                  <object class="GtkAlignment" id="alignment7">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkHBox" id="hbox3">
+                      <object class="GtkHBox" id="hbox3">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkRadioButton" id="rbCSVTab">
+                          <object class="GtkRadioButton" id="rbCSVTab">
                             <property name="label" translatable="yes">Tab</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="padding">5</property>
@@ -742,7 +892,7 @@ Test 2</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" id="rbCSVComma">
+                          <object class="GtkRadioButton" id="rbCSVComma">
                             <property name="label" translatable="yes">Comma</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -751,7 +901,7 @@ Test 2</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">rbCSVTab</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="padding">5</property>
@@ -759,7 +909,7 @@ Test 2</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkRadioButton" id="rbCSVOther">
+                          <object class="GtkRadioButton" id="rbCSVOther">
                             <property name="label" translatable="yes">Other</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -767,65 +917,62 @@ Test 2</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
                             <property name="group">rbCSVTab</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="entryCSVOther">
+                          <object class="GtkEntry" id="entryCSVOther">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="max_length">5</property>
-                            <property name="invisible_char">•</property>
+                            <property name="invisible_char">&#x2022;</property>
                             <property name="width_chars">5</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="labelSpace">
+                          <object class="GtkLabel" id="labelSpace">
                             <property name="visible">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="position">4</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkButton" id="buttonCSVProcess">
+                          <object class="GtkButton" id="buttonCSVProcess">
                             <property name="label" translatable="yes">Read File</property>
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="yalign">0.34000000357627869</property>
-                            <signal name="clicked" handler="on_buttonCSVProcess_clicked"/>
-                          </widget>
+                            <signal handler="on_buttonCSVProcess_clicked" name="clicked"/>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="position">5</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="labelCSVFileOptions">
+                <child type="label">
+                  <object class="GtkLabel" id="labelCSVFileOptions">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>File delimiter</b></property>
                     <property name="use_markup">True</property>
                     <property name="single_line_mode">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -834,35 +981,35 @@ Test 2</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame1">
+              <object class="GtkFrame" id="frame1">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment8">
+                  <object class="GtkAlignment" id="alignment8">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                      <object class="GtkScrolledWindow" id="scrolledwindow1">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
                         <property name="vscrollbar_policy">automatic</property>
                         <child>
-                          <widget class="GtkViewport" id="viewport1">
+                          <object class="GtkViewport" id="viewport1">
                             <property name="visible">True</property>
                             <property name="resize_mode">queue</property>
                             <property name="shadow_type">none</property>
                             <child>
-                              <widget class="GtkTable" id="table1">
+                              <object class="GtkTable" id="table1">
                                 <property name="visible">True</property>
                                 <property name="n_rows">16</property>
                                 <property name="n_columns">3</property>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVDate">
+                                  <object class="GtkLabel" id="labelCSVDate">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Date</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
@@ -871,26 +1018,32 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVDate">
+                                  <object class="GtkComboBox" id="cbCSVDate">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model2</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer2"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVDistance">
+                                  <object class="GtkLabel" id="labelCSVDistance">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Distance (km)</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
@@ -899,11 +1052,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVDuration">
+                                  <object class="GtkLabel" id="labelCSVDuration">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Duration (sec)</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
@@ -912,52 +1065,64 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVDistance">
+                                  <object class="GtkComboBox" id="cbCSVDistance">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model3</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer3"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVDuration">
+                                  <object class="GtkComboBox" id="cbCSVDuration">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model4</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer4"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVDataField">
+                                  <object class="GtkLabel" id="labelCSVDataField">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes"><b>PyTrainer Field</b></property>
                                     <property name="use_markup">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="x_options">GTK_FILL</property>
                                     <property name="y_options">GTK_FILL</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVFileCol">
+                                  <object class="GtkLabel" id="labelCSVFileCol">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes"><b>File Column</b></property>
                                     <property name="use_markup">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
@@ -966,11 +1131,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVTitle">
+                                  <object class="GtkLabel" id="labelCSVTitle">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Title</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">4</property>
                                     <property name="bottom_attach">5</property>
@@ -979,11 +1144,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVDescent">
+                                  <object class="GtkLabel" id="labelCSVDescent">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Descent (m)</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">10</property>
                                     <property name="bottom_attach">11</property>
@@ -992,11 +1157,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVAccent">
+                                  <object class="GtkLabel" id="labelCSVAccent">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Accent (m)</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">9</property>
                                     <property name="bottom_attach">10</property>
@@ -1005,11 +1170,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVCalories">
+                                  <object class="GtkLabel" id="labelCSVCalories">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Calories (kcal)</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">8</property>
                                     <property name="bottom_attach">9</property>
@@ -1018,11 +1183,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVMaxSpeed">
+                                  <object class="GtkLabel" id="labelCSVMaxSpeed">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Max Speed (km/h)</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">7</property>
                                     <property name="bottom_attach">8</property>
@@ -1031,11 +1196,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVAvgSpeed">
+                                  <object class="GtkLabel" id="labelCSVAvgSpeed">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Average Speed (km/h)</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">6</property>
                                     <property name="bottom_attach">7</property>
@@ -1044,11 +1209,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVSport">
+                                  <object class="GtkLabel" id="labelCSVSport">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Sport</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">5</property>
                                     <property name="bottom_attach">6</property>
@@ -1057,11 +1222,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVHR">
+                                  <object class="GtkLabel" id="labelCSVHR">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Average Heartrate (bpm)</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">11</property>
                                     <property name="bottom_attach">12</property>
@@ -1070,11 +1235,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVMaxHR">
+                                  <object class="GtkLabel" id="labelCSVMaxHR">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Max Heartrate (bpm)</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">12</property>
                                     <property name="bottom_attach">13</property>
@@ -1083,11 +1248,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVPace">
+                                  <object class="GtkLabel" id="labelCSVPace">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Pace (min/km)</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">13</property>
                                     <property name="bottom_attach">14</property>
@@ -1096,11 +1261,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVMaxPace">
+                                  <object class="GtkLabel" id="labelCSVMaxPace">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Max Pace (min/km)</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">14</property>
                                     <property name="bottom_attach">15</property>
@@ -1109,11 +1274,11 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="labelCSVComments">
+                                  <object class="GtkLabel" id="labelCSVComments">
                                     <property name="visible">True</property>
                                     <property name="xalign">1</property>
                                     <property name="label" translatable="yes">Comments</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">15</property>
                                     <property name="bottom_attach">16</property>
@@ -1122,212 +1287,290 @@ Test 2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVTitle">
+                                  <object class="GtkComboBox" id="cbCSVTitle">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model5</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer5"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">4</property>
                                     <property name="bottom_attach">5</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVSport">
+                                  <object class="GtkComboBox" id="cbCSVSport">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model6</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer6"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">5</property>
                                     <property name="bottom_attach">6</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVAvgSpeed">
+                                  <object class="GtkComboBox" id="cbCSVAvgSpeed">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model7</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer7"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">6</property>
                                     <property name="bottom_attach">7</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVMaxSpeed">
+                                  <object class="GtkComboBox" id="cbCSVMaxSpeed">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model8</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer8"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">7</property>
                                     <property name="bottom_attach">8</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVCal">
+                                  <object class="GtkComboBox" id="cbCSVCal">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model9</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer9"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">8</property>
                                     <property name="bottom_attach">9</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVAccent">
+                                  <object class="GtkComboBox" id="cbCSVAccent">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model10</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer10"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">9</property>
                                     <property name="bottom_attach">10</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVDescent">
+                                  <object class="GtkComboBox" id="cbCSVDescent">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model11</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer11"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">10</property>
                                     <property name="bottom_attach">11</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVHR">
+                                  <object class="GtkComboBox" id="cbCSVHR">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model12</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer12"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">11</property>
                                     <property name="bottom_attach">12</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVMaxHR">
+                                  <object class="GtkComboBox" id="cbCSVMaxHR">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model13</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer13"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">12</property>
                                     <property name="bottom_attach">13</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVPace">
+                                  <object class="GtkComboBox" id="cbCSVPace">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model14</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer14"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">13</property>
                                     <property name="bottom_attach">14</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVMaxPace">
+                                  <object class="GtkComboBox" id="cbCSVMaxPace">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model15</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer15"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">14</property>
                                     <property name="bottom_attach">15</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkComboBox" id="cbCSVComments">
+                                  <object class="GtkComboBox" id="cbCSVComments">
                                     <property name="visible">True</property>
                                     <property name="active">0</property>
-                                    <property name="items" translatable="yes">Exclude</property>
-                                  </widget>
+                                    <property name="model">model16</property>
+                                    <child>
+                                      <object class="GtkCellRendererText" id="renderer16"/>
+                                      <attributes>
+                                        <attribute name="text">0</attribute>
+                                      </attributes>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">15</property>
                                     <property name="bottom_attach">16</property>
-                                    <property name="x_options"></property>
-                                    <property name="y_options"></property>
+                                    <property name="x_options"/>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkHBox" id="hbox5">
+                                  <object class="GtkHBox" id="hbox5">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkCheckButton" id="checkbCSVForceSport">
+                                      <object class="GtkCheckButton" id="checkbCSVForceSport">
                                         <property name="label" translatable="yes">Force sport to:</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">False</property>
                                         <property name="draw_indicator">True</property>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkComboBox" id="comboCSVForceSport">
+                                      <object class="GtkComboBox" id="comboCSVForceSport">
                                         <property name="visible">True</property>
-                                        <property name="items" translatable="yes"> </property>
-                                      </widget>
+                                        <property name="model">model17</property>
+                                        <child>
+                                          <object class="GtkCellRendererText" id="renderer17"/>
+                                          <attributes>
+                                            <attribute name="text">0</attribute>
+                                          </attributes>
+                                        </child>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
@@ -1380,35 +1623,32 @@ Test 2</property>
                                 <child>
                                   <placeholder/>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="labelCSVColumns">
+                <child type="label">
+                  <object class="GtkLabel" id="labelCSVColumns">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Map Columns</b></property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="padding">5</property>
                 <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox4">
+              <object class="GtkHBox" id="hbox4">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkLabel" id="label1">
+                  <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes"><small>This is an experiemental import for delimited files
@@ -1417,20 +1657,20 @@ Test 2</property>
 3) Map columns in the file to pytrainer data elements (Date is required)
 4) Click 'Import Data'</small></property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="buttonCSVImport">
+                  <object class="GtkButton" id="buttonCSVImport">
                     <property name="label" translatable="yes">Import Data</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <signal name="clicked" handler="on_buttonCSVImport_clicked"/>
-                  </widget>
+                    <signal handler="on_buttonCSVImport_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -1438,43 +1678,39 @@ Test 2</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">4</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkStatusbar" id="statusbarCSVImport">
+              <object class="GtkStatusbar" id="statusbarCSVImport">
                 <property name="visible">True</property>
                 <property name="spacing">2</property>
                 <property name="has_resize_grip">False</property>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="pack_type">end</property>
                 <property name="position">0</property>
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="position">3</property>
-          </packing>
+          </object>
         </child>
-        <child>
-          <widget class="GtkLabel" id="labelCSVImportPage">
+        <child type="tab">
+          <object class="GtkLabel" id="labelCSVImportPage">
             <property name="visible">True</property>
             <property name="label" translatable="yes"><b>Import from CSV</b></property>
             <property name="use_markup">True</property>
             <property name="single_line_mode">True</property>
-          </widget>
+          </object>
           <packing>
             <property name="position">4</property>
             <property name="tab_fill">False</property>
-            <property name="type">tab</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/glade/newrecord.glade b/glade/newrecord.ui
similarity index 75%
rename from glade/newrecord.glade
rename to glade/newrecord.ui
index c97bbda..21dae03 100644
--- a/glade/newrecord.glade
+++ b/glade/newrecord.ui
@@ -1,52 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glade-interface>
+<?xml version="1.0"?>
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">23</property>
+    <property name="lower">0</property>
+    <property name="page_increment">2</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">59</property>
+    <property name="lower">0</property>
+    <property name="page_increment">2</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">59</property>
+    <property name="lower">0</property>
+    <property name="page_increment">2</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkListStore" id="rcd_sport_list">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkWindow" id="newrecord">
+  <object class="GtkWindow" id="newrecord">
     <property name="visible">True</property>
     <property name="title" translatable="yes">New Entry</property>
     <property name="icon">logo_mini.png</property>
-    <signal name="destroy" handler="quit"/>
+    <signal handler="quit" name="destroy"/>
     <child>
-      <widget class="GtkVBox" id="vbox2">
+      <object class="GtkVBox" id="vbox2">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindowEntries">
+          <object class="GtkScrolledWindow" id="scrolledwindowEntries">
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">automatic</property>
             <property name="vscrollbar_policy">never</property>
             <child>
-              <widget class="GtkTreeView" id="treeviewEntries">
+              <object class="GtkTreeView" id="treeviewEntries">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <signal name="button_press_event" handler="on_treeviewEntries_row_activated"/>
-              </widget>
+                <signal handler="on_treeviewEntries_row_activated" name="button_press_event"/>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">2</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkNotebook" id="notebook2">
+          <object class="GtkNotebook" id="notebook2">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="border_width">9</property>
             <child>
-              <widget class="GtkVBox" id="vbox27">
+              <object class="GtkVBox" id="vbox27">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkFrame" id="frame19">
+                  <object class="GtkFrame" id="frame19">
                     <property name="visible">True</property>
                     <property name="border_width">4</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment22">
+                      <object class="GtkAlignment" id="alignment22">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table28">
+                          <object class="GtkTable" id="table28">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <property name="n_rows">3</property>
@@ -54,114 +83,115 @@
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkLabel" id="label156">
+                              <object class="GtkLabel" id="label156">
                                 <property name="width_request">120</property>
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Title:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_title">
+                              <object class="GtkEntry" id="rcd_title">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
-                                <signal name="changed" handler="on_rcd_title_changed"/>
-                              </widget>
+                                <property name="invisible_char">&#x25CF;</property>
+                                <signal handler="on_rcd_title_changed" name="changed"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">4</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label161">
+                              <object class="GtkLabel" id="label161">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">GPX File:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_gpxfile">
+                              <object class="GtkEntry" id="rcd_gpxfile">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="editable">False</property>
-                                <property name="invisible_char">●</property>
-                              </widget>
+                                <property name="invisible_char">&#x25CF;</property>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button25">
+                              <object class="GtkButton" id="button25">
                                 <property name="label">gtk-open</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_stock">True</property>
-                                <signal name="clicked" handler="on_selectfile_clicked"/>
-                              </widget>
+                                <signal handler="on_selectfile_clicked" name="clicked"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button24">
+                              <object class="GtkButton" id="button24">
                                 <property name="label" translatable="yes">Calculate Values</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_calculatevalues_clicked"/>
-                              </widget>
+                                <signal handler="on_calculatevalues_clicked" name="clicked"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label7">
+                              <object class="GtkLabel" id="label7">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Sport:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkComboBoxEntry" id="rcd_sport">
+                              <object class="GtkComboBoxEntry" id="rcd_sport">
                                 <property name="width_request">134</property>
                                 <property name="visible">True</property>
-                                <property name="items" translatable="yes"></property>
-                                <signal name="changed" handler="on_rcd_sport_changed"/>
-                              </widget>
+				<property name="model">rcd_sport_list</property>
+				<property name="text-column">0</property>
+                                <signal handler="on_rcd_sport_changed" name="changed"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">3</property>
@@ -174,21 +204,18 @@
                             <child>
                               <placeholder/>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label-2147483646">
+                    <child type="label">
+                      <object class="GtkLabel" id="label-2147483646">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>Main</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -196,17 +223,17 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frameGeneral">
+                  <object class="GtkFrame" id="frameGeneral">
                     <property name="visible">True</property>
                     <property name="border_width">4</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment28">
+                      <object class="GtkAlignment" id="alignment28">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table31">
+                          <object class="GtkTable" id="table31">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <property name="n_rows">3</property>
@@ -214,70 +241,70 @@
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkLabel" id="label_rcd_distance">
+                              <object class="GtkLabel" id="label_rcd_distance">
                                 <property name="width_request">120</property>
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Distance (Km):</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button10">
+                              <object class="GtkButton" id="button10">
                                 <property name="label" translatable="yes">Calculate</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_calcdistance_clicked"/>
-                              </widget>
+                                <signal handler="on_calcdistance_clicked" name="clicked"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label9">
+                              <object class="GtkLabel" id="label9">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Duration:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox7">
+                              <object class="GtkHBox" id="hbox7">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkSpinButton" id="rcd_hour">
+                                  <object class="GtkSpinButton" id="rcd_hour">
                                     <property name="width_request">47</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="adjustment">0 0 23 1 2 0</property>
+                                    <property name="adjustment">adjustment1</property>
                                     <property name="climb_rate">1</property>
                                     <property name="numeric">True</property>
                                     <property name="wrap">True</property>
-                                    <signal name="value_changed" handler="on_rcd_duration_value_changed"/>
-                                  </widget>
+                                    <signal handler="on_rcd_duration_value_changed" name="value_changed"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label35">
+                                  <object class="GtkLabel" id="label35">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -285,26 +312,26 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkSpinButton" id="rcd_min">
+                                  <object class="GtkSpinButton" id="rcd_min">
                                     <property name="width_request">47</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="adjustment">0 0 59 1 2 0</property>
+                                    <property name="adjustment">adjustment2</property>
                                     <property name="climb_rate">1</property>
                                     <property name="numeric">True</property>
                                     <property name="wrap">True</property>
-                                    <signal name="value_changed" handler="on_rcd_duration_value_changed"/>
-                                  </widget>
+                                    <signal handler="on_rcd_duration_value_changed" name="value_changed"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label36">
+                                  <object class="GtkLabel" id="label36">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -312,21 +339,21 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkSpinButton" id="rcd_second">
+                                  <object class="GtkSpinButton" id="rcd_second">
                                     <property name="width_request">42</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="adjustment">0 0 59 1 2 0</property>
+                                    <property name="adjustment">adjustment3</property>
                                     <property name="climb_rate">1</property>
                                     <property name="wrap">True</property>
-                                    <signal name="value_changed" handler="on_rcd_duration_value_changed"/>
-                                  </widget>
+                                    <signal handler="on_rcd_duration_value_changed" name="value_changed"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="position">4</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -337,72 +364,72 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_distance">
+                              <object class="GtkEntry" id="rcd_distance">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="width_chars">7</property>
-                                <signal name="changed" handler="on_rcd_distance_changed"/>
-                              </widget>
+                                <signal handler="on_rcd_distance_changed" name="changed"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button11">
+                              <object class="GtkButton" id="button11">
                                 <property name="label" translatable="yes">Calculate</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_calctime_clicked"/>
-                              </widget>
+                                <signal handler="on_calctime_clicked" name="clicked"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label6">
+                              <object class="GtkLabel" id="label6">
                                 <property name="width_request">60</property>
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Date:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox5">
+                              <object class="GtkHBox" id="hbox5">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkEntry" id="rcd_date">
+                                  <object class="GtkEntry" id="rcd_date">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="editable">False</property>
                                     <property name="width_chars">10</property>
-                                    <signal name="changed" handler="on_rcd_date_changed"/>
-                                  </widget>
+                                    <signal handler="on_rcd_date_changed" name="changed"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label28">
+                                  <object class="GtkLabel" id="label28">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes"> </property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -410,25 +437,25 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button7">
+                                  <object class="GtkButton" id="button7">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <signal name="clicked" handler="on_calendar_clicked"/>
+                                    <signal handler="on_calendar_clicked" name="clicked"/>
                                     <child>
-                                      <widget class="GtkImage" id="image2">
+                                      <object class="GtkImage" id="image2">
                                         <property name="visible">True</property>
                                         <property name="stock">gtk-index</property>
-                                      </widget>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -439,35 +466,35 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="lblTime">
+                              <object class="GtkLabel" id="lblTime">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Start Time:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_starttime">
+                              <object class="GtkEntry" id="rcd_starttime">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="width_chars">10</property>
                                 <property name="text" translatable="yes">12:00:00</property>
-                                <signal name="changed" handler="on_rcd_starttime_changed"/>
-                              </widget>
+                                <signal handler="on_rcd_starttime_changed" name="changed"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -476,21 +503,18 @@
                             <child>
                               <placeholder/>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label-2147483648">
+                    <child type="label">
+                      <object class="GtkLabel" id="label-2147483648">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>General</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -498,229 +522,222 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frameVelocity">
+                  <object class="GtkFrame" id="frameVelocity">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment27">
+                      <object class="GtkAlignment" id="alignment27">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table30">
+                          <object class="GtkTable" id="table30">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <property name="n_columns">5</property>
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkLabel" id="label_rcd_maxvel">
+                              <object class="GtkLabel" id="label_rcd_maxvel">
                                 <property name="width_request">120</property>
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Max (km/h):</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_maxvel">
+                              <object class="GtkEntry" id="rcd_maxvel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="width_chars">7</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label_rcd_average">
+                              <object class="GtkLabel" id="label_rcd_average">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Average (km/h)</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button12">
+                              <object class="GtkButton" id="button12">
                                 <property name="label" translatable="yes">Calculate</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_calcavs_clicked"/>
-                              </widget>
+                                <signal handler="on_calcavs_clicked" name="clicked"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">4</property>
                                 <property name="right_attach">5</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_average">
+                              <object class="GtkEntry" id="rcd_average">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="width_chars">7</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label162">
+                    <child type="label">
+                      <object class="GtkLabel" id="label162">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>Speed</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label4">
+            <child type="tab">
+              <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Quick Entry</property>
-              </widget>
+              </object>
               <packing>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox26">
+              <object class="GtkVBox" id="vbox26">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkFrame" id="framePace">
+                  <object class="GtkFrame" id="framePace">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment23">
+                      <object class="GtkAlignment" id="alignment23">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table23">
+                          <object class="GtkTable" id="table23">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <property name="n_columns">5</property>
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkLabel" id="label_rcd_maxpace">
+                              <object class="GtkLabel" id="label_rcd_maxpace">
                                 <property name="width_request">110</property>
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Max (min/km):</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_maxpace">
+                              <object class="GtkEntry" id="rcd_maxpace">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="width_chars">7</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label_rcd_pace">
+                              <object class="GtkLabel" id="label_rcd_pace">
                                 <property name="width_request">110</property>
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Pace (min/km):</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_pace">
+                              <object class="GtkEntry" id="rcd_pace">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="width_chars">7</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button43">
+                              <object class="GtkButton" id="button43">
                                 <property name="label" translatable="yes">Calculate</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_calcavs_clicked"/>
-                              </widget>
+                                <signal handler="on_calcavs_clicked" name="clicked"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">4</property>
                                 <property name="right_attach">5</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label1">
+                    <child type="label">
+                      <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>Pace</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -728,94 +745,91 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frameElevation">
+                  <object class="GtkFrame" id="frameElevation">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment24">
+                      <object class="GtkAlignment" id="alignment24">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table24">
+                          <object class="GtkTable" id="table24">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <property name="n_columns">5</property>
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkLabel" id="label_rcd_upositive">
+                              <object class="GtkLabel" id="label_rcd_upositive">
                                 <property name="width_request">110</property>
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Ascent:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_upositive">
+                              <object class="GtkEntry" id="rcd_upositive">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="width_chars">7</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label_rcd_unegative">
+                              <object class="GtkLabel" id="label_rcd_unegative">
                                 <property name="width_request">110</property>
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Descent:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_unegative">
+                              <object class="GtkEntry" id="rcd_unegative">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="width_chars">7</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
                               <placeholder/>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label163">
+                    <child type="label">
+                      <object class="GtkLabel" id="label163">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>Accumulated Altitude Change</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -823,17 +837,17 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frameBeats">
+                  <object class="GtkFrame" id="frameBeats">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment25">
+                      <object class="GtkAlignment" id="alignment25">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table25">
+                          <object class="GtkTable" id="table25">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <property name="n_rows">3</property>
@@ -841,125 +855,125 @@
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkLabel" id="label142">
+                              <object class="GtkLabel" id="label142">
                                 <property name="width_request">110</property>
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Max (bpm):</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label143">
+                              <object class="GtkLabel" id="label143">
                                 <property name="width_request">110</property>
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Heart rate:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">4</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_maxbeats">
+                              <object class="GtkEntry" id="rcd_maxbeats">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="width_chars">7</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_beats">
+                              <object class="GtkEntry" id="rcd_beats">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="width_chars">7</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">4</property>
                                 <property name="right_attach">5</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label2">
+                              <object class="GtkLabel" id="label2">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Calories</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="rcd_calories">
+                              <object class="GtkEntry" id="rcd_calories">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="width_chars">7</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label-1">
+                              <object class="GtkLabel" id="label-1">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes"><small><b>Note:</b> In order to calculate the calories you must set the sport MET (in Preferences->Sport) </small></property>
                                 <property name="use_markup">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="right_attach">6</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label-2">
+                              <object class="GtkLabel" id="label-2">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">5</property>
                                 <property name="right_attach">6</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox53">
+                              <object class="GtkHBox" id="hbox53">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkButton" id="button42">
+                                  <object class="GtkButton" id="button42">
                                     <property name="label" translatable="yes">Calculate</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_underline">True</property>
-                                    <signal name="clicked" handler="on_calccalories_clicked"/>
-                                  </widget>
+                                    <signal handler="on_calccalories_clicked" name="clicked"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -967,14 +981,14 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label-3">
+                                  <object class="GtkLabel" id="label-3">
                                     <property name="visible">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
@@ -993,61 +1007,54 @@
                             <child>
                               <placeholder/>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label164">
+                    <child type="label">
+                      <object class="GtkLabel" id="label164">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>Heart Rate</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label-4">
+            <child type="tab">
+              <object class="GtkLabel" id="label-4">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Advanced</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame23">
+              <object class="GtkFrame" id="frame23">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment26">
+                  <object class="GtkAlignment" id="alignment26">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkTable" id="table26">
+                      <object class="GtkTable" id="table26">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="column_spacing">5</property>
                         <property name="row_spacing">5</property>
                         <child>
-                          <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                          <object class="GtkScrolledWindow" id="scrolledwindow3">
                             <property name="height_request">130</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -1056,70 +1063,63 @@
                             <property name="vscrollbar_policy">never</property>
                             <property name="shadow_type">in</property>
                             <child>
-                              <widget class="GtkTextView" id="rcd_comments">
+                              <object class="GtkTextView" id="rcd_comments">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="wrap_mode">word</property>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label166">
+                <child type="label">
+                  <object class="GtkLabel" id="label166">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Comments</b></property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
-              <packing>
-                <property name="position">2</property>
-              </packing>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label-2147483647">
+            <child type="tab">
+              <object class="GtkLabel" id="label-2147483647">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Comments</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">2</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frameRecordEquipment">
+              <object class="GtkFrame" id="frameRecordEquipment">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <widget class="GtkVBox" id="vbox1">
+                  <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkAlignment" id="noActiveEquipmentMessageContainer">
+                      <object class="GtkAlignment" id="noActiveEquipmentMessageContainer">
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox1">
+                          <object class="GtkHBox" id="hbox1">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <child>
-                              <widget class="GtkImage" id="image1">
+                              <object class="GtkImage" id="image1">
                                 <property name="visible">True</property>
                                 <property name="xpad">5</property>
                                 <property name="ypad">5</property>
                                 <property name="stock">gtk-info</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -1127,19 +1127,19 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label10">
+                              <object class="GtkLabel" id="label10">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes"><i>There are no active equipment items.</i></property>
                                 <property name="use_markup">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -1147,15 +1147,15 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkAlignment" id="alignmentRecordEquipment">
+                      <object class="GtkAlignment" id="alignmentRecordEquipment">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table1">
+                          <object class="GtkTable" id="table1">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <child>
-                              <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                              <object class="GtkScrolledWindow" id="scrolledwindow1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="border_width">5</property>
@@ -1163,50 +1163,43 @@
                                 <property name="vscrollbar_policy">automatic</property>
                                 <property name="shadow_type">in</property>
                                 <child>
-                                  <widget class="GtkTreeView" id="treeviewRecordEquipment">
+                                  <object class="GtkTreeView" id="treeviewRecordEquipment">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="headers_visible">False</property>
-                                  </widget>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label3">
+                <child type="label">
+                  <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Associated Equipment</b></property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
-              <packing>
-                <property name="position">3</property>
-              </packing>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="record_equipment_label">
+            <child type="tab">
+              <object class="GtkLabel" id="record_equipment_label">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Equipment</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">3</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
@@ -1215,27 +1208,27 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkHBox" id="hbox2">
+          <object class="GtkHBox" id="hbox2">
             <property name="visible">True</property>
             <property name="border_width">3</property>
             <child>
-              <widget class="GtkLabel" id="label5">
+              <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button2">
+              <object class="GtkButton" id="button2">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_cancel_clicked"/>
-              </widget>
+                <signal handler="on_cancel_clicked" name="clicked"/>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -1244,21 +1237,21 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button1">
+              <object class="GtkButton" id="button1">
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_accept_clicked"/>
-              </widget>
+                <signal handler="on_accept_clicked" name="clicked"/>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
@@ -1266,7 +1259,7 @@
             <property name="position">0</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/glade/plugins.glade b/glade/plugins.ui
similarity index 80%
rename from glade/plugins.glade
rename to glade/plugins.ui
index 4dd3196..eb5ac48 100644
--- a/glade/plugins.glade
+++ b/glade/plugins.ui
@@ -1,45 +1,45 @@
 <?xml version="1.0"?>
-<glade-interface>
+<interface>
   <!-- interface-requires gtk+ 2.16 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkWindow" id="plugins">
+  <object class="GtkWindow" id="plugins">
     <property name="width_request">650</property>
     <property name="height_request">230</property>
     <property name="visible">True</property>
     <property name="title" translatable="yes">Plugins</property>
     <property name="icon">logo_mini.png</property>
     <child>
-      <widget class="GtkHBox" id="hbox34">
+      <object class="GtkHBox" id="hbox34">
         <property name="width_request">32</property>
         <property name="height_request">16</property>
         <property name="visible">True</property>
         <property name="border_width">9</property>
         <child>
-          <widget class="GtkScrolledWindow" id="scrolledwindow5">
+          <object class="GtkScrolledWindow" id="scrolledwindow5">
             <property name="width_request">230</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="shadow_type">in</property>
             <child>
-              <widget class="GtkTreeView" id="pluginsTreeview">
+              <object class="GtkTreeView" id="pluginsTreeview">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="rules_hint">True</property>
-                <signal name="button_release_event" handler="on_pluginsTree_clicked"/>
-              </widget>
+                <signal handler="on_pluginsTree_clicked" name="button_release_event"/>
+              </object>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkVBox" id="vbox21">
+          <object class="GtkVBox" id="vbox21">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
-              <widget class="GtkTable" id="table12">
+              <object class="GtkTable" id="table12">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="n_rows">4</property>
@@ -47,20 +47,20 @@
                 <property name="column_spacing">5</property>
                 <property name="row_spacing">5</property>
                 <child>
-                  <widget class="GtkLabel" id="label-2147483647">
+                  <object class="GtkLabel" id="label-2147483647">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes"><b>Plugin Details</b></property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="right_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="descriptionEntry">
+                  <object class="GtkLabel" id="descriptionEntry">
                     <property name="height_request">78</property>
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
@@ -68,24 +68,24 @@
                     <property name="label" translatable="yes">description-entry </property>
                     <property name="use_underline">True</property>
                     <property name="wrap">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label11113">
+                  <object class="GtkLabel" id="label11113">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
                     <property name="label" translatable="yes">Description:</property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
@@ -94,98 +94,98 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="statusEntry">
+                  <object class="GtkLabel" id="statusEntry">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">status-entry</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label11114">
+                  <object class="GtkLabel" id="label11114">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Status:</property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="nameEntry">
+                  <object class="GtkLabel" id="nameEntry">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">nameEntry</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label11112">
+                  <object class="GtkLabel" id="label11112">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Name:</property>
                     <property name="use_markup">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options"/>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHBox" id="hbox35">
+              <object class="GtkHBox" id="hbox35">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkLabel" id="label11118">
+                  <object class="GtkLabel" id="label11118">
                     <property name="visible">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label11119">
+                  <object class="GtkLabel" id="label11119">
                     <property name="visible">True</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="button32">
+                  <object class="GtkButton" id="button32">
                     <property name="label">gtk-preferences</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <signal name="clicked" handler="on_preferences_clicked"/>
-                  </widget>
+                    <signal handler="on_preferences_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -193,32 +193,32 @@
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkButton" id="button33">
+                  <object class="GtkButton" id="button33">
                     <property name="label">gtk-ok</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_stock">True</property>
-                    <signal name="clicked" handler="on_accept_clicked"/>
-                  </widget>
+                    <signal handler="on_accept_clicked" name="clicked"/>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="position">1</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/glade/profile.glade b/glade/profile.ui
similarity index 73%
rename from glade/profile.glade
rename to glade/profile.ui
index fbf1382..1c2aa2d 100644
--- a/glade/profile.glade
+++ b/glade/profile.ui
@@ -1,39 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glade-interface>
+<?xml version="1.0"?>
+<interface>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Error</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Warning</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Info</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Debug</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="ddbb-model">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="gender-model">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <!-- interface-requires gtk+ 2.10 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkWindow" id="newprofile">
+  <object class="GtkWindow" id="newprofile">
     <property name="visible">True</property>
     <property name="title" translatable="yes">Preferences</property>
     <property name="icon">logo_mini.png</property>
-    <signal name="destroy" handler="quit"/>
+    <signal handler="quit" name="destroy"/>
     <child>
-      <widget class="GtkVBox" id="vbox4">
+      <object class="GtkVBox" id="vbox4">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkNotebook" id="notebook3">
+          <object class="GtkNotebook" id="notebook3">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="border_width">9</property>
-            <signal name="switch_page" handler="on_switch_page"/>
+            <signal handler="on_switch_page" name="switch_page"/>
             <child>
-              <widget class="GtkVBox" id="vbox24">
+              <object class="GtkVBox" id="vbox24">
                 <property name="visible">True</property>
+                <!-- Start of unit system -->
                 <child>
-                  <widget class="GtkFrame" id="frame14">
+                  <object class="GtkFrame" id="frame14">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment14">
+                      <object class="GtkAlignment" id="alignment14">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox2">
+                          <object class="GtkHBox" id="hbox2">
                             <property name="visible">True</property>
                             <child>
-                              <widget class="GtkRadioButton" id="prf_metric_system">
+                              <object class="GtkRadioButton" id="prf_metric_system">
                                 <property name="label" translatable="yes">Metric system</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -41,7 +71,7 @@
                                 <property name="use_underline">True</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="padding">5</property>
@@ -49,7 +79,7 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkRadioButton" id="prf_us_system">
+                              <object class="GtkRadioButton" id="prf_us_system">
                                 <property name="label" translatable="yes">U.S. customary units</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -57,56 +87,120 @@
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">prf_metric_system</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="padding">5</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label20">
+                    <child type="label">
+                      <object class="GtkLabel" id="label20">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>System of Measurement</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
+                <!-- End of unit system -->
+                <!-- Start of start screen -->
                 <child>
-                  <widget class="GtkFrame" id="frameDefaultMapViewer">
+                  <object class="GtkFrame" id="frame_startscreen">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment2">
+                      <object class="GtkAlignment" id="alignment_startscreen">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox1">
+                          <object class="GtkHBox" id="hbox_startscreen">
                             <property name="visible">True</property>
                             <child>
-                              <widget class="GtkRadioButton" id="radiobuttonDefaultGMap">
+                              <object class="GtkRadioButton" id="radioButtonStartScreenCurrentDay">
+                                <property name="label" translatable="yes">Current day</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="radioButtonStartScreenLastEntry">
+                                <property name="label" translatable="yes">Last entry</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">radioButtonStartScreenCurrentDay</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="padding">5</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="label_startscreen">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes"><b>Start screen</b></property>
+                        <property name="use_markup">True</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <!-- End of start screen -->
+                <!-- Start of default map -->
+                <child>
+                  <object class="GtkFrame" id="frameDefaultMapViewer">
+                    <property name="visible">True</property>
+                    <property name="border_width">5</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment2">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkHBox" id="hbox1">
+                            <property name="visible">True</property>
+                            <child>
+                              <object class="GtkRadioButton" id="radiobuttonDefaultGMap">
                                 <property name="label" translatable="yes">Google</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="padding">5</property>
@@ -114,55 +208,51 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkRadioButton" id="radiobuttonDefaultOSM">
+                              <object class="GtkRadioButton" id="radiobuttonDefaultOSM">
                                 <property name="label" translatable="yes">Open Street Map</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">radiobuttonDefaultGMap</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="labelDefaultMapViewer">
+                    <child type="label">
+                      <object class="GtkLabel" id="labelDefaultMapViewer">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>Default Map Viewer</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
+                <!-- End of default map -->
+                <!-- Start of database info -->
                 <child>
-                  <widget class="GtkFrame" id="frame13">
+                  <object class="GtkFrame" id="frame13">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment13">
+                      <object class="GtkAlignment" id="alignment13">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table3">
+                          <object class="GtkTable" id="table3">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <property name="n_rows">3</property>
@@ -170,74 +260,75 @@
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkLabel" id="prf_ddbb_label">
+                              <object class="GtkLabel" id="prf_ddbb_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Database type:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="prf_ddbbhost_label">
+                              <object class="GtkLabel" id="prf_ddbbhost_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Database host:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="prf_ddbbhost">
+                              <object class="GtkEntry" id="prf_ddbbhost">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="prf_ddbbname_label">
+                              <object class="GtkLabel" id="prf_ddbbname_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Database name:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="prf_ddbbname">
+                              <object class="GtkEntry" id="prf_ddbbname">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkComboBoxEntry" id="prf_ddbb">
+                              <object class="GtkComboBoxEntry" id="prf_ddbb">
                                 <property name="visible">True</property>
-                                <property name="items"></property>
-                                <signal name="changed" handler="on_prf_ddbb_changed"/>
-                              </widget>
+                                <signal handler="on_prf_ddbb_changed" name="changed"/>
+				<property name="model">ddbb-model</property>
+				<property name="text-column">0</property>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
@@ -246,116 +337,103 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="prf_ddbbuser_label">
+                              <object class="GtkLabel" id="prf_ddbbuser_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Database user:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="prf_ddbbpass_label">
+                              <object class="GtkLabel" id="prf_ddbbpass_label">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Database pass:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="prf_ddbbuser">
+                              <object class="GtkEntry" id="prf_ddbbuser">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="prf_ddbbpass">
+                              <object class="GtkEntry" id="prf_ddbbpass">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="visibility">False</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label19">
+                    <child type="label">
+                      <object class="GtkLabel" id="label19">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>Database</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </widget>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label-2147483645">
+            <child type="tab">
+              <object class="GtkLabel" id="label-2147483645">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">General</property>
-              </widget>
+              </object>
               <packing>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkFrame" id="frame12">
+              <object class="GtkFrame" id="frame12">
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment12">
+                  <object class="GtkAlignment" id="alignment12">
                     <property name="visible">True</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <widget class="GtkTable" id="table2">
+                      <object class="GtkTable" id="table2">
                         <property name="visible">True</property>
                         <property name="border_width">5</property>
                         <property name="n_rows">3</property>
@@ -363,34 +441,35 @@
                         <property name="column_spacing">5</property>
                         <property name="row_spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label14">
+                          <object class="GtkLabel" id="label14">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">User name:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label15">
+                          <object class="GtkLabel" id="label15">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Gender:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkComboBoxEntry" id="prf_gender">
+                          <object class="GtkComboBoxEntry" id="prf_gender">
                             <property name="visible">True</property>
-                            <property name="items"></property>
-                          </widget>
+			    <property name="model">gender-model</property>
+			    <property name="text-column">0</property>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
@@ -401,70 +480,70 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label17">
+                          <object class="GtkLabel" id="label17">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Height:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="prf_height">
+                          <object class="GtkEntry" id="prf_height">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">3</property>
                             <property name="right_attach">4</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="prf_name">
+                          <object class="GtkEntry" id="prf_name">
                             <property name="width_request">160</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label18">
+                          <object class="GtkLabel" id="label18">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Date of birth:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkHBox" id="hbox50">
+                          <object class="GtkHBox" id="hbox50">
                             <property name="visible">True</property>
                             <child>
-                              <widget class="GtkEntry" id="prf_age">
+                              <object class="GtkEntry" id="prf_age">
                                 <property name="width_request">108</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">●</property>
-                              </widget>
+                                <property name="invisible_char">&#x25CF;</property>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -472,25 +551,25 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button46">
+                              <object class="GtkButton" id="button46">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <signal name="clicked" handler="on_calendar_clicked"/>
+                                <signal handler="on_calendar_clicked" name="clicked"/>
                                 <child>
-                                  <widget class="GtkImage" id="image31">
+                                  <object class="GtkImage" id="image31">
                                     <property name="visible">True</property>
                                     <property name="stock">gtk-index</property>
-                                  </widget>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">3</property>
                             <property name="right_attach">4</property>
@@ -501,29 +580,29 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkEntry" id="prf_weight">
+                          <object class="GtkEntry" id="prf_weight">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label16">
+                          <object class="GtkLabel" id="label16">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Weight:</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                           </packing>
                         </child>
                         <child>
@@ -532,94 +611,87 @@
                         <child>
                           <placeholder/>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label-2147483648">
+                <child type="label">
+                  <object class="GtkLabel" id="label-2147483648">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes"><b>Athlete Details</b></property>
                     <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="type">label_item</property>
-                  </packing>
+                  </object>
                 </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label13">
+            <child type="tab">
+              <object class="GtkLabel" id="label13">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Athlete</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">1</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkNotebook" id="notebook5">
+              <object class="GtkNotebook" id="notebook5">
                 <property name="visible">True</property>
                 <property name="show_tabs">False</property>
                 <property name="show_border">False</property>
                 <child>
-                  <widget class="GtkFrame" id="sportlist">
+                  <object class="GtkFrame" id="sportlist">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment16">
+                      <object class="GtkAlignment" id="alignment16">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="sportlist_">
+                          <object class="GtkVBox" id="sportlist_">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <child>
-                              <widget class="GtkScrolledWindow" id="sportScrollWindow">
+                              <object class="GtkScrolledWindow" id="sportScrollWindow">
                                 <property name="height_request">170</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="shadow_type">in</property>
                                 <child>
-                                  <widget class="GtkTreeView" id="sportTreeView">
+                                  <object class="GtkTreeView" id="sportTreeView">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <signal name="row_activated" handler="on_sporttreeview_row_activated"/>
-                                  </widget>
+                                    <signal handler="on_sporttreeview_row_activated" name="row_activated"/>
+                                  </object>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox4">
+                              <object class="GtkHBox" id="hbox4">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label26">
+                                  <object class="GtkLabel" id="label26">
                                     <property name="visible">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="fill">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button5">
+                                  <object class="GtkButton" id="button5">
                                     <property name="label">gtk-delete</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="on_delsport_clicked"/>
-                                  </widget>
+                                    <signal handler="on_delsport_clicked" name="clicked"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -627,14 +699,14 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button23">
+                                  <object class="GtkButton" id="button23">
                                     <property name="label">gtk-edit</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="on_editsport_clicked"/>
-                                  </widget>
+                                    <signal handler="on_editsport_clicked" name="clicked"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -642,163 +714,159 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button6">
+                                  <object class="GtkButton" id="button6">
                                     <property name="label">gtk-add</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="on_addsport_clicked"/>
-                                  </widget>
+                                    <signal handler="on_addsport_clicked" name="clicked"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">3</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label1">
+                    <child type="label">
+                      <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>Sport List</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label135">
+                <child type="tab">
+                  <object class="GtkLabel" id="label135">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">llist</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="tab_fill">False</property>
-                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="addsport">
+                  <object class="GtkFrame" id="addsport">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment18">
+                      <object class="GtkAlignment" id="alignment18">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="addsport_">
+                          <object class="GtkVBox" id="addsport_">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <child>
-                              <widget class="GtkTable" id="table18">
+                              <object class="GtkTable" id="table18">
                                 <property name="visible">True</property>
                                 <property name="n_rows">5</property>
                                 <property name="n_columns">3</property>
                                 <property name="column_spacing">5</property>
                                 <property name="row_spacing">5</property>
                                 <child>
-                                  <widget class="GtkEntry" id="newsportentry">
+                                  <object class="GtkEntry" id="newsportentry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">●</property>
-                                  </widget>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label154">
+                                  <object class="GtkLabel" id="label154">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Name:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label155">
+                                  <object class="GtkLabel" id="label155">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">M.E.T.:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="newmetentry">
+                                  <object class="GtkEntry" id="newmetentry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">●</property>
-                                  </widget>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label-1">
+                                  <object class="GtkLabel" id="label-1">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Extra Weight:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="newweightentry">
+                                  <object class="GtkEntry" id="newweightentry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">●</property>
-                                  </widget>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label156">
+                                  <object class="GtkLabel" id="label156">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">2</property>
                                     <property name="right_attach">3</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLinkButton" id="metlinkbutton">
+                                  <object class="GtkLinkButton" id="metlinkbutton">
                                     <property name="label" translatable="yes">More information on determining yor M.E.T sport coefficient on Wikipedia</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -806,76 +874,76 @@
                                     <property name="has_tooltip">True</property>
                                     <property name="relief">none</property>
                                     <property name="uri">http://en.wikipedia.org/wiki/Metabolic_equivalent</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="right_attach">3</property>
                                     <property name="top_attach">5</property>
                                     <property name="bottom_attach">6</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label-10">
+                                  <object class="GtkLabel" id="label-maximum-pace">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Maximum Pace:</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="newmaxpace">
+                                  <object class="GtkEntry" id="newmaxpace">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">●</property>
-                                  </widget>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
-		                        <child>
-		                          <widget class="GtkHBox" id="hboxcolor">
-		                            <property name="visible">True</property>
-		                            <child>
-		                              <widget class="GtkImage" id="newcolor">
-		                                <property name="visible">True</property>
-		                                <property name="can_focus">True</property>
-		                                <property name="receives_default">False</property>
-		                              </widget>
-		                              <packing>
-		                              </packing>
-		                            </child>
-		                            <child>
-		                              <widget class="GtkButton" id="buttoncolor">
-		                                <property name="label">gtk-edit</property>
-		                                <property name="visible">True</property>
-		                                <property name="can_focus">True</property>
-		                                <property name="receives_default">False</property>
-		                                <property name="use_stock">True</property>
-		                                <signal name="clicked" handler="on_editcolor_clicked"/>
-		                              </widget>
-		                              <packing>
-		                                <property name="expand">False</property>
-		                                <property name="fill">False</property>
-		                                <property name="position">1</property>
+                                <child>
+                                  <object class="GtkHBox" id="hbox-new-color">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <object class="GtkImage" id="newcolor">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                      </object>
+                                      <packing>
 		                              </packing>
-		                            </child>
-                                  </widget>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="button-color-new">
+                                        <property name="label">gtk-edit</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_stock">True</property>
+                                        <signal handler="on_editcolor_clicked" name="clicked"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">4</property>
                                     <property name="bottom_attach">5</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
@@ -887,32 +955,32 @@
                                 <child>
                                   <placeholder/>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox22">
+                              <object class="GtkHBox" id="hbox22">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label139">
+                                  <object class="GtkLabel" id="label139">
                                     <property name="visible">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="fill">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button17">
+                                  <object class="GtkButton" id="button17">
                                     <property name="label">gtk-cancel</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="on_sportcancel_clicked"/>
-                                  </widget>
+                                    <signal handler="on_sportcancel_clicked" name="clicked"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -920,83 +988,76 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button18">
+                                  <object class="GtkButton" id="button18">
                                     <property name="label">gtk-ok</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="on_newsport_accept_clicked"/>
-                                  </widget>
+                                    <signal handler="on_newsport_accept_clicked" name="clicked"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label-2">
+                    <child type="label">
+                      <object class="GtkLabel" id="label-2">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>Add New Sport</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label136">
+                <child type="tab">
+                  <object class="GtkLabel" id="label136">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">new</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                     <property name="tab_fill">False</property>
-                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="deletesport">
+                  <object class="GtkFrame" id="deletesport">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment19">
+                      <object class="GtkAlignment" id="alignment19">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="deletesport_">
+                          <object class="GtkVBox" id="deletesport_">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <child>
                               <placeholder/>
                             </child>
                             <child>
-                              <widget class="GtkVBox" id="vbox17">
+                              <object class="GtkVBox" id="vbox17">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label144">
+                                  <object class="GtkLabel" id="label144">
                                     <property name="visible">True</property>
                                     <property name="label" translatable="yes">Deleting a sport removes associated records.
 Continue?</property>
                                     <property name="wrap">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -1004,40 +1065,40 @@ Continue?</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label142">
+                                  <object class="GtkLabel" id="label142">
                                     <property name="visible">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="fill">False</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox23">
+                              <object class="GtkHBox" id="hbox23">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label143">
+                                  <object class="GtkLabel" id="label143">
                                     <property name="visible">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="fill">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button19">
+                                  <object class="GtkButton" id="button19">
                                     <property name="label">gtk-cancel</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="on_sportcancel_clicked"/>
-                                  </widget>
+                                    <signal handler="on_sportcancel_clicked" name="clicked"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -1045,39 +1106,39 @@ Continue?</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button20">
+                                  <object class="GtkButton" id="button20">
                                     <property name="label">gtk-ok</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="on_deletesport_clicked"/>
-                                  </widget>
+                                    <signal handler="on_deletesport_clicked" name="clicked"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkHBox" id="hbox52">
+                    <child type="label">
+                      <object class="GtkHBox" id="hbox52">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkLabel" id="label158">
+                          <object class="GtkLabel" id="label158">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes"><b>Delete Sport</b></property>
                             <property name="use_markup">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -1085,136 +1146,129 @@ Continue?</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="sportnamedel">
+                          <object class="GtkLabel" id="sportnamedel">
                             <property name="label">label-2147483648</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label137">
+                <child type="tab">
+                  <object class="GtkLabel" id="label137">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">delete</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">2</property>
                     <property name="tab_fill">False</property>
-                    <property name="type">tab</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="editsport">
+                  <object class="GtkFrame" id="editsport">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment21">
+                      <object class="GtkAlignment" id="alignment21">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkVBox" id="editsport_">
+                          <object class="GtkVBox" id="editsport_">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <child>
-                              <widget class="GtkTable" id="table17">
+                              <object class="GtkTable" id="table17">
                                 <property name="visible">True</property>
                                 <property name="n_rows">5</property>
                                 <property name="n_columns">2</property>
                                 <property name="column_spacing">5</property>
                                 <property name="row_spacing">5</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label153">
+                                  <object class="GtkLabel" id="label153">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Name</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="editsportentry">
+                                  <object class="GtkEntry" id="editsportentry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">●</property>
-                                  </widget>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label-3">
+                                  <object class="GtkLabel" id="label-3">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">M.E.T.</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="editmetentry">
+                                  <object class="GtkEntry" id="editmetentry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">●</property>
-                                  </widget>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">1</property>
                                     <property name="bottom_attach">2</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label-2147483647">
+                                  <object class="GtkLabel" id="label-2147483647">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Extra Weight</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="editweightentry">
+                                  <object class="GtkEntry" id="editweightentry">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">●</property>
-                                  </widget>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">2</property>
                                     <property name="bottom_attach">3</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLinkButton" id="linkbutton1">
+                                  <object class="GtkLinkButton" id="linkbutton1">
                                     <property name="label" translatable="yes">More information on determining yor M.E.T sport coefficient on Wikipedia</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -1222,117 +1276,117 @@ Continue?</property>
                                     <property name="has_tooltip">True</property>
                                     <property name="relief">none</property>
                                     <property name="uri">http://en.wikipedia.org/wiki/Metabolic_equivalent</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">5</property>
                                     <property name="bottom_attach">6</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label-9">
+                                  <object class="GtkLabel" id="label-9">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Maximum Pace</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkEntry" id="editmaxpace">
+                                  <object class="GtkEntry" id="editmaxpace">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="invisible_char">●</property>
-                                  </widget>
+                                    <property name="invisible_char">&#x25CF;</property>
+                                  </object>
                                   <packing>
                                     <property name="left_attach">1</property>
                                     <property name="right_attach">2</property>
                                     <property name="top_attach">3</property>
                                     <property name="bottom_attach">4</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkLabel" id="label-10">
+                                  <object class="GtkLabel" id="label-color">
                                     <property name="visible">True</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">Color</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="top_attach">4</property>
                                     <property name="bottom_attach">5</property>
                                     <property name="x_options">GTK_FILL</property>
-                                    <property name="y_options"></property>
+                                    <property name="y_options"/>
                                   </packing>
                                 </child>
-		                        <child>
-		                          <widget class="GtkHBox" id="hboxcolor">
-		                            <property name="visible">True</property>
-		                            <child>
-		                              <widget class="GtkImage" id="editcolor">
-		                                <property name="visible">True</property>
-		                                <property name="can_focus">True</property>
-		                                <property name="receives_default">False</property>
-		                              </widget>
-		                              <packing>
-		                              </packing>
-		                            </child>
-		                            <child>
-		                              <widget class="GtkButton" id="buttoncolor">
-		                                <property name="label">gtk-edit</property>
-		                                <property name="visible">True</property>
-		                                <property name="can_focus">True</property>
-		                                <property name="receives_default">False</property>
-		                                <property name="use_stock">True</property>
-		                                <signal name="clicked" handler="on_editcolor_clicked"/>
-		                              </widget>
-		                              <packing>
-		                                <property name="expand">False</property>
-		                                <property name="fill">False</property>
-		                                <property name="position">1</property>
+                                <child>
+                                  <object class="GtkHBox" id="hbox-edit-color">
+                                    <property name="visible">True</property>
+                                    <child>
+                                      <object class="GtkImage" id="editcolor">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                      </object>
+                                      <packing>
 		                              </packing>
-		                            </child>
-		                          </widget>
-		                          <packing>
-		                            <property name="left_attach">1</property>
-		                            <property name="right_attach">2</property>
-		                            <property name="top_attach">4</property>
-		                            <property name="bottom_attach">5</property>
-		                            <property name="y_options"></property>
-		                          </packing>
-		                        </child>
-                              </widget>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="button-color-edit">
+                                        <property name="label">gtk-edit</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_stock">True</property>
+                                        <signal handler="on_editcolor_clicked" name="clicked"/>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="right_attach">2</property>
+                                    <property name="top_attach">4</property>
+                                    <property name="bottom_attach">5</property>
+                                    <property name="y_options"/>
+                                  </packing>
+                                </child>
+                              </object>
                               <packing>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkHBox" id="hbox26">
+                              <object class="GtkHBox" id="hbox26">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkLabel" id="label152">
+                                  <object class="GtkLabel" id="label152">
                                     <property name="visible">True</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="fill">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button21">
+                                  <object class="GtkButton" id="button21">
                                     <property name="label">gtk-cancel</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="on_sportcancel_clicked"/>
-                                  </widget>
+                                    <signal handler="on_sportcancel_clicked" name="clicked"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -1340,41 +1394,41 @@ Continue?</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkButton" id="button22">
+                                  <object class="GtkButton" id="button22">
                                     <property name="label">gtk-ok</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="on_editsport_accept_clicked"/>
-                                  </widget>
+                                    <signal handler="on_editsport_accept_clicked" name="clicked"/>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkHBox" id="hbox51">
+                    <child type="label">
+                      <object class="GtkHBox" id="hbox51">
                         <property name="visible">True</property>
                         <property name="spacing">5</property>
                         <child>
-                          <widget class="GtkLabel" id="label-4">
+                          <object class="GtkLabel" id="label-4">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes"><b>Edit Sport</b></property>
                             <property name="use_markup">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
@@ -1382,90 +1436,57 @@ Continue?</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="sportnameedit">
+                          <object class="GtkLabel" id="sportnameedit">
                             <property name="label" translatable="yes"><b>lalaal</b></property>
                             <property name="use_markup">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
-                  <packing>
-                    <property name="position">3</property>
-                  </packing>
+                  </object>
                 </child>
-                <child>
-                  <widget class="GtkLabel" id="label147">
+                <child type="tab">
+                  <object class="GtkLabel" id="label147">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">edit</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">3</property>
                     <property name="tab_fill">False</property>
-                    <property name="type">tab</property>
                   </packing>
                 </child>
-              </widget>
-              <packing>
-                <property name="position">2</property>
-              </packing>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label24">
+            <child type="tab">
+              <object class="GtkLabel" id="label24">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Sports</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">2</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkAlignment" id="equipment_container">
+              <object class="GtkVBox" id="vbox25">
                 <property name="visible">True</property>
                 <child>
-                  <placeholder/>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="labelEquipment">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Equipment</property>
-              </widget>
-              <packing>
-                <property name="position">5</property>
-                <property name="tab_fill">False</property>
-                <property name="type">tab</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="vbox25">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkFrame" id="frame17">
+                  <object class="GtkFrame" id="frame17">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment17">
+                      <object class="GtkAlignment" id="alignment17">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table21">
+                          <object class="GtkTable" id="table21">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <property name="n_rows">3</property>
@@ -1473,101 +1494,101 @@ Continue?</property>
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkLabel" id="label-2147483641">
+                              <object class="GtkLabel" id="label-2147483641">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Maximum heart rate:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label-2147483640">
+                              <object class="GtkLabel" id="label-2147483640">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Resting heart rate:</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="prf_maxhr">
+                              <object class="GtkEntry" id="prf_maxhr">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="max_length">4</property>
-                                <property name="invisible_char">●</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="width_chars">4</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkEntry" id="prf_minhr">
+                              <object class="GtkEntry" id="prf_minhr">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="max_length">4</property>
-                                <property name="invisible_char">●</property>
+                                <property name="invisible_char">&#x25CF;</property>
                                 <property name="width_chars">4</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label-2147483639">
+                              <object class="GtkLabel" id="label-2147483639">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes"><small><b>Note:</b> Maximum heart rate is calculated by subtracting the number 220 minus your age. </small></property>
                                 <property name="use_markup">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="right_attach">4</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkButton" id="button47">
+                              <object class="GtkButton" id="button47">
                                 <property name="label" translatable="yes">Calculate</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <signal name="clicked" handler="on_calculatemaxhr_clicked"/>
-                              </widget>
+                                <signal handler="on_calculatemaxhr_clicked" name="clicked"/>
+                              </object>
                               <packing>
                                 <property name="left_attach">2</property>
                                 <property name="right_attach">3</property>
-                                <property name="x_options"></property>
-                                <property name="y_options"></property>
+                                <property name="x_options"/>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label-2147483638">
+                              <object class="GtkLabel" id="label-2147483638">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">3</property>
                                 <property name="right_attach">4</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -1576,21 +1597,18 @@ Continue?</property>
                             <child>
                               <placeholder/>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label-5">
+                    <child type="label">
+                      <object class="GtkLabel" id="label-5">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>General</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -1598,17 +1616,17 @@ Continue?</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkFrame" id="frame18">
+                  <object class="GtkFrame" id="frame18">
                     <property name="visible">True</property>
                     <property name="border_width">5</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment20">
+                      <object class="GtkAlignment" id="alignment20">
                         <property name="visible">True</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <widget class="GtkTable" id="table22">
+                          <object class="GtkTable" id="table22">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <property name="n_rows">4</property>
@@ -1616,38 +1634,38 @@ Continue?</property>
                             <property name="column_spacing">5</property>
                             <property name="row_spacing">5</property>
                             <child>
-                              <widget class="GtkLabel" id="label-6">
+                              <object class="GtkLabel" id="label-6">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes"><small><b>NOTE:</b> in order to use the Karvonen method you must cover the Resting hr field.</small></property>
                                 <property name="use_markup">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="right_attach">3</property>
                                 <property name="top_attach">2</property>
                                 <property name="bottom_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkRadioButton" id="radiobutton3">
+                              <object class="GtkRadioButton" id="radiobutton3">
                                 <property name="label" translatable="yes">Percentages based method</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkRadioButton" id="prf_hrzones_karvonen">
+                              <object class="GtkRadioButton" id="prf_hrzones_karvonen">
                                 <property name="label" translatable="yes">Karvonen method</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
@@ -1655,26 +1673,26 @@ Continue?</property>
                                 <property name="use_underline">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">radiobutton3</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="left_attach">1</property>
                                 <property name="right_attach">2</property>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label-7">
+                              <object class="GtkLabel" id="label-7">
                                 <property name="visible">True</property>
                                 <property name="xalign">0</property>
                                 <property name="label" translatable="yes">Select how to calculate your heart rate zones.</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="right_attach">3</property>
                                 <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
+                                <property name="y_options"/>
                               </packing>
                             </child>
                             <child>
@@ -1701,75 +1719,71 @@ Continue?</property>
                             <child>
                               <placeholder/>
                             </child>
-                          </widget>
+                          </object>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                    <child>
-                      <widget class="GtkLabel" id="label-8">
+                    <child type="label">
+                      <object class="GtkLabel" id="label-8">
                         <property name="visible">True</property>
                         <property name="label" translatable="yes"><b>Heart Rate Zones</b></property>
                         <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
-              </widget>
-              <packing>
-                <property name="position">3</property>
-              </packing>
+              </object>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label-2147483646">
+            <child type="tab">
+              <object class="GtkLabel" id="label-2147483646">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Heart Rate</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">3</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkVBox" id="vbox_startup_params">
+              <object class="GtkVBox" id="vbox_startup_params">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkAlignment" id="alignment1">
+                  <object class="GtkAlignment" id="alignment1">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <child>
-                      <widget class="GtkTable" id="table1">
+                      <object class="GtkTable" id="table1">
                         <property name="visible">True</property>
                         <property name="n_rows">6</property>
                         <property name="n_columns">3</property>
                         <child>
-                          <widget class="GtkLabel" id="labelLogLevel">
+                          <object class="GtkLabel" id="labelLogLevel">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="xpad">5</property>
                             <property name="ypad">5</property>
                             <property name="label" translatable="yes">Log Level</property>
                             <property name="use_markup">True</property>
-                          </widget>
+                          </object>
                         </child>
                         <child>
-                          <widget class="GtkComboBox" id="comboboxLogLevel">
+                          <object class="GtkComboBox" id="comboboxLogLevel">
                             <property name="visible">True</property>
                             <property name="active">0</property>
-                            <property name="items" translatable="yes">Error
-Warning
-Info
-Debug</property>
-                            <signal name="changed" handler="on_comboboxLogLevel_changed"/>
-                          </widget>
+                            <signal handler="on_comboboxLogLevel_changed" name="changed"/>
+                            <property name="model">model1</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="renderer1"/>
+                              <attributes>
+                                <attribute name="text">0</attribute>
+                              </attributes>
+                            </child>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
@@ -1778,57 +1792,57 @@ Debug</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="labelLogLevelDescription">
+                          <object class="GtkLabel" id="labelLogLevelDescription">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="xpad">5</property>
                             <property name="label" translatable="yes"><small>What level of detail is written to the log?</small></property>
                             <property name="use_markup">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="labelValidate">
+                          <object class="GtkLabel" id="labelValidate">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="xpad">5</property>
                             <property name="ypad">5</property>
                             <property name="label" translatable="yes">Validate</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="checkbuttonValidate">
+                          <object class="GtkCheckButton" id="checkbuttonValidate">
                             <property name="label">--valid</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="on_checkbuttonValidate_toggled"/>
-                          </widget>
+                            <signal handler="on_checkbuttonValidate_toggled" name="toggled"/>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
-                            <property name="y_options"></property>
+                            <property name="y_options"/>
                             <property name="x_padding">10</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="labelValidateDescription">
+                          <object class="GtkLabel" id="labelValidateDescription">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="xpad">5</property>
                             <property name="label" translatable="yes"><small>Do the plugins attempt to validate the input file before processing?</small></property>
                             <property name="use_markup">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
@@ -1837,27 +1851,27 @@ Debug</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="labelNewGraph">
+                          <object class="GtkLabel" id="labelNewGraph">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="xpad">5</property>
                             <property name="ypad">5</property>
                             <property name="label" translatable="yes">New Graph</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="top_attach">5</property>
                             <property name="bottom_attach">6</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkCheckButton" id="checkbuttonNewGraph">
+                          <object class="GtkCheckButton" id="checkbuttonNewGraph">
                             <property name="label">--newgraph</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="on_checkbuttonNewGraph_toggled"/>
-                          </widget>
+                            <signal handler="on_checkbuttonNewGraph_toggled" name="toggled"/>
+                          </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
@@ -1867,13 +1881,13 @@ Debug</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="labelNewGraphDescription">
+                          <object class="GtkLabel" id="labelNewGraphDescription">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="xpad">5</property>
                             <property name="label" translatable="yes"><small>Want to use experimental new approach to graphing?</small></property>
                             <property name="use_markup">True</property>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="right_attach">3</property>
@@ -1899,9 +1913,9 @@ Debug</property>
                         <child>
                           <placeholder/>
                         </child>
-                      </widget>
+                      </object>
                     </child>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
@@ -1910,7 +1924,7 @@ Debug</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="labelNotification">
+                  <object class="GtkLabel" id="labelNotification">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="xpad">5</property>
@@ -1918,7 +1932,7 @@ Debug</property>
                     <property name="use_markup">True</property>
                     <property name="wrap">True</property>
                     <property name="width_chars">75</property>
-                  </widget>
+                  </object>
                   <packing>
                     <property name="position">1</property>
                   </packing>
@@ -1926,50 +1940,67 @@ Debug</property>
                 <child>
                   <placeholder/>
                 </child>
-              </widget>
+              </object>
               <packing>
                 <property name="position">4</property>
                 <property name="tab_fill">False</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkLabel" id="label_startup_params">
+            <child type="tab">
+              <object class="GtkLabel" id="label_startup_params">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">Startup Parameters</property>
-              </widget>
+              </object>
               <packing>
                 <property name="position">4</property>
                 <property name="tab_fill">False</property>
-                <property name="type">tab</property>
               </packing>
             </child>
-          </widget>
+            <child>
+              <object class="GtkAlignment" id="equipment_container">
+                <property name="visible">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="labelEquipment">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Equipment</property>
+              </object>
+              <packing>
+                <property name="position">5</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+          </object>
           <packing>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkHBox" id="buttonbox">
+          <object class="GtkHBox" id="buttonbox">
             <property name="visible">True</property>
             <property name="border_width">3</property>
             <child>
-              <widget class="GtkLabel" id="label12">
+              <object class="GtkLabel" id="label12">
                 <property name="visible">True</property>
-              </widget>
+              </object>
               <packing>
                 <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button4">
+              <object class="GtkButton" id="button4">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_cancel_clicked"/>
-              </widget>
+                <signal handler="on_cancel_clicked" name="clicked"/>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -1978,27 +2009,27 @@ Debug</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button3">
+              <object class="GtkButton" id="button3">
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_accept_clicked"/>
-              </widget>
+                <signal handler="on_accept_clicked" name="clicked"/>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
-          </widget>
+          </object>
           <packing>
             <property name="expand">False</property>
             <property name="position">1</property>
           </packing>
         </child>
-      </widget>
+      </object>
     </child>
-  </widget>
-</glade-interface>
+  </object>
+</interface>
diff --git a/glade/pytrainer.glade b/glade/pytrainer.ui
similarity index 76%
rename from glade/pytrainer.glade
rename to glade/pytrainer.ui
index 44e6a08..f2f3aaa 100644
--- a/glade/pytrainer.glade
+++ b/glade/pytrainer.ui
@@ -1,205 +1,629 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glade-interface>
+<?xml version="1.0"?>
+<interface>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">1000</property>
+    <property name="lower">-500</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment10">
+    <property name="upper">1000</property>
+    <property name="lower">-500</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment11">
+    <property name="upper">20</property>
+    <property name="lower">0</property>
+    <property name="page_increment">0</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">5</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">1000</property>
+    <property name="lower">-500</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="upper">10</property>
+    <property name="lower">1</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment4">
+    <property name="upper">10</property>
+    <property name="lower">0</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment5">
+    <property name="upper">1000</property>
+    <property name="lower">-500</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment6">
+    <property name="upper">1000</property>
+    <property name="lower">-500</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment7">
+    <property name="upper">10</property>
+    <property name="lower">0</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment8">
+    <property name="upper">10</property>
+    <property name="lower">0</property>
+    <property name="page_increment">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment9">
+    <property name="upper">1000</property>
+    <property name="lower">-500</property>
+    <property name="page_increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_size">0</property>
+    <property name="value">0</property>
+  </object>
+  <object class="GtkListStore" id="model1">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="model10">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Distance</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Time</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Heart Rate</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Speed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Calories</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model11">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Distance</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Time</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Heart Rate</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Speed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Calories</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model12">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Distance</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Time</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Heart Rate</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Speed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Calories</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model13">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Distance</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Time</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Heart Rate</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Speed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Calories</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model14">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">All Distances</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model15">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">All Durations</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model16">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">All time</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Last 4 weeks</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Last 6 months</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Last 12 months</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model17">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">All Sports</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model18">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Font</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Restaurant</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Scenic Area</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Summit</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model2">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Profile</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Speed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Pace</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Heart Rate</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Cadence</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Percentage</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Zone</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model3">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Profile</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Speed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Pace</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Heart Rate</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Cadence</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model4">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Speed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Heart rate</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Cadence</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model5">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Stage Profile</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Stage Velocity</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Stage Profile/velocity</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model6">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Distance</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Time</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Heart Rate</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Speed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Calories</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model7">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Distance</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Time</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Heart Rate</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Speed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Calories</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model8">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Distance</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Time</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Heart Rate</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Speed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Calories</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="model9">
+    <columns>
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Distance</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Time</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Heart Rate</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Average Speed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Calories</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkUIManager" id="uimanager1">
+    <child>
+      <object class="GtkActionGroup" id="actiongroup1">
+        <child>
+          <object class="GtkAction" id="menuitem1">
+            <property name="name">menuitem1</property>
+            <property name="label" translatable="yes">_File</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="nuevo1">
+            <property name="stock_id">gtk-new</property>
+            <property name="name">nuevo1</property>
+            <signal handler="on_newrecord_clicked" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menu_importdata">
+            <property name="stock_id">gtk-undo</property>
+            <property name="name">menu_importdata</property>
+            <property name="label" translatable="yes">_Import</property>
+            <signal handler="on_menu_importdata_activate" name="activate"/>
+          </object>
+          <accelerator key="i" modifiers="GDK_CONTROL_MASK"/>
+        </child>
+        <child>
+          <object class="GtkAction" id="export_csv">
+            <property name="stock_id">gtk-redo</property>
+            <property name="name">export_csv</property>
+            <property name="label" translatable="yes">_Export as Text Separated by Commas</property>
+            <signal handler="on_export_csv_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="salir1">
+            <property name="stock_id">gtk-quit</property>
+            <property name="name">salir1</property>
+            <signal handler="quit" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuitem2">
+            <property name="name">menuitem2</property>
+            <property name="label" translatable="yes">_Edit</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="preferencias1">
+            <property name="stock_id">gtk-preferences</property>
+            <property name="name">preferencias1</property>
+            <signal handler="on_edituser_activate" name="activate"/>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="view1">
+            <property name="name">view1</property>
+            <property name="label" translatable="yes">_View</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRadioAction" id="classicview_item">
+            <property name="active">True</property>
+            <property name="name">classicview_item</property>
+            <property name="label" translatable="yes"> _Classic View</property>
+            <signal handler="on_classicview_activate" name="activate"/>
+          </object>
+          <accelerator key="c" modifiers="GDK_CONTROL_MASK"/>
+        </child>
+        <child>
+          <object class="GtkRadioAction" id="listview_item">
+            <property name="group">classicview_item</property>
+            <property name="name">listview_item</property>
+            <property name="label" translatable="yes"> _List View</property>
+            <signal handler="on_listview_activate" name="activate"/>
+          </object>
+          <accelerator key="l" modifiers="GDK_CONTROL_MASK"/>
+        </child>
+        <child>
+          <object class="GtkRadioAction" id="waipointsview_item">
+            <property name="group">classicview_item</property>
+            <property name="name">waipointsview_item</property>
+            <property name="label" translatable="yes"> _Waypoints Editor</property>
+            <signal handler="on_waypointsview_activate" name="activate"/>
+          </object>
+          <accelerator key="w" modifiers="GDK_CONTROL_MASK"/>
+        </child>
+        <child>
+          <object class="GtkAction" id="tools1">
+            <property name="name">tools1</property>
+            <property name="label" translatable="yes">Tools</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="extensions1">
+            <property name="name">extensions1</property>
+            <property name="label" translatable="yes">Extensions</property>
+            <signal handler="on_extensions_activate" name="activate"/>
+          </object>
+          <accelerator key="e" modifiers="GDK_CONTROL_MASK"/>
+        </child>
+        <child>
+          <object class="GtkAction" id="gps_device_plugins1">
+            <property name="name">gps_device_plugins1</property>
+            <property name="label" translatable="yes">GPS Device Plugins</property>
+            <signal handler="on_gpsplugins_activate" name="activate"/>
+          </object>
+          <accelerator key="p" modifiers="GDK_CONTROL_MASK"/>
+        </child>
+        <child>
+          <object class="GtkAction" id="menuitem4">
+            <property name="name">menuitem4</property>
+            <property name="label" translatable="yes">_Help</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="acerca_de1">
+            <property name="stock_id">gtk-about</property>
+            <property name="name">acerca_de1</property>
+            <signal handler="on_about_activate" name="activate"/>
+          </object>
+        </child>
+      </object>
+    </child>
+    <ui>
+      <menubar name="menubar1">
+        <menu action="menuitem1">
+          <menuitem action="nuevo1"/>
+          <menuitem action="menu_importdata"/>
+          <separator/>
+          <menuitem action="export_csv"/>
+          <separator/>
+          <menuitem action="salir1"/>
+        </menu>
+        <menu action="menuitem2">
+          <menuitem action="preferencias1"/>
+        </menu>
+        <menu action="view1">
+          <menuitem action="classicview_item"/>
+          <menuitem action="listview_item"/>
+          <menuitem action="waipointsview_item"/>
+        </menu>
+        <menu action="tools1">
+          <menuitem action="extensions1"/>
+          <menuitem action="gps_device_plugins1"/>
+        </menu>
+        <menu action="menuitem4">
+          <menuitem action="acerca_de1"/>
+        </menu>
+      </menubar>
+    </ui>
+  </object>
+  <object class="GtkUIManager" id="uimanager2">
+    <child>
+      <object class="GtkActionGroup" id="actiongroup2">
+        <child>
+          <object class="GtkAction" id="menuitem5">
+            <property name="name">menuitem5</property>
+            <property name="label" translatable="yes">Columns</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <ui>
+      <menubar name="listviewOptions">
+        <menu action="menuitem5"/>
+      </menubar>
+    </ui>
+  </object>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
-  <widget class="GtkWindow" id="window1">
+  <object class="GtkWindow" id="window1">
     <property name="visible">True</property>
     <property name="title">window1</property>
     <property name="icon">logo_mini.png</property>
-    <signal name="destroy" handler="quit"/>
-    <signal name="configure_event" handler="on_window1_configure_event"/>
+    <signal handler="quit" name="destroy"/>
+    <signal handler="on_window1_configure_event" name="configure_event"/>
     <child>
-      <widget class="GtkNotebook" id="notebook7">
+      <object class="GtkNotebook" id="notebook7">
         <property name="visible">True</property>
         <property name="show_tabs">False</property>
         <child>
-          <widget class="GtkVBox" id="infoarea">
+          <object class="GtkVBox" id="infoarea">
             <property name="visible">True</property>
             <child>
-              <widget class="GtkMenuBar" id="menubar1">
+              <object class="GtkMenuBar" constructor="uimanager1" id="menubar1">
                 <property name="visible">True</property>
-                <child>
-                  <widget class="GtkMenuItem" id="menuitem1">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">_File</property>
-                    <property name="use_underline">True</property>
-                    <child>
-                      <widget class="GtkMenu" id="menuitem1_menu">
-                        <child>
-                          <widget class="GtkImageMenuItem" id="nuevo1">
-                            <property name="label">gtk-new</property>
-                            <property name="visible">True</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_stock">True</property>
-                            <signal name="activate" handler="on_newrecord_clicked"/>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkImageMenuItem" id="menu_importdata">
-                            <property name="label" translatable="yes">_Import</property>
-                            <property name="visible">True</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_stock">False</property>
-                            <signal name="activate" handler="on_menu_importdata_activate"/>
-                            <accelerator key="i" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                            <child internal-child="image">
-                              <widget class="GtkImage" id="image1">
-                                <property name="visible">True</property>
-                                <property name="stock">gtk-undo</property>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkSeparatorMenuItem" id="separador1">
-                            <property name="visible">True</property>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkImageMenuItem" id="export_csv">
-                            <property name="label" translatable="yes">_Export as Text Separated by Commas</property>
-                            <property name="visible">True</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_stock">False</property>
-                            <signal name="activate" handler="on_export_csv_activate"/>
-                            <child internal-child="image">
-                              <widget class="GtkImage" id="image2">
-                                <property name="visible">True</property>
-                                <property name="stock">gtk-redo</property>
-                              </widget>
-                            </child>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                            <property name="visible">True</property>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkImageMenuItem" id="salir1">
-                            <property name="label">gtk-quit</property>
-                            <property name="visible">True</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_stock">True</property>
-                            <signal name="activate" handler="quit"/>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkMenuItem" id="menuitem2">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">_Edit</property>
-                    <property name="use_underline">True</property>
-                    <child>
-                      <widget class="GtkMenu" id="menuitem2_menu">
-                        <child>
-                          <widget class="GtkImageMenuItem" id="preferencias1">
-                            <property name="label">gtk-preferences</property>
-                            <property name="visible">True</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_stock">True</property>
-                            <signal name="activate" handler="on_edituser_activate"/>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkMenuItem" id="view1">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">_View</property>
-                    <property name="use_underline">True</property>
-                    <child>
-                      <widget class="GtkMenu" id="view1_menu">
-                        <child>
-                          <widget class="GtkRadioMenuItem" id="classicview_item">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes"> _Classic View</property>
-                            <property name="use_underline">True</property>
-                            <property name="active">True</property>
-                            <signal name="activate" handler="on_classicview_activate"/>
-                            <accelerator key="c" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkRadioMenuItem" id="listview_item">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes"> _List View</property>
-                            <property name="use_underline">True</property>
-                            <property name="group">classicview_item</property>
-                            <signal name="activate" handler="on_listview_activate"/>
-                            <accelerator key="l" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkRadioMenuItem" id="waipointsview_item">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes"> _Waypoints Editor</property>
-                            <property name="use_underline">True</property>
-                            <property name="group">classicview_item</property>
-                            <signal name="activate" handler="on_waypointsview_activate"/>
-                            <accelerator key="w" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkMenuItem" id="tools1">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Tools</property>
-                    <property name="use_underline">True</property>
-                    <signal name="activate" handler="on_tools1_activate"/>
-                    <child>
-                      <widget class="GtkMenu" id="tools1_menu">
-                        <child>
-                          <widget class="GtkMenuItem" id="extensions1">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">Extensions</property>
-                            <property name="use_underline">True</property>
-                            <signal name="activate" handler="on_extensions_activate"/>
-                            <accelerator key="e" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                          </widget>
-                        </child>
-                        <child>
-                          <widget class="GtkMenuItem" id="gps_device_plugins1">
-                            <property name="visible">True</property>
-                            <property name="label" translatable="yes">GPS Device Plugins</property>
-                            <property name="use_underline">True</property>
-                            <signal name="activate" handler="on_gpsplugins_activate"/>
-                            <accelerator key="p" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkMenuItem" id="menuitem4">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">_Help</property>
-                    <property name="use_underline">True</property>
-                    <child>
-                      <widget class="GtkMenu" id="menuitem4_menu">
-                        <child>
-                          <widget class="GtkImageMenuItem" id="acerca_de1">
-                            <property name="label">gtk-about</property>
-                            <property name="visible">True</property>
-                            <property name="use_underline">True</property>
-                            <property name="use_stock">True</property>
-                            <signal name="activate" handler="on_about_activate"/>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
+              </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
@@ -207,56 +631,56 @@
               </packing>
             </child>
             <child>
-              <widget class="GtkNotebook" id="notebook6">
+              <object class="GtkNotebook" id="notebook6">
                 <property name="visible">True</property>
                 <property name="show_tabs">False</property>
                 <property name="show_border">False</property>
                 <child>
-                  <widget class="GtkHBox" id="classicarea">
+                  <object class="GtkHBox" id="classicarea">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkVPaned" id="vpaned1">
+                      <object class="GtkVPaned" id="vpaned1">
                         <property name="width_request">235</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="position">190</property>
                         <child>
-                          <widget class="GtkCalendar" id="calendar">
+                          <object class="GtkCalendar" id="calendar">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <signal name="day_selected_double_click" handler="on_calendar_doubleclick"/>
-                            <signal name="day_selected" handler="on_calendar_selected"/>
-                            <signal name="next_month" handler="on_calendar_changemonth"/>
-                            <signal name="next_year" handler="on_calendar_next_year"/>
-                            <signal name="prev_month" handler="on_calendar_changemonth"/>
-                            <signal name="prev_year" handler="on_calendar_next_year"/>
-                          </widget>
+                            <signal handler="on_calendar_doubleclick" name="day_selected_double_click"/>
+                            <signal handler="on_calendar_selected" name="day_selected"/>
+                            <signal handler="on_calendar_changemonth" name="next_month"/>
+                            <signal handler="on_calendar_next_year" name="next_year"/>
+                            <signal handler="on_calendar_changemonth" name="prev_month"/>
+                            <signal handler="on_calendar_next_year" name="prev_year"/>
+                          </object>
                           <packing>
                             <property name="resize">False</property>
                             <property name="shrink">True</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                          <object class="GtkScrolledWindow" id="scrolledwindow1">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="shadow_type">in</property>
                             <child>
-                              <widget class="GtkTreeView" id="recordTreeView">
+                              <object class="GtkTreeView" id="recordTreeView">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="rubber_banding">True</property>
-                                <signal name="button_press_event" handler="on_recordTreeView_button_press_event"/>
-                                <signal name="row_activated" handler="on_recordTree_clicked"/>
-                              </widget>
+                                <signal handler="on_recordTreeView_button_press_event" name="button_press_event"/>
+                                <signal handler="on_recordTree_clicked" name="row_activated"/>
+                              </object>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="resize">True</property>
                             <property name="shrink">True</property>
                           </packing>
                         </child>
-                      </widget>
+                      </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
@@ -264,18 +688,18 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkVBox" id="framework">
+                      <object class="GtkVBox" id="framework">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox8">
+                          <object class="GtkHBox" id="hbox8">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <property name="spacing">10</property>
                             <child>
-                              <widget class="GtkLabel" id="label47">
+                              <object class="GtkLabel" id="label47">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Sport</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="expand">False</property>
                                 <property name="fill">False</property>
@@ -283,518 +707,525 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkComboBoxEntry" id="sportlist">
+                              <object class="GtkComboBoxEntry" id="sportlist">
                                 <property name="width_request">52</property>
                                 <property name="visible">True</property>
                                 <property name="active">0</property>
-                                <property name="items" translatable="yes">All Sports</property>
-                                <signal name="changed" handler="on_sportlist_changed"/>
-                              </widget>
+                                <signal handler="on_sportlist_changed" name="changed"/>
+                                <property name="model">model1</property>
+				<property name="text-column">0</property>
+                                <child>
+                                  <object class="GtkCellRendererText" id="renderer1"/>
+                                  <attributes>
+                                    <attribute name="text">0</attribute>
+                                  </attributes>
+                                </child>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label48">
+                              <object class="GtkLabel" id="label48">
                                 <property name="visible">True</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="fill">False</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
-                          </widget>
+                          </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkNotebook" id="notebook">
+                          <object class="GtkNotebook" id="notebook">
                             <property name="width_request">650</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="border_width">6</property>
                             <property name="scrollable">True</property>
                             <property name="enable_popup">True</property>
-                            <signal name="switch_page" handler="on_page_change"/>
+                            <signal handler="on_page_change" name="switch_page"/>
                             <child>
-                              <widget class="GtkNotebook" id="recordview">
+                              <object class="GtkNotebook" id="recordview">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="border_width">6</property>
                                 <property name="tab_pos">left</property>
-                                <signal name="switch_page" handler="on_recordpage_change"/>
+                                <signal handler="on_recordpage_change" name="switch_page"/>
                                 <child>
-                                  <widget class="GtkFrame" id="frame8">
+                                  <object class="GtkFrame" id="frame8">
                                     <property name="visible">True</property>
                                     <property name="border_width">8</property>
                                     <property name="label_xalign">0</property>
                                     <property name="shadow_type">none</property>
                                     <child>
-                                      <widget class="GtkAlignment" id="alignment8">
+                                      <object class="GtkAlignment" id="alignment8">
                                         <property name="visible">True</property>
                                         <property name="left_padding">12</property>
                                         <child>
-                                          <widget class="GtkVBox" id="vbox22">
+                                          <object class="GtkVBox" id="vbox22">
                                             <property name="visible">True</property>
                                             <property name="border_width">10</property>
                                             <child>
-                                              <widget class="GtkTable" id="table13">
+                                              <object class="GtkTable" id="table13">
                                                 <property name="visible">True</property>
                                                 <property name="n_rows">9</property>
                                                 <property name="n_columns">6</property>
                                                 <property name="column_spacing">3</property>
                                                 <property name="row_spacing">6</property>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_sport">
+                                                  <object class="GtkLabel" id="record_sport">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">      </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">2</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_upositive">
+                                                  <object class="GtkLabel" id="record_upositive">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">         </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">2</property>
                                                     <property name="top_attach">4</property>
                                                     <property name="bottom_attach">5</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_calories">
+                                                  <object class="GtkLabel" id="record_calories">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">         </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">2</property>
                                                     <property name="top_attach">5</property>
                                                     <property name="bottom_attach">6</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="ddsddsdsdsds">
+                                                  <object class="GtkLabel" id="ddsddsdsdsds">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Sport:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11124">
+                                                  <object class="GtkLabel" id="label11124">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Duration:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11126">
+                                                  <object class="GtkLabel" id="label11126">
                                                     <property name="width_request">90</property>
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Speed:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11137">
+                                                  <object class="GtkLabel" id="label11137">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Pace:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="top_attach">3</property>
                                                     <property name="bottom_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11144">
+                                                  <object class="GtkLabel" id="label11144">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Ascent:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="top_attach">4</property>
                                                     <property name="bottom_attach">5</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label1">
+                                                  <object class="GtkLabel" id="label1">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Calories:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="top_attach">5</property>
                                                     <property name="bottom_attach">6</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11140">
+                                                  <object class="GtkLabel" id="label11140">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Comments:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="top_attach">7</property>
                                                     <property name="bottom_attach">8</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="r_maxspeed_unit">
+                                                  <object class="GtkLabel" id="r_maxspeed_unit">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label">km/h</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">5</property>
                                                     <property name="right_attach">6</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="r_maxpace_unit">
+                                                  <object class="GtkLabel" id="r_maxpace_unit">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label">min/km</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">5</property>
                                                     <property name="right_attach">6</property>
                                                     <property name="top_attach">3</property>
                                                     <property name="bottom_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="r_descent_unit">
+                                                  <object class="GtkLabel" id="r_descent_unit">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label">m</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">5</property>
                                                     <property name="right_attach">6</property>
                                                     <property name="top_attach">4</property>
                                                     <property name="bottom_attach">5</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_distance">
+                                                  <object class="GtkLabel" id="record_distance">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">       </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">4</property>
                                                     <property name="right_attach">5</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_maxspeed">
+                                                  <object class="GtkLabel" id="record_maxspeed">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">     </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">4</property>
                                                     <property name="right_attach">5</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_maxpace">
+                                                  <object class="GtkLabel" id="record_maxpace">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">      </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">4</property>
                                                     <property name="right_attach">5</property>
                                                     <property name="top_attach">3</property>
                                                     <property name="bottom_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_date">
+                                                  <object class="GtkLabel" id="record_date">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">      </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">4</property>
                                                     <property name="right_attach">5</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_unegative">
+                                                  <object class="GtkLabel" id="record_unegative">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">         </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">4</property>
                                                     <property name="right_attach">5</property>
                                                     <property name="top_attach">4</property>
                                                     <property name="bottom_attach">5</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label-2147483648">
+                                                  <object class="GtkLabel" id="label-2147483648">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Date:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">3</property>
                                                     <property name="right_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11123">
+                                                  <object class="GtkLabel" id="label11123">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Distance:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">3</property>
                                                     <property name="right_attach">4</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11134">
+                                                  <object class="GtkLabel" id="label11134">
                                                     <property name="width_request">90</property>
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Max Speed</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">3</property>
                                                     <property name="right_attach">4</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11138">
+                                                  <object class="GtkLabel" id="label11138">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Max Pace:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">3</property>
                                                     <property name="right_attach">4</property>
                                                     <property name="top_attach">3</property>
                                                     <property name="bottom_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11145">
+                                                  <object class="GtkLabel" id="label11145">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Descent:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">3</property>
                                                     <property name="right_attach">4</property>
                                                     <property name="top_attach">4</property>
                                                     <property name="bottom_attach">5</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_time">
+                                                  <object class="GtkLabel" id="record_time">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">5</property>
                                                     <property name="right_attach">6</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_pace">
+                                                  <object class="GtkLabel" id="record_pace">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">        </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">2</property>
                                                     <property name="top_attach">3</property>
                                                     <property name="bottom_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="r_pace_unit">
+                                                  <object class="GtkLabel" id="r_pace_unit">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label">min/km</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">2</property>
                                                     <property name="right_attach">3</property>
                                                     <property name="top_attach">3</property>
                                                     <property name="bottom_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_average">
+                                                  <object class="GtkLabel" id="record_average">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">     </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">2</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="r_ascent_unit">
+                                                  <object class="GtkLabel" id="r_ascent_unit">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label">m</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">2</property>
                                                     <property name="right_attach">3</property>
                                                     <property name="top_attach">4</property>
                                                     <property name="bottom_attach">5</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="r_calories_unit">
+                                                  <object class="GtkLabel" id="r_calories_unit">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label" translatable="yes">Cal</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">2</property>
                                                     <property name="right_attach">3</property>
                                                     <property name="top_attach">5</property>
                                                     <property name="bottom_attach">6</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkScrolledWindow" id="scrolledwindow6">
+                                                  <object class="GtkScrolledWindow" id="scrolledwindow6">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="hscrollbar_policy">automatic</property>
                                                     <property name="vscrollbar_policy">automatic</property>
                                                     <property name="shadow_type">in</property>
                                                     <child>
-                                                      <widget class="GtkTextView" id="record_comments">
+                                                      <object class="GtkTextView" id="record_comments">
                                                         <property name="width_request">440</property>
                                                         <property name="height_request">25</property>
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="editable">False</property>
                                                         <property name="wrap_mode">word</property>
-                                                      </widget>
+                                                      </object>
                                                     </child>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="right_attach">6</property>
                                                     <property name="top_attach">8</property>
@@ -802,56 +1233,56 @@
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="r_distance_unit">
+                                                  <object class="GtkLabel" id="r_distance_unit">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label" translatable="yes">Km</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">5</property>
                                                     <property name="right_attach">6</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="r_speed_unit">
+                                                  <object class="GtkLabel" id="r_speed_unit">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label" translatable="yes">km/h</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">2</property>
                                                     <property name="right_attach">3</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label26">
+                                                  <object class="GtkLabel" id="label26">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="yalign">0</property>
                                                     <property name="label" translatable="yes"><b>Equipment:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="top_attach">6</property>
                                                     <property name="bottom_attach">7</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label_record_equipment">
+                                                  <object class="GtkLabel" id="label_record_equipment">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="yalign">0</property>
                                                     <property name="use_markup">True</property>
                                                     <property name="wrap">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">6</property>
@@ -860,10 +1291,10 @@
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_duration">
+                                                  <object class="GtkLabel" id="record_duration">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">2</property>
@@ -929,12 +1360,12 @@
                                                   <placeholder/>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label42">
+                                                  <object class="GtkLabel" id="label42">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Active / Rest:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">3</property>
                                                     <property name="right_attach">4</property>
@@ -943,10 +1374,10 @@
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_runrest">
+                                                  <object class="GtkLabel" id="record_runrest">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">4</property>
                                                     <property name="right_attach">5</property>
@@ -955,12 +1386,12 @@
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label50">
+                                                  <object class="GtkLabel" id="label50">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label" translatable="yes">h:m:s</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">5</property>
                                                     <property name="right_attach">6</property>
@@ -968,7 +1399,7 @@
                                                     <property name="bottom_attach">6</property>
                                                   </packing>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
@@ -976,68 +1407,65 @@
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkFrame" id="frame_laps">
+                                              <object class="GtkFrame" id="frame_laps">
                                                 <property name="visible">True</property>
                                                 <property name="label_xalign">0</property>
                                                 <child>
-                                                  <widget class="GtkAlignment" id="alignment12l">
+                                                  <object class="GtkAlignment" id="alignment12l">
                                                     <property name="visible">True</property>
                                                     <property name="left_padding">12</property>
                                                     <property name="right_padding">12</property>
                                                     <child>
-                                                      <widget class="GtkScrolledWindow" id="scrolledwindow2l">
+                                                      <object class="GtkScrolledWindow" id="scrolledwindow2l">
                                                         <property name="visible">True</property>
                                                         <property name="can_focus">True</property>
                                                         <property name="hscrollbar_policy">automatic</property>
                                                         <property name="vscrollbar_policy">automatic</property>
                                                         <child>
-                                                          <widget class="GtkTreeView" id="lapsTreeView">
+                                                          <object class="GtkTreeView" id="lapsTreeView">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="has_tooltip">True</property>
-                                                          </widget>
+                                                          </object>
                                                         </child>
-                                                      </widget>
+                                                      </object>
                                                     </child>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                                <child>
-                                                  <widget class="GtkLabel" id="label14">
+                                                <child type="label">
+                                                  <object class="GtkLabel" id="label14">
                                                     <property name="visible">True</property>
                                                     <property name="label" translatable="yes"><b>Laps</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
-                                                  <packing>
-                                                    <property name="type">label_item</property>
-                                                  </packing>
+                                                  </object>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="padding">5</property>
                                                 <property name="position">2</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkHBox" id="recordbuttons_hbox">
+                                              <object class="GtkHBox" id="recordbuttons_hbox">
                                                 <property name="visible">True</property>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label-2147483647">
+                                                  <object class="GtkLabel" id="label-2147483647">
                                                     <property name="visible">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="fill">False</property>
                                                     <property name="position">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkButton" id="button36">
+                                                  <object class="GtkButton" id="button36">
                                                     <property name="label">gtk-edit</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
                                                     <property name="use_stock">True</property>
-                                                    <signal name="clicked" handler="on_edit_clicked"/>
-                                                  </widget>
+                                                    <signal handler="on_edit_clicked" name="clicked"/>
+                                                  </object>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
@@ -1045,39 +1473,39 @@
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkButton" id="button35">
+                                                  <object class="GtkButton" id="button35">
                                                     <property name="label">gtk-delete</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
                                                     <property name="use_stock">True</property>
-                                                    <signal name="clicked" handler="on_remove_clicked"/>
-                                                  </widget>
+                                                    <signal handler="on_remove_clicked" name="clicked"/>
+                                                  </object>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
                                                     <property name="position">2</property>
                                                   </packing>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="fill">False</property>
                                                 <property name="position">3</property>
                                               </packing>
                                             </child>
-                                          </widget>
+                                          </object>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                    <child>
-                                      <widget class="GtkHBox" id="hbox42">
+                                    <child type="label">
+                                      <object class="GtkHBox" id="hbox42">
                                         <property name="visible">True</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label-1">
+                                          <object class="GtkLabel" id="label-1">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes"> <b>Title:</b></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
@@ -1085,55 +1513,51 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="record_title">
+                                          <object class="GtkLabel" id="record_title">
                                             <property name="visible">True</property>
                                             <property name="xpad">5</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="type">label_item</property>
-                                      </packing>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkImage" id="image24">
+                                <child type="tab">
+                                  <object class="GtkImage" id="image24">
                                     <property name="visible">True</property>
                                     <property name="stock">gtk-info</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="tab_fill">False</property>
-                                    <property name="type">tab</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkVBox" id="record_vbox">
+                                  <object class="GtkVBox" id="record_vbox">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox30">
+                                      <object class="GtkHBox" id="hbox30">
                                         <property name="visible">True</property>
                                         <property name="border_width">5</property>
                                         <property name="spacing">8</property>
                                         <child>
-                                          <widget class="GtkButton" id="buttonShowOptions">
+                                          <object class="GtkButton" id="buttonShowOptions">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <property name="tooltip" translatable="yes">Show graph display options</property>
-                                            <signal name="clicked" handler="on_buttonShowOptions_clicked"/>
+                                            <property name="tooltip-text" translatable="yes">Show graph display options</property>
+                                            <signal handler="on_buttonShowOptions_clicked" name="clicked"/>
                                             <child>
-                                              <widget class="GtkImage" id="image4">
+                                              <object class="GtkImage" id="image4">
                                                 <property name="visible">True</property>
                                                 <property name="stock">gtk-preferences</property>
-                                              </widget>
+                                              </object>
                                             </child>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
@@ -1141,27 +1565,28 @@
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkComboBoxEntry" id="record_combovalue">
+                                          <object class="GtkComboBoxEntry" id="record_combovalue">
                                             <property name="visible">True</property>
-                                            <property name="items" translatable="yes">Profile
-Speed
-Pace
-Heart Rate
-Cadence
-Percentage
-Zone</property>
-                                            <signal name="changed" handler="on_day_combovalue_changed"/>
-                                          </widget>
+                                            <signal handler="on_day_combovalue_changed" name="changed"/>
+                                            <property name="model">model2</property>
+					    <property name="text-column">0</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="renderer2"/>
+                                              <attributes>
+                                                <attribute name="text">0</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label165">
+                                          <object class="GtkLabel" id="label165">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes">Versus</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
@@ -1169,17 +1594,18 @@ Zone</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkComboBoxEntry" id="record_combovalue2">
+                                          <object class="GtkComboBoxEntry" id="record_combovalue2">
                                             <property name="visible">True</property>
-                                            <property name="items" translatable="yes">None
-Profile
-Speed
-Pace
-Heart Rate
-Cadence
-</property>
-                                            <signal name="changed" handler="on_day_combovalue_changed"/>
-                                          </widget>
+                                            <signal handler="on_day_combovalue_changed" name="changed"/>
+                                            <property name="model">model3</property>
+					    <property name="text-column">0</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="renderer3"/>
+                                              <attributes>
+                                                <attribute name="text">0</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
@@ -1190,18 +1616,18 @@ Cadence
                                           <placeholder/>
                                         </child>
                                         <child>
-                                          <widget class="GtkButton" id="button27">
+                                          <object class="GtkButton" id="button27">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <signal name="clicked" handler="on_showmap_clicked"/>
+                                            <signal handler="on_showmap_clicked" name="clicked"/>
                                             <child>
-                                              <widget class="GtkImage" id="image3">
+                                              <object class="GtkImage" id="image3">
                                                 <property name="visible">True</property>
                                                 <property name="stock">gtk-fullscreen</property>
-                                              </widget>
+                                              </object>
                                             </child>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
@@ -1209,28 +1635,27 @@ Cadence
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkHBox" id="hboxGraphOptions">
+                                      <object class="GtkHBox" id="hboxGraphOptions">
                                         <property name="visible">True</property>
                                         <child>
-                                          <widget class="GtkScrolledWindow" id="scrolledwindowGraphOptions">
+                                          <object class="GtkScrolledWindow" id="scrolledwindowGraphOptions">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="hscrollbar_policy">automatic</property>
                                             <property name="vscrollbar_policy">automatic</property>
                                             <child>
-                                              <widget class="GtkViewport" id="viewportGraphOptions">
+                                              <object class="GtkViewport" id="viewportGraphOptions">
                                                 <property name="visible">True</property>
                                                 <property name="resize_mode">queue</property>
-                                                <property name="vadjustment">0 0 1 0.10000000000000001 0.90000000000000002 1</property>
                                                 <child>
-                                                  <widget class="GtkHBox" id="graph_data_hbox">
+                                                  <object class="GtkHBox" id="graph_data_hbox">
                                                     <property name="visible">True</property>
                                                     <child>
                                                       <placeholder/>
@@ -1244,31 +1669,31 @@ Cadence
                                                     <child>
                                                       <placeholder/>
                                                     </child>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                              </widget>
+                                              </object>
                                             </child>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkVBox" id="vbox2">
+                                          <object class="GtkVBox" id="vbox2">
                                             <property name="visible">True</property>
                                             <child>
-                                              <widget class="GtkButton" id="buttonGraphHideOptions">
+                                              <object class="GtkButton" id="buttonGraphHideOptions">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <signal name="clicked" handler="on_buttonGraphHideOptions_clicked"/>
+                                                <signal handler="on_buttonGraphHideOptions_clicked" name="clicked"/>
                                                 <child>
-                                                  <widget class="GtkImage" id="image5">
+                                                  <object class="GtkImage" id="image5">
                                                     <property name="visible">True</property>
                                                     <property name="stock">gtk-goto-top</property>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
@@ -1276,114 +1701,114 @@ Cadence
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkButton" id="buttonGraphShowOptions">
+                                              <object class="GtkButton" id="buttonGraphShowOptions">
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
-                                                <signal name="clicked" handler="on_buttonGraphShowOptions_clicked"/>
+                                                <signal handler="on_buttonGraphShowOptions_clicked" name="clicked"/>
                                                 <child>
-                                                  <widget class="GtkImage" id="image6">
+                                                  <object class="GtkImage" id="image6">
                                                     <property name="visible">True</property>
                                                     <property name="stock">gtk-goto-bottom</property>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="pack_type">end</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkHPaned" id="hpaned1">
+                                      <object class="GtkHPaned" id="hpaned1">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="position_set">True</property>
                                         <child>
-                                          <widget class="GtkVBox" id="vboxGraphYConfig">
+                                          <object class="GtkVBox" id="vboxGraphYConfig">
                                             <property name="visible">True</property>
                                             <child>
-                                              <widget class="GtkLabel" id="labelGraphConfig">
+                                              <object class="GtkLabel" id="labelGraphConfig">
                                                 <property name="visible">True</property>
                                                 <property name="label" translatable="yes"><small>Graph Display Options</small></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkFrame" id="frameYAxisLimits">
+                                              <object class="GtkFrame" id="frameYAxisLimits">
                                                 <property name="visible">True</property>
                                                 <property name="label_xalign">0</property>
                                                 <child>
-                                                  <widget class="GtkAlignment" id="alignment3">
+                                                  <object class="GtkAlignment" id="alignment3">
                                                     <property name="visible">True</property>
                                                     <property name="left_padding">10</property>
                                                     <child>
-                                                      <widget class="GtkTable" id="tableConfigY1">
+                                                      <object class="GtkTable" id="tableConfigY1">
                                                         <property name="visible">True</property>
                                                         <property name="n_rows">5</property>
                                                         <property name="n_columns">3</property>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY1AxisLimits">
+                                                          <object class="GtkLabel" id="labelY1AxisLimits">
                                                             <property name="visible">True</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes"><small>Limits</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="top_attach">1</property>
                                                             <property name="bottom_attach">2</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelYMin">
+                                                          <object class="GtkLabel" id="labelYMin">
                                                             <property name="visible">True</property>
                                                             <property name="label" translatable="yes"><small>Min</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelYMax">
+                                                          <object class="GtkLabel" id="labelYMax">
                                                             <property name="visible">True</property>
                                                             <property name="label" translatable="yes"><small>Max</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">2</property>
                                                             <property name="right_attach">3</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkSpinButton" id="spinbuttonY1Min">
+                                                          <object class="GtkSpinButton" id="spinbuttonY1Min">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="invisible_char">&#x25CF;</property>
                                                             <property name="width_chars">4</property>
-                                                            <property name="adjustment">0 -500 1000 1 10 0</property>
-                                                            <signal name="value_changed" handler="on_spinbuttonY1_value_changed"/>
-                                                          </widget>
+                                                            <property name="adjustment">adjustment1</property>
+                                                            <signal handler="on_spinbuttonY1_value_changed" name="value_changed"/>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
@@ -1394,14 +1819,14 @@ Cadence
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkSpinButton" id="spinbuttonY1Max">
+                                                          <object class="GtkSpinButton" id="spinbuttonY1Max">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="invisible_char">&#x25CF;</property>
                                                             <property name="width_chars">4</property>
-                                                            <property name="adjustment">0 -500 1000 1 10 0</property>
-                                                            <signal name="value_changed" handler="on_spinbuttonY1_value_changed"/>
-                                                          </widget>
+                                                            <property name="adjustment">adjustment2</property>
+                                                            <signal handler="on_spinbuttonY1_value_changed" name="value_changed"/>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">2</property>
                                                             <property name="right_attach">3</property>
@@ -1412,27 +1837,27 @@ Cadence
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY1LineColor">
+                                                          <object class="GtkLabel" id="labelY1LineColor">
                                                             <property name="visible">True</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes"><small>Color</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="top_attach">2</property>
                                                             <property name="bottom_attach">3</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkColorButton" id="colorbuttonY1LineColor">
+                                                          <object class="GtkColorButton" id="colorbuttonY1LineColor">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
                                                             <property name="xalign">0</property>
                                                             <property name="color">#000000000000</property>
-                                                            <signal name="color_set" handler="on_colorbuttonY1LineColor_color_set"/>
-                                                          </widget>
+                                                            <signal handler="on_colorbuttonY1LineColor_color_set" name="color_set"/>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
@@ -1443,27 +1868,27 @@ Cadence
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY1LineWeight">
+                                                          <object class="GtkLabel" id="labelY1LineWeight">
                                                             <property name="visible">True</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes"><small>Weight</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="top_attach">3</property>
                                                             <property name="bottom_attach">4</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkSpinButton" id="spinbuttonY1LineWeight">
+                                                          <object class="GtkSpinButton" id="spinbuttonY1LineWeight">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="max_length">2</property>
                                                             <property name="invisible_char">&#x25CF;</property>
-                                                            <property name="adjustment">1 1 10 1 1 0</property>
-                                                            <signal name="value_changed" handler="on_spinbuttonY1LineWeight_value_changed"/>
-                                                          </widget>
+                                                            <property name="adjustment">adjustment3</property>
+                                                            <signal handler="on_spinbuttonY1LineWeight_value_changed" name="value_changed"/>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
@@ -1474,37 +1899,37 @@ Cadence
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY1">
+                                                          <object class="GtkLabel" id="labelY1">
                                                             <property name="visible">True</property>
                                                             <property name="label" translatable="yes">Y1</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY1LineSmoothing">
+                                                          <object class="GtkLabel" id="labelY1LineSmoothing">
                                                             <property name="visible">True</property>
                                                             <property name="sensitive">False</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes"><small>Smoothing</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="top_attach">4</property>
                                                             <property name="bottom_attach">5</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkSpinButton" id="spinbuttonY1LineSmoothing">
+                                                          <object class="GtkSpinButton" id="spinbuttonY1LineSmoothing">
                                                             <property name="visible">True</property>
                                                             <property name="sensitive">False</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="max_length">2</property>
                                                             <property name="invisible_char">&#x25CF;</property>
-                                                            <property name="adjustment">1 0 10 1 1 0</property>
-                                                          </widget>
+                                                            <property name="adjustment">adjustment4</property>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
@@ -1523,81 +1948,78 @@ Cadence
                                                         <child>
                                                           <placeholder/>
                                                         </child>
-                                                      </widget>
+                                                      </object>
                                                     </child>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                                <child>
+                                                <child type="label">
                                                   <placeholder/>
-                                                  <packing>
-                                                    <property name="type">label_item</property>
-                                                  </packing>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="position">2</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkFrame" id="frameY2Axis">
+                                              <object class="GtkFrame" id="frameY2Axis">
                                                 <property name="visible">True</property>
                                                 <property name="sensitive">False</property>
                                                 <property name="label_xalign">0</property>
                                                 <child>
-                                                  <widget class="GtkAlignment" id="alignment5">
+                                                  <object class="GtkAlignment" id="alignment5">
                                                     <property name="visible">True</property>
                                                     <property name="left_padding">10</property>
                                                     <child>
-                                                      <widget class="GtkTable" id="tableConfigY2">
+                                                      <object class="GtkTable" id="tableConfigY2">
                                                         <property name="visible">True</property>
                                                         <property name="n_rows">5</property>
                                                         <property name="n_columns">3</property>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY2AxisLimits">
+                                                          <object class="GtkLabel" id="labelY2AxisLimits">
                                                             <property name="visible">True</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes"><small>Limits</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="top_attach">1</property>
                                                             <property name="bottom_attach">2</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY2Min">
+                                                          <object class="GtkLabel" id="labelY2Min">
                                                             <property name="visible">True</property>
                                                             <property name="label" translatable="yes"><small>Min</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY2Max">
+                                                          <object class="GtkLabel" id="labelY2Max">
                                                             <property name="visible">True</property>
                                                             <property name="label" translatable="yes"><small>Max</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">2</property>
                                                             <property name="right_attach">3</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkSpinButton" id="spinbuttonY2Min">
+                                                          <object class="GtkSpinButton" id="spinbuttonY2Min">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="invisible_char">&#x25CF;</property>
                                                             <property name="width_chars">4</property>
-                                                            <property name="adjustment">0 -500 1000 1 10 0</property>
-                                                          </widget>
+                                                            <property name="adjustment">adjustment5</property>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
@@ -1608,13 +2030,13 @@ Cadence
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkSpinButton" id="spinbuttonY2Max">
+                                                          <object class="GtkSpinButton" id="spinbuttonY2Max">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="invisible_char">&#x25CF;</property>
                                                             <property name="width_chars">4</property>
-                                                            <property name="adjustment">1 -500 1000 1 10 0</property>
-                                                          </widget>
+                                                            <property name="adjustment">adjustment6</property>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">2</property>
                                                             <property name="right_attach">3</property>
@@ -1625,48 +2047,48 @@ Cadence
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY2">
+                                                          <object class="GtkLabel" id="labelY2">
                                                             <property name="visible">True</property>
                                                             <property name="label" translatable="yes">Y2</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY2LineColor">
+                                                          <object class="GtkLabel" id="labelY2LineColor">
                                                             <property name="visible">True</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes"><small>Color</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="top_attach">2</property>
                                                             <property name="bottom_attach">3</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY2LineWeight">
+                                                          <object class="GtkLabel" id="labelY2LineWeight">
                                                             <property name="visible">True</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes"><small>Weight</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="top_attach">3</property>
                                                             <property name="bottom_attach">4</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkColorButton" id="colorbuttonY2LineColor">
+                                                          <object class="GtkColorButton" id="colorbuttonY2LineColor">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">True</property>
                                                             <property name="xalign">0</property>
                                                             <property name="color">#000000000000</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
@@ -1677,13 +2099,13 @@ Cadence
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkSpinButton" id="spinbuttonY2LineWeight">
+                                                          <object class="GtkSpinButton" id="spinbuttonY2LineWeight">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="max_length">2</property>
                                                             <property name="invisible_char">&#x25CF;</property>
-                                                            <property name="adjustment">1 0 10 1 1 0</property>
-                                                          </widget>
+                                                            <property name="adjustment">adjustment7</property>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
@@ -1694,28 +2116,28 @@ Cadence
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelY2LineSmoothing">
+                                                          <object class="GtkLabel" id="labelY2LineSmoothing">
                                                             <property name="visible">True</property>
                                                             <property name="sensitive">False</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes"><small>Smoothing</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="top_attach">4</property>
                                                             <property name="bottom_attach">5</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkSpinButton" id="spinbuttonY2LineSmoothing">
+                                                          <object class="GtkSpinButton" id="spinbuttonY2LineSmoothing">
                                                             <property name="visible">True</property>
                                                             <property name="sensitive">False</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="max_length">2</property>
                                                             <property name="invisible_char">&#x25CF;</property>
-                                                            <property name="adjustment">1 0 10 1 1 0</property>
-                                                          </widget>
+                                                            <property name="adjustment">adjustment8</property>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
@@ -1734,66 +2156,63 @@ Cadence
                                                         <child>
                                                           <placeholder/>
                                                         </child>
-                                                      </widget>
+                                                      </object>
                                                     </child>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                                <child>
+                                                <child type="label">
                                                   <placeholder/>
-                                                  <packing>
-                                                    <property name="type">label_item</property>
-                                                  </packing>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="position">3</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkFrame" id="frameXAxis">
+                                              <object class="GtkFrame" id="frameXAxis">
                                                 <property name="visible">True</property>
                                                 <property name="sensitive">False</property>
                                                 <property name="label_xalign">0</property>
                                                 <child>
-                                                  <widget class="GtkAlignment" id="alignment6">
+                                                  <object class="GtkAlignment" id="alignment6">
                                                     <property name="visible">True</property>
                                                     <property name="left_padding">12</property>
                                                     <child>
-                                                      <widget class="GtkTable" id="tableConfigX">
+                                                      <object class="GtkTable" id="tableConfigX">
                                                         <property name="visible">True</property>
                                                         <property name="n_rows">4</property>
                                                         <property name="n_columns">3</property>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelX">
+                                                          <object class="GtkLabel" id="labelX">
                                                             <property name="visible">True</property>
                                                             <property name="label" translatable="yes">X</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelXAxisLimits">
+                                                          <object class="GtkLabel" id="labelXAxisLimits">
                                                             <property name="visible">True</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes"><small>Limits</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="top_attach">1</property>
                                                             <property name="bottom_attach">2</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkSpinButton" id="spinbuttonXMin">
+                                                          <object class="GtkSpinButton" id="spinbuttonXMin">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="invisible_char">&#x25CF;</property>
                                                             <property name="width_chars">4</property>
-                                                            <property name="adjustment">0 -500 1000 1 10 0</property>
-                                                          </widget>
+                                                            <property name="adjustment">adjustment9</property>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
@@ -1804,13 +2223,13 @@ Cadence
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkSpinButton" id="spinbuttonXMax">
+                                                          <object class="GtkSpinButton" id="spinbuttonXMax">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="invisible_char">&#x25CF;</property>
                                                             <property name="width_chars">4</property>
-                                                            <property name="adjustment">0 -500 1000 1 10 0</property>
-                                                          </widget>
+                                                            <property name="adjustment">adjustment10</property>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">2</property>
                                                             <property name="right_attach">3</property>
@@ -1821,50 +2240,50 @@ Cadence
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelXMin">
+                                                          <object class="GtkLabel" id="labelXMin">
                                                             <property name="visible">True</property>
                                                             <property name="label" translatable="yes"><small>Min</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelXMax">
+                                                          <object class="GtkLabel" id="labelXMax">
                                                             <property name="visible">True</property>
                                                             <property name="label" translatable="yes"><small>Max</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">2</property>
                                                             <property name="right_attach">3</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelXAxisDistance">
+                                                          <object class="GtkLabel" id="labelXAxisDistance">
                                                             <property name="visible">True</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes"><small>Distance</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="top_attach">2</property>
                                                             <property name="bottom_attach">3</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkRadioButton" id="radiobuttonDistance">
+                                                          <object class="GtkRadioButton" id="radiobuttonDistance">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">False</property>
                                                             <property name="active">True</property>
                                                             <property name="draw_indicator">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
@@ -1874,26 +2293,26 @@ Cadence
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkLabel" id="labelXAxisTime">
+                                                          <object class="GtkLabel" id="labelXAxisTime">
                                                             <property name="visible">True</property>
                                                             <property name="xalign">1</property>
                                                             <property name="label" translatable="yes"><small>Time</small></property>
                                                             <property name="use_markup">True</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="top_attach">3</property>
                                                             <property name="bottom_attach">4</property>
-                                                            <property name="y_options"></property>
+                                                            <property name="y_options"/>
                                                           </packing>
                                                         </child>
                                                         <child>
-                                                          <widget class="GtkRadioButton" id="radiobuttonTime">
+                                                          <object class="GtkRadioButton" id="radiobuttonTime">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property name="receives_default">False</property>
                                                             <property name="draw_indicator">True</property>
                                                             <property name="group">radiobuttonDistance</property>
-                                                          </widget>
+                                                          </object>
                                                           <packing>
                                                             <property name="left_attach">1</property>
                                                             <property name="right_attach">2</property>
@@ -1908,17 +2327,14 @@ Cadence
                                                         <child>
                                                           <placeholder/>
                                                         </child>
-                                                      </widget>
+                                                      </object>
                                                     </child>
-                                                  </widget>
+                                                  </object>
                                                 </child>
-                                                <child>
+                                                <child type="label">
                                                   <placeholder/>
-                                                  <packing>
-                                                    <property name="type">label_item</property>
-                                                  </packing>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
@@ -1926,25 +2342,25 @@ Cadence
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkHBox" id="hbox5">
+                                              <object class="GtkHBox" id="hbox5">
                                                 <property name="visible">True</property>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label16">
+                                                  <object class="GtkLabel" id="label16">
                                                     <property name="visible">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="position">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkCheckButton" id="btnShowLaps">
+                                                  <object class="GtkCheckButton" id="btnShowLaps">
                                                     <property name="label" translatable="yes">Show Laps</property>
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
                                                     <property name="receives_default">False</property>
                                                     <property name="draw_indicator">True</property>
-                                                    <signal name="toggled" handler="on_btnShowLaps_toggled"/>
-                                                  </widget>
+                                                    <signal handler="on_btnShowLaps_toggled" name="toggled"/>
+                                                  </object>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
@@ -1953,14 +2369,14 @@ Cadence
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label17">
+                                                  <object class="GtkLabel" id="label17">
                                                     <property name="visible">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="position">2</property>
                                                   </packing>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
@@ -1968,23 +2384,23 @@ Cadence
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label18">
+                                              <object class="GtkLabel" id="label18">
                                                 <property name="visible">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="position">6</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkButton" id="buttonResetGraph">
+                                              <object class="GtkButton" id="buttonResetGraph">
                                                 <property name="label" translatable="yes">Reset Graph</property>
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="receives_default">True</property>
                                                 <property name="has_tooltip">True</property>
                                                 <property name="yalign">1</property>
-                                                <signal name="clicked" handler="on_buttonResetGraph_clicked"/>
-                                              </widget>
+                                                <signal handler="on_buttonResetGraph_clicked" name="clicked"/>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
@@ -1992,59 +2408,55 @@ Cadence
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="resize">False</property>
                                             <property name="shrink">True</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkVBox" id="record_graph_vbox">
+                                          <object class="GtkVBox" id="record_graph_vbox">
                                             <property name="visible">True</property>
                                             <child>
                                               <placeholder/>
                                             </child>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="resize">True</property>
                                             <property name="shrink">True</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkImage" id="image25">
+                                <child type="tab">
+                                  <object class="GtkImage" id="image25">
                                     <property name="visible">True</property>
                                     <property name="pixbuf">graph.png</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">1</property>
                                     <property name="tab_fill">False</property>
-                                    <property name="type">tab</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkVBox" id="maparea_vbox">
+                                  <object class="GtkVBox" id="maparea_vbox">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox4">
+                                      <object class="GtkHBox" id="hbox4">
                                         <property name="visible">True</property>
                                         <child>
-                                          <widget class="GtkButton" id="buttonRedrawMap">
+                                          <object class="GtkButton" id="buttonRedrawMap">
                                             <property name="label" translatable="yes">Redraw Map</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">True</property>
-                                            <signal name="clicked" handler="on_buttonRedrawMap_clicked"/>
-                                          </widget>
+                                            <signal handler="on_buttonRedrawMap_clicked" name="clicked"/>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
@@ -2052,53 +2464,57 @@ Cadence
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="labelMapLineType">
+                                          <object class="GtkLabel" id="labelMapLineType">
                                             <property name="visible">True</property>
                                             <property name="xalign">1</property>
                                             <property name="label" translatable="yes"><small>Show:</small></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="padding">5</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkComboBoxEntry" id="comboMapLineType">
+                                          <object class="GtkComboBoxEntry" id="comboMapLineType">
                                             <property name="visible">True</property>
-                                            <property name="items" translatable="yes">None
-Speed
-Heart rate
-Cadence</property>
-                                            <signal name="changed" handler="on_comboMapLineType_changed"/>
-                                          </widget>
+                                            <signal handler="on_comboMapLineType_changed" name="changed"/>
+                                            <property name="model">model4</property>
+					    <property name="text-column">0</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="renderer4"/>
+                                              <attributes>
+                                                <attribute name="text">0</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="position">3</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="labelMapDisplayType">
+                                          <object class="GtkLabel" id="labelMapDisplayType">
                                             <property name="visible">True</property>
                                             <property name="xalign">1</property>
                                             <property name="label" translatable="yes"><small>Display map using:</small></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="padding">5</property>
                                             <property name="position">4</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkRadioButton" id="radiobuttonOSM">
+                                          <object class="GtkRadioButton" id="radiobuttonOSM">
                                             <property name="label" translatable="yes">Open Street Map</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="draw_indicator">True</property>
                                             <property name="group">radiobuttonGMap</property>
-                                            <signal name="toggled" handler="on_radiobuttonMap_toggled"/>
-                                          </widget>
+                                            <signal handler="on_radiobuttonMap_toggled" name="toggled"/>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
@@ -2107,15 +2523,15 @@ Cadence</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkRadioButton" id="radiobuttonGMap">
+                                          <object class="GtkRadioButton" id="radiobuttonGMap">
                                             <property name="label" translatable="yes">Google</property>
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="active">True</property>
                                             <property name="draw_indicator">True</property>
-                                            <signal name="toggled" handler="on_radiobuttonMap_toggled"/>
-                                          </widget>
+                                            <signal handler="on_radiobuttonMap_toggled" name="toggled"/>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
@@ -2123,7 +2539,7 @@ Cadence</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
@@ -2131,47 +2547,43 @@ Cadence</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkVBox" id="map_vbox">
+                                      <object class="GtkVBox" id="map_vbox">
                                         <property name="visible">True</property>
                                         <child>
                                           <placeholder/>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">2</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkImage" id="image26">
+                                <child type="tab">
+                                  <object class="GtkImage" id="image26">
                                     <property name="visible">True</property>
                                     <property name="pixbuf">map.png</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">2</property>
                                     <property name="tab_fill">False</property>
-                                    <property name="type">tab</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkVBox" id="heartrate_vbox_">
+                                  <object class="GtkVBox" id="heartrate_vbox_">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkFrame" id="frame11">
+                                      <object class="GtkFrame" id="frame11">
                                         <property name="visible">True</property>
                                         <property name="border_width">6</property>
                                         <property name="label_xalign">0</property>
                                         <property name="shadow_type">none</property>
                                         <child>
-                                          <widget class="GtkAlignment" id="alignment11">
+                                          <object class="GtkAlignment" id="alignment11">
                                             <property name="visible">True</property>
                                             <property name="left_padding">12</property>
                                             <child>
-                                              <widget class="GtkTable" id="table16">
+                                              <object class="GtkTable" id="table16">
                                                 <property name="visible">True</property>
                                                 <property name="border_width">10</property>
                                                 <property name="n_rows">5</property>
@@ -2179,384 +2591,384 @@ Cadence</property>
                                                 <property name="column_spacing">3</property>
                                                 <property name="row_spacing">5</property>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11125">
+                                                  <object class="GtkLabel" id="label_beats">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Beats:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11127">
+                                                  <object class="GtkLabel" id="label_calories">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Calories: </b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="wssdadadsada">
+                                                  <object class="GtkLabel" id="label_max_beats">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>Max Beats:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label-2">
+                                                  <object class="GtkLabel" id="label_hr_zones_method">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>HR Zones Method:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="top_attach">3</property>
                                                     <property name="bottom_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label-3">
+                                                  <object class="GtkLabel" id="label_hr_zone5">
                                                     <property name="width_request">90</property>
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>HR Zone5:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">3</property>
                                                     <property name="right_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11147">
+                                                  <object class="GtkLabel" id="label11147">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label" translatable="yes"> bpm</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">2</property>
                                                     <property name="right_attach">3</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11131">
+                                                  <object class="GtkLabel" id="label11131">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label" translatable="yes"> Cal</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">2</property>
                                                     <property name="right_attach">3</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_beats">
+                                                  <object class="GtkLabel" id="record_beats">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label">     </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">2</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_maxbeats">
+                                                  <object class="GtkLabel" id="record_maxbeats">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label">     </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">2</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_calories2">
+                                                  <object class="GtkLabel" id="record_calories2">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label">     </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">2</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11148">
+                                                  <object class="GtkLabel" id="label11148">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>HR Zone4:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">3</property>
                                                     <property name="right_attach">4</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11149">
+                                                  <object class="GtkLabel" id="label11149">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>HR Zone3:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">3</property>
                                                     <property name="right_attach">4</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11150">
+                                                  <object class="GtkLabel" id="label11150">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>HR Zone2:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">3</property>
                                                     <property name="right_attach">4</property>
                                                     <property name="top_attach">3</property>
                                                     <property name="bottom_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11151">
+                                                  <object class="GtkLabel" id="label11151">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes"><b>HR Zone1:</b></property>
                                                     <property name="use_markup">True</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">3</property>
                                                     <property name="right_attach">4</property>
                                                     <property name="top_attach">4</property>
                                                     <property name="bottom_attach">5</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_zone4">
+                                                  <object class="GtkLabel" id="record_zone4">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label">    </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">4</property>
                                                     <property name="right_attach">5</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_zone3">
+                                                  <object class="GtkLabel" id="record_zone3">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label">     </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">4</property>
                                                     <property name="right_attach">5</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_zone2">
+                                                  <object class="GtkLabel" id="record_zone2">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label">    </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">4</property>
                                                     <property name="right_attach">5</property>
                                                     <property name="top_attach">3</property>
                                                     <property name="bottom_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_zone1">
+                                                  <object class="GtkLabel" id="record_zone1">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label">    </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">4</property>
                                                     <property name="right_attach">5</property>
                                                     <property name="top_attach">4</property>
                                                     <property name="bottom_attach">5</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label11129">
+                                                  <object class="GtkLabel" id="label11129">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="xpad">5</property>
                                                     <property name="label" translatable="yes"> bpm</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">2</property>
                                                     <property name="right_attach">3</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_zone5">
+                                                  <object class="GtkLabel" id="record_zone5">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label">   </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">4</property>
                                                     <property name="right_attach">5</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label-4">
+                                                  <object class="GtkLabel" id="label-4">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">bpm</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">5</property>
                                                     <property name="right_attach">6</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label-5">
+                                                  <object class="GtkLabel" id="label-5">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">bpm</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">5</property>
                                                     <property name="right_attach">6</property>
                                                     <property name="top_attach">1</property>
                                                     <property name="bottom_attach">2</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label-2147483646">
+                                                  <object class="GtkLabel" id="label-2147483646">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">bpm</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">5</property>
                                                     <property name="right_attach">6</property>
                                                     <property name="top_attach">2</property>
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label-6">
+                                                  <object class="GtkLabel" id="label-6">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">bpm</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">5</property>
                                                     <property name="right_attach">6</property>
                                                     <property name="top_attach">3</property>
                                                     <property name="bottom_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label-2147483644">
+                                                  <object class="GtkLabel" id="label-2147483644">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label" translatable="yes">bpm</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">5</property>
                                                     <property name="right_attach">6</property>
                                                     <property name="top_attach">4</property>
                                                     <property name="bottom_attach">5</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="record_zonesmethod">
+                                                  <object class="GtkLabel" id="record_zonesmethod">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">0</property>
                                                     <property name="label">  </property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="left_attach">1</property>
                                                     <property name="right_attach">3</property>
                                                     <property name="top_attach">3</property>
                                                     <property name="bottom_attach">4</property>
                                                     <property name="x_options">GTK_FILL</property>
-                                                    <property name="y_options"></property>
+                                                    <property name="y_options"/>
                                                   </packing>
                                                 </child>
                                                 <child>
@@ -2568,19 +2980,19 @@ Cadence</property>
                                                 <child>
                                                   <placeholder/>
                                                 </child>
-                                              </widget>
+                                              </object>
                                             </child>
-                                          </widget>
+                                          </object>
                                         </child>
-                                        <child>
-                                          <widget class="GtkHBox" id="hbox47">
+                                        <child type="label">
+                                          <object class="GtkHBox" id="hbox47">
                                             <property name="visible">True</property>
                                             <child>
-                                              <widget class="GtkLabel" id="label-2147483635">
+                                              <object class="GtkLabel" id="label-2147483635">
                                                 <property name="visible">True</property>
                                                 <property name="label" translatable="yes"> <b>Heart Rate:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
@@ -2588,22 +3000,19 @@ Cadence</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label-2147483634">
+                                              <object class="GtkLabel" id="label-2147483634">
                                                 <property name="visible">True</property>
                                                 <property name="xpad">5</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="expand">False</property>
                                                 <property name="fill">False</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
-                                          </widget>
-                                          <packing>
-                                            <property name="type">label_item</property>
-                                          </packing>
+                                          </object>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
@@ -2611,30 +3020,30 @@ Cadence</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox54">
+                                      <object class="GtkHBox" id="hbox54">
                                         <property name="visible">True</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label-7">
+                                          <object class="GtkLabel" id="label-7">
                                             <property name="visible">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkButton" id="button49">
+                                          <object class="GtkButton" id="button49">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="relief">none</property>
-                                            <signal name="clicked" handler="on_hrpiebutton_clicked"/>
+                                            <signal handler="on_hrpiebutton_clicked" name="clicked"/>
                                             <child>
-                                              <widget class="GtkImage" id="image32">
+                                              <object class="GtkImage" id="image32">
                                                 <property name="visible">True</property>
                                                 <property name="pixbuf">hr-queso.png</property>
-                                              </widget>
+                                              </object>
                                             </child>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
@@ -2642,26 +3051,26 @@ Cadence</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkButton" id="button48">
+                                          <object class="GtkButton" id="button48">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
                                             <property name="relief">none</property>
-                                            <signal name="clicked" handler="on_hrplotbutton_clicked"/>
+                                            <signal handler="on_hrplotbutton_clicked" name="clicked"/>
                                             <child>
-                                              <widget class="GtkImage" id="image33">
+                                              <object class="GtkImage" id="image33">
                                                 <property name="visible">True</property>
                                                 <property name="pixbuf">hr-graph.png</property>
-                                              </widget>
+                                              </object>
                                             </child>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
@@ -2669,427 +3078,406 @@ Cadence</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <widget class="GtkNotebook" id="notebook8">
+                                      <object class="GtkNotebook" id="notebook8">
                                         <property name="visible">True</property>
                                         <property name="show_tabs">False</property>
                                         <property name="show_border">False</property>
                                         <child>
-                                          <widget class="GtkVBox" id="heartrate_vbox">
+                                          <object class="GtkVBox" id="heartrate_vbox">
                                             <property name="visible">True</property>
                                             <child>
                                               <placeholder/>
                                             </child>
-                                          </widget>
+                                          </object>
                                         </child>
-                                        <child>
-                                          <widget class="GtkLabel" id="label-8">
+                                        <child type="tab">
+                                          <object class="GtkLabel" id="label-8">
                                             <property name="visible">True</property>
                                             <property name="label">label-2147483648</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="tab_fill">False</property>
-                                            <property name="type">tab</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkVBox" id="heartrate_vbox2">
+                                          <object class="GtkVBox" id="heartrate_vbox2">
                                             <child>
                                               <placeholder/>
                                             </child>
-                                          </widget>
-                                          <packing>
-                                            <property name="position">1</property>
-                                          </packing>
+                                          </object>
                                         </child>
-                                        <child>
-                                          <widget class="GtkLabel" id="label-9">
+                                        <child type="tab">
+                                          <object class="GtkLabel" id="label-9">
                                             <property name="visible">True</property>
                                             <property name="label">label-2147483647</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="position">1</property>
                                             <property name="tab_fill">False</property>
-                                            <property name="type">tab</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="position">2</property>
                                       </packing>
                                     </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">3</property>
-                                  </packing>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkImage" id="image28">
+                                <child type="tab">
+                                  <object class="GtkImage" id="image28">
                                     <property name="visible">True</property>
                                     <property name="pixbuf">heartrate.png</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">3</property>
                                     <property name="tab_fill">False</property>
-                                    <property name="type">tab</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkFrame" id="frame_analytics">
+                                  <object class="GtkFrame" id="frame_analytics">
                                     <property name="visible">True</property>
                                     <property name="border_width">6</property>
                                     <property name="label_xalign">0</property>
                                     <property name="shadow_type">none</property>
-		                            <child>
-		                              <widget class="GtkVBox" id="analytics_vbox_">
-		                                <property name="visible">True</property>
-			                            <child>
-				                          <widget class="GtkHBox" id="analytics_hbox_">
-				                            <property name="visible">True</property>
-					                        <child>
-					                          <widget class="GtkFrame" id="frame_projected">
-					                            <property name="visible">True</property>
-					                            <property name="label_xalign">0</property>
-				                                <child>
-				                                  <widget class="GtkAlignment" id="alignment_analytics">
-				                                    <property name="visible">True</property>
-				                                    <property name="left_padding">12</property>
-			                                        <property name="can_focus">False</property>
-			                                        <child>
-			                                          <widget class="GtkTreeView" id="analyticsTreeView">
-			                                            <property name="visible">True</property>
-				                                        <property name="can_focus">True</property>
-				                                        <property name="headers-clickable">False</property>
-			                                          </widget>
-			                                        </child>
-				                                  </widget>
-				                                </child>
-					                            <child>
-					                              <widget class="GtkLabel" id="labelprojected">
-					                                <property name="visible">True</property>
-					                                <property name="label" translatable="yes"><b>Projected times</b></property>
-					                                <property name="use_markup">True</property>
-					                              </widget>
-					                              <packing>
-					                                <property name="type">label_item</property>
-					                            <property name="padding">10</property>
-					                              </packing>
-					                            </child>
-					                          </widget>
-					                          <packing>
-			                                    <property name="expand">False</property>
-					                            <property name="padding">10</property>
-					                            <property name="position">2</property>
-					                          </packing>
-					                        </child>
-					                        <child>
-					                          <widget class="GtkFrame" id="frame_ranking">
-					                            <property name="visible">True</property>
-					                            <property name="label_xalign">0</property>
-				                                <child>
-				                                  <widget class="GtkAlignment" id="alignment_ranking">
-				                                    <property name="visible">True</property>
-				                                    <property name="left_padding">12</property>
-			                                        <child>
-			                                          <widget class="GtkVBox" id="vbox_ranking">
-						                                <property name="visible">True</property>
-					                                    <child>
-					                                      <widget class="GtkLabel" id="label11125">
-					                                        <property name="visible">True</property>
-					                                        <property name="xalign">0</property>
-					                                        <property name="label" translatable="yes"><i>Rank relative to same-sport activities for distances ± x%:</i></property>
-					                                        <property name="use_markup">True</property>
-					                                      </widget>
-					                                    </child>
-							                            <child>
-					                                      <widget class="GtkHBox" id="hbox_ranking">
-								                            <property name="visible">True</property>
-										                    <child>
-								                              <widget class="GtkVBox" id="alignment_ranking2">
-											                    <property name="visible">True</property>
-									                            <child>
-									                              <widget class="GtkHScale" id="slider_ranking">
-									                                <property name="visible">True</property>
-									                                <property name="sensitive">True</property>
-																	<property name="adjustment">5 0 20 1 0 0</property>
-										                            <signal name="value-changed" handler="on_change_rank_percentage"/>
-													              </widget>
-									                              <packing>
-									                                <property name="expand">False</property>
-									                              </packing>
-									                            </child>
-									                            <child>
-									                              <widget class="GtkTable" id="table_ranking">
-									                                <property name="visible">True</property>
-										                            <property name="border_width">10</property>
-										                            <property name="n_rows">5</property>
-										                            <property name="n_columns">2</property>
-										                            <property name="column_spacing">3</property>
-										                            <property name="row_spacing">5</property>
-										                            <child>
-										                              <widget class="GtkLabel" id="label11125">
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="label" translatable="yes"><b>Range:</b></property>
-										                                <property name="use_markup">True</property>
-										                              </widget>
-										                              <packing>
-										                                <property name="top_attach">0</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-										                            <child>
-										                              <widget class="GtkLabel" id="label11125">
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="label" translatable="yes"><b>Rank:</b></property>
-										                                <property name="use_markup">True</property>
-										                              </widget>
-										                              <packing>
-										                                <property name="top_attach">1</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-										                            <child>
-										                              <widget class="GtkLabel" id="label11127">
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="label" translatable="yes"><b>Speed: </b></property>
-										                                <property name="use_markup">True</property>
-										                              </widget>
-										                              <packing>
-										                                <property name="top_attach">2</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-										                            <child>
-										                              <widget class="GtkLabel" id="wssdadadsada">
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="label" translatable="yes"><b>Avg speed:</b></property>
-										                                <property name="use_markup">True</property>
-										                              </widget>
-										                              <packing>
-										                                <property name="top_attach">3</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-										                            <child>
-										                              <widget class="GtkLabel" id="label-2">
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="label" translatable="yes"><b>Standard deviation:</b></property>
-										                                <property name="use_markup">True</property>
-										                              </widget>
-										                              <packing>
-										                                <property name="top_attach">4</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-										                            <child>
-										                              <widget class="GtkLabel" id="label-3">
-										                                <property name="width_request">90</property>
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="label" translatable="yes"><b>Deviation:</b></property>
-										                                <property name="use_markup">True</property>
-										                              </widget>
-										                              <packing>
-										                                <property name="top_attach">5</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-										                            <child>
-										                              <widget class="GtkLabel" id="label_ranking_range">
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="xpad">5</property>
-										                                <property name="label"></property>
-										                              </widget>
-										                              <packing>
-										                                <property name="left_attach">1</property>
-										                                <property name="top_attach">0</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-										                            <child>
-										                              <widget class="GtkLabel" id="label_ranking_rank">
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="xpad">5</property>
-										                                <property name="label"></property>
-										                              </widget>
-										                              <packing>
-										                                <property name="left_attach">1</property>
-										                                <property name="top_attach">1</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-										                            <child>
-										                              <widget class="GtkLabel" id="label_ranking_speed">
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="xpad">5</property>
-										                                <property name="label"></property>
-										                              </widget>
-										                              <packing>
-										                                <property name="left_attach">1</property>
-										                                <property name="top_attach">2</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-										                            <child>
-										                              <widget class="GtkLabel" id="label_ranking_avg">
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="xpad">5</property>
-										                                <property name="label"></property>
-										                              </widget>
-										                              <packing>
-										                                <property name="left_attach">1</property>
-										                                <property name="top_attach">3</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-										                            <child>
-										                              <widget class="GtkLabel" id="label_ranking_stddev">
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="xpad">5</property>
-										                                <property name="label"></property>
-										                              </widget>
-										                              <packing>
-										                                <property name="left_attach">1</property>
-										                                <property name="top_attach">4</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-										                            <child>
-										                              <widget class="GtkLabel" id="label_ranking_dev">
-										                                <property name="visible">True</property>
-										                                <property name="xalign">0</property>
-										                                <property name="xpad">5</property>
-										                                <property name="label"></property>
-										                              </widget>
-										                              <packing>
-										                                <property name="left_attach">1</property>
-										                                <property name="top_attach">5</property>
-										                                <property name="x_options">GTK_FILL</property>
-										                                <property name="y_options"></property>
-										                              </packing>
-										                            </child>
-									                              </widget>
-									                            </child>
-							                                  </widget>
-													          <packing>
-													            <property name="padding">10</property>
-													          </packing>
-							                                </child>
-							                                <child>
-							                                  <widget class="GtkTreeView" id="rankingTreeView">
-							                                    <property name="visible">True</property>
-								                                <property name="can_focus">True</property>
-								                                <property name="headers-clickable">False</property>
-							                                  </widget>
-													          <packing>
-													            <property name="padding">10</property>
-													          </packing>
-							                                </child>
-								                          </widget>
-								                        </child>
-			                                          </widget>
-			                                        </child>
-				                                  </widget>
-				                                </child>
-					                            <child>
-					                              <widget class="GtkLabel" id="label_ranking">
-					                                <property name="visible">True</property>
-					                                <property name="label" translatable="yes"><b>Ranking</b></property>
-					                                <property name="use_markup">True</property>
-					                              </widget>
-					                              <packing>
-					                                <property name="type">label_item</property>
-					                              </packing>
-					                            </child>
-		                                      </widget>
-		                                    </child>
-			                              </widget>
-			                              <packing>
-	                                        <property name="expand">False</property>
-			                                <property name="padding">10</property>
-			                                <property name="position">3</property>
-			                              </packing>
-			                            </child>
-                                      </widget>
+                                    <child>
+                                      <object class="GtkVBox" id="analytics_vbox_">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <object class="GtkHBox" id="analytics_hbox_">
+                                            <property name="visible">True</property>
+                                            <child>
+                                              <object class="GtkFrame" id="frame_projected">
+                                                <property name="visible">True</property>
+                                                <property name="label_xalign">0</property>
+                                                <child>
+                                                  <object class="GtkAlignment" id="alignment_analytics">
+                                                    <property name="visible">True</property>
+                                                    <property name="left_padding">12</property>
+                                                    <property name="can_focus">False</property>
+                                                    <child>
+                                                      <object class="GtkTreeView" id="analyticsTreeView">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="headers-clickable">False</property>
+                                                      </object>
+                                                    </child>
+                                                  </object>
+                                                </child>
+                                                <child type="label">
+                                                  <object class="GtkLabel" id="labelprojected">
+                                                    <property name="visible">True</property>
+                                                    <property name="label" translatable="yes"><b>Projected times</b></property>
+                                                    <property name="use_markup">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="padding">10</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="padding">10</property>
+                                                <property name="position">2</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkFrame" id="frame_ranking">
+                                                <property name="visible">True</property>
+                                                <property name="label_xalign">0</property>
+                                                <child>
+                                                  <object class="GtkAlignment" id="alignment_ranking">
+                                                    <property name="visible">True</property>
+                                                    <property name="left_padding">12</property>
+                                                    <child>
+                                                      <object class="GtkVBox" id="vbox_ranking">
+                                                        <property name="visible">True</property>
+                                                        <child>
+                                                          <object class="GtkLabel" id="label_rank_relative">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="label" translatable="yes"><i>Rank relative to same-sport activities for distances &#xB1; x%:</i></property>
+                                                            <property name="use_markup">True</property>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object class="GtkHBox" id="hbox_ranking">
+                                                            <property name="visible">True</property>
+                                                            <child>
+                                                            <object class="GtkVBox" id="alignment_ranking2">
+                                                            <property name="visible">True</property>
+                                                            <child>
+                                                            <object class="GtkHScale" id="slider_ranking">
+                                                            <property name="visible">True</property>
+                                                            <property name="sensitive">True</property>
+                                                            <property name="adjustment">adjustment11</property>
+                                                            <signal handler="on_change_rank_percentage" name="value-changed"/>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="expand">False</property>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkTable" id="table_ranking">
+                                                            <property name="visible">True</property>
+                                                            <property name="border_width">10</property>
+                                                            <property name="n_rows">5</property>
+                                                            <property name="n_columns">2</property>
+                                                            <property name="column_spacing">3</property>
+                                                            <property name="row_spacing">5</property>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_range">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="label" translatable="yes"><b>Range:</b></property>
+                                                            <property name="use_markup">True</property>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="top_attach">0</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_rank">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="label" translatable="yes"><b>Rank:</b></property>
+                                                            <property name="use_markup">True</property>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="top_attach">1</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_speed">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="label" translatable="yes"><b>Speed: </b></property>
+                                                            <property name="use_markup">True</property>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="top_attach">2</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_avg_speed">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="label" translatable="yes"><b>Avg speed:</b></property>
+                                                            <property name="use_markup">True</property>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="top_attach">3</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_std_deviation">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="label" translatable="yes"><b>Standard deviation:</b></property>
+                                                            <property name="use_markup">True</property>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="top_attach">4</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_deviation">
+                                                            <property name="width_request">90</property>
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="label" translatable="yes"><b>Deviation:</b></property>
+                                                            <property name="use_markup">True</property>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="top_attach">5</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_ranking_range">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="xpad">5</property>
+                                                            <property name="label"/>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="top_attach">0</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_ranking_rank">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="xpad">5</property>
+                                                            <property name="label"/>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="top_attach">1</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_ranking_speed">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="xpad">5</property>
+                                                            <property name="label"/>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="top_attach">2</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_ranking_avg">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="xpad">5</property>
+                                                            <property name="label"/>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="top_attach">3</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_ranking_stddev">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="xpad">5</property>
+                                                            <property name="label"/>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="top_attach">4</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkLabel" id="label_ranking_dev">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="xpad">5</property>
+                                                            <property name="label"/>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="top_attach">5</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            <property name="y_options"/>
+                                                            </packing>
+                                                            </child>
+                                                            </object>
+                                                            </child>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="padding">10</property>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <object class="GtkTreeView" id="rankingTreeView">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property name="headers-clickable">False</property>
+                                                            </object>
+                                                            <packing>
+                                                            <property name="padding">10</property>
+                                                            </packing>
+                                                            </child>
+                                                          </object>
+                                                        </child>
+                                                      </object>
+                                                    </child>
+                                                  </object>
+                                                </child>
+                                                <child type="label">
+                                                  <object class="GtkLabel" id="label_ranking">
+                                                    <property name="visible">True</property>
+                                                    <property name="label" translatable="yes"><b>Ranking</b></property>
+                                                    <property name="use_markup">True</property>
+                                                  </object>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="padding">10</property>
+                                            <property name="position">3</property>
+                                          </packing>
+                                        </child>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="fill">False</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
-                                        <child>
-                                          <widget class="GtkLabel" id="label14anal">
-                                            <property name="visible">True</property>
-                                            <property name="label" translatable="yes"><b>Analytics:</b></property>
-                                            <property name="use_markup">True</property>
-                                          </widget>
-                                          <packing>
-                                            <property name="type">label_item</property>
-                                          </packing>
-                                        </child>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">4</property>
-                                  </packing>
+                                    <child type="label">
+                                      <object class="GtkLabel" id="label14anal">
+                                        <property name="visible">True</property>
+                                        <property name="label" translatable="yes"><b>Analytics:</b></property>
+                                        <property name="use_markup">True</property>
+                                      </object>
+                                    </child>
+                                  </object>
                                 </child>
-                                <child>
-                                  <widget class="GtkImage" id="image28pre">
+                                <child type="tab">
+                                  <object class="GtkImage" id="image28pre">
                                     <property name="visible">True</property>
                                     <property name="pixbuf">glasses.png</property>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">4</property>
                                     <property name="tab_fill">False</property>
-                                    <property name="type">tab</property>
                                   </packing>
                                 </child>
-                              </widget>
+                              </object>
                             </child>
-                            <child>
-                              <widget class="GtkLabel" id="label2223232232">
+                            <child type="tab">
+                              <object class="GtkLabel" id="label2223232232">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Record</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="tab_fill">False</property>
-                                <property name="type">tab</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkVBox" id="dayview">
+                              <object class="GtkVBox" id="dayview">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkFrame" id="frame1">
+                                  <object class="GtkFrame" id="frame1">
                                     <property name="visible">True</property>
                                     <property name="border_width">6</property>
                                     <property name="label_xalign">0</property>
                                     <property name="shadow_type">none</property>
                                     <child>
-                                      <widget class="GtkAlignment" id="alignment1">
+                                      <object class="GtkAlignment" id="alignment1">
                                         <property name="visible">True</property>
                                         <property name="left_padding">12</property>
                                         <child>
-                                          <widget class="GtkTable" id="table4">
+                                          <object class="GtkTable" id="table4">
                                             <property name="visible">True</property>
                                             <property name="border_width">10</property>
                                             <property name="n_rows">5</property>
@@ -3097,77 +3485,77 @@ Cadence</property>
                                             <property name="column_spacing">3</property>
                                             <property name="row_spacing">6</property>
                                             <child>
-                                              <widget class="GtkLabel" id="d_distance_unit">
+                                              <object class="GtkLabel" id="d_distance_unit">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="label" translatable="yes">Km</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">5</property>
                                                 <property name="right_attach">6</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="day_distance">
+                                              <object class="GtkLabel" id="day_distance">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="label">   </property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">4</property>
                                                 <property name="right_attach">5</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label37">
+                                              <object class="GtkLabel" id="label37">
                                                 <property name="width_request">90</property>
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Distance:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">3</property>
                                                 <property name="right_attach">4</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label38">
+                                              <object class="GtkLabel" id="label38">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Duration:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkHBox" id="hbox11">
+                                              <object class="GtkHBox" id="hbox11">
                                                 <property name="visible">True</property>
                                                 <child>
-                                                  <widget class="GtkLabel" id="day_hour">
+                                                  <object class="GtkLabel" id="day_hour">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">00</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="fill">False</property>
                                                     <property name="position">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label77">
+                                                  <object class="GtkLabel" id="label77">
                                                     <property name="visible">True</property>
                                                     <property name="label">:</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
@@ -3175,10 +3563,10 @@ Cadence</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="day_minute">
+                                                  <object class="GtkLabel" id="day_minute">
                                                     <property name="visible">True</property>
                                                     <property name="label">00</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
@@ -3186,10 +3574,10 @@ Cadence</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label78">
+                                                  <object class="GtkLabel" id="label78">
                                                     <property name="visible">True</property>
                                                     <property name="label">:</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
@@ -3197,17 +3585,17 @@ Cadence</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="day_second">
+                                                  <object class="GtkLabel" id="day_second">
                                                     <property name="visible">True</property>
                                                     <property name="label">00</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
                                                     <property name="position">4</property>
                                                   </packing>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
                                                 <property name="right_attach">2</property>
@@ -3216,346 +3604,346 @@ Cadence</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label79">
+                                              <object class="GtkLabel" id="label79">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">2</property>
                                                 <property name="right_attach">3</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label40">
+                                              <object class="GtkLabel" id="label40">
                                                 <property name="width_request">90</property>
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Speed:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="top_attach">1</property>
                                                 <property name="bottom_attach">2</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="day_average">
+                                              <object class="GtkLabel" id="day_average">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="label">   </property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
                                                 <property name="right_attach">2</property>
                                                 <property name="top_attach">1</property>
                                                 <property name="bottom_attach">2</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="d_speed_unit">
+                                              <object class="GtkLabel" id="d_speed_unit">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="label" translatable="yes">km/h</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">2</property>
                                                 <property name="right_attach">3</property>
                                                 <property name="top_attach">1</property>
                                                 <property name="bottom_attach">2</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label-10">
+                                              <object class="GtkLabel" id="label-10">
                                                 <property name="width_request">90</property>
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Max Speed:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">3</property>
                                                 <property name="right_attach">4</property>
                                                 <property name="top_attach">1</property>
                                                 <property name="bottom_attach">2</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="d_maxspeed_unit">
+                                              <object class="GtkLabel" id="d_maxspeed_unit">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="label" translatable="yes">km/h</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">5</property>
                                                 <property name="right_attach">6</property>
                                                 <property name="top_attach">1</property>
                                                 <property name="bottom_attach">2</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label43">
+                                              <object class="GtkLabel" id="label43">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Calories: </b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="top_attach">4</property>
                                                 <property name="bottom_attach">5</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="day_calories">
+                                              <object class="GtkLabel" id="day_calories">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="label">   </property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
                                                 <property name="right_attach">2</property>
                                                 <property name="top_attach">4</property>
                                                 <property name="bottom_attach">5</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label76">
+                                              <object class="GtkLabel" id="label76">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="label" translatable="yes">Cal</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">2</property>
                                                 <property name="right_attach">3</property>
                                                 <property name="top_attach">4</property>
                                                 <property name="bottom_attach">5</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label39">
+                                              <object class="GtkLabel" id="label39">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Beats avg:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="top_attach">3</property>
                                                 <property name="bottom_attach">4</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="day_beats">
+                                              <object class="GtkLabel" id="day_beats">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="label">   </property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
                                                 <property name="right_attach">2</property>
                                                 <property name="top_attach">3</property>
                                                 <property name="bottom_attach">4</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label74">
+                                              <object class="GtkLabel" id="label74">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="label" translatable="yes">bpm</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">2</property>
                                                 <property name="right_attach">3</property>
                                                 <property name="top_attach">3</property>
                                                 <property name="bottom_attach">4</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label-11">
+                                              <object class="GtkLabel" id="label-11">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Pace:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="top_attach">2</property>
                                                 <property name="bottom_attach">3</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="d_pace_unit">
+                                              <object class="GtkLabel" id="d_pace_unit">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="label" translatable="yes">min/km</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">2</property>
                                                 <property name="right_attach">3</property>
                                                 <property name="top_attach">2</property>
                                                 <property name="bottom_attach">3</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label-12">
+                                              <object class="GtkLabel" id="label-12">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Max Pace:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">3</property>
                                                 <property name="right_attach">4</property>
                                                 <property name="top_attach">2</property>
                                                 <property name="bottom_attach">3</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="d_maxpace_unit">
+                                              <object class="GtkLabel" id="d_maxpace_unit">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="label" translatable="yes">min/km</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">5</property>
                                                 <property name="right_attach">6</property>
                                                 <property name="top_attach">2</property>
                                                 <property name="bottom_attach">3</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label-13">
+                                              <object class="GtkLabel" id="label-13">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Max Beats:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">3</property>
                                                 <property name="right_attach">4</property>
                                                 <property name="top_attach">3</property>
                                                 <property name="bottom_attach">4</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label-14">
+                                              <object class="GtkLabel" id="label-14">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="label" translatable="yes">bpm</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">5</property>
                                                 <property name="right_attach">6</property>
                                                 <property name="top_attach">3</property>
                                                 <property name="bottom_attach">4</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="day_maxspeed">
+                                              <object class="GtkLabel" id="day_maxspeed">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="label">    </property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">4</property>
                                                 <property name="right_attach">5</property>
                                                 <property name="top_attach">1</property>
                                                 <property name="bottom_attach">2</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="day_maxbeats">
+                                              <object class="GtkLabel" id="day_maxbeats">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="label">     </property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">4</property>
                                                 <property name="right_attach">5</property>
                                                 <property name="top_attach">3</property>
                                                 <property name="bottom_attach">4</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="day_pace">
+                                              <object class="GtkLabel" id="day_pace">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="label">   </property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
                                                 <property name="right_attach">2</property>
                                                 <property name="top_attach">2</property>
                                                 <property name="bottom_attach">3</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="day_maxpace">
+                                              <object class="GtkLabel" id="day_maxpace">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="label">   </property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">4</property>
                                                 <property name="right_attach">5</property>
                                                 <property name="top_attach">2</property>
                                                 <property name="bottom_attach">3</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label31">
+                                              <object class="GtkLabel" id="label31">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Total Asc/Desc:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">3</property>
                                                 <property name="right_attach">4</property>
@@ -3564,10 +3952,10 @@ Cadence</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="day_ascdesc">
+                                              <object class="GtkLabel" id="day_ascdesc">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">1</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">4</property>
                                                 <property name="right_attach">5</property>
@@ -3576,12 +3964,12 @@ Cadence</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label32">
+                                              <object class="GtkLabel" id="label32">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="label" translatable="yes">m</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">5</property>
                                                 <property name="right_attach">6</property>
@@ -3589,19 +3977,19 @@ Cadence</property>
                                                 <property name="bottom_attach">5</property>
                                               </packing>
                                             </child>
-                                          </widget>
+                                          </object>
                                         </child>
-                                      </widget>
+                                      </object>
                                     </child>
-                                    <child>
-                                      <widget class="GtkHBox" id="hbox12">
+                                    <child type="label">
+                                      <object class="GtkHBox" id="hbox12">
                                         <property name="visible">True</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label82">
+                                          <object class="GtkLabel" id="label82">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes"> <b>Date:</b></property>
                                             <property name="use_markup">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
@@ -3609,22 +3997,19 @@ Cadence</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="day_topic">
+                                          <object class="GtkLabel" id="day_topic">
                                             <property name="visible">True</property>
                                             <property name="xpad">5</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
-                                      </widget>
-                                      <packing>
-                                        <property name="type">label_item</property>
-                                      </packing>
+                                      </object>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
@@ -3632,18 +4017,18 @@ Cadence</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <widget class="GtkVBox" id="day_vbox">
+                                  <object class="GtkVBox" id="day_vbox">
                                     <property name="visible">True</property>
                                     <child>
-                                      <widget class="GtkHBox" id="hbox41">
+                                      <object class="GtkHBox" id="hbox41">
                                         <property name="visible">True</property>
                                         <property name="border_width">5</property>
                                         <property name="spacing">8</property>
                                         <child>
-                                          <widget class="GtkLabel" id="label-15">
+                                          <object class="GtkLabel" id="label-15">
                                             <property name="visible">True</property>
                                             <property name="label" translatable="yes">Value</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
@@ -3651,87 +4036,88 @@ Cadence</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkComboBoxEntry" id="day_combovalue">
+                                          <object class="GtkComboBoxEntry" id="day_combovalue">
                                             <property name="visible">True</property>
-                                            <property name="items" translatable="yes">Stage Profile
-Stage Velocity
-Stage Profile/velocity</property>
-                                            <signal name="changed" handler="on_day_combovalue_changed"/>
-                                          </widget>
+                                            <signal handler="on_day_combovalue_changed" name="changed"/>
+                                            <property name="model">model5</property>
+					    <property name="text-column">0</property>
+                                            <child>
+                                              <object class="GtkCellRendererText" id="renderer5"/>
+                                              <attributes>
+                                                <attribute name="text">0</attribute>
+                                              </attributes>
+                                            </child>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkLabel" id="label-16">
+                                          <object class="GtkLabel" id="label-16">
                                             <property name="visible">True</property>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="fill">False</property>
                                             <property name="position">2</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <widget class="GtkButton" id="button37">
+                                          <object class="GtkButton" id="button37">
                                             <property name="can_focus">True</property>
                                             <property name="receives_default">False</property>
-                                            <signal name="clicked" handler="on_showmap_clicked"/>
+                                            <signal handler="on_showmap_clicked" name="clicked"/>
                                             <child>
-                                              <widget class="GtkImage" id="image23">
+                                              <object class="GtkImage" id="image23">
                                                 <property name="visible">True</property>
                                                 <property name="stock">gtk-fullscreen</property>
-                                              </widget>
+                                              </object>
                                             </child>
-                                          </widget>
+                                          </object>
                                           <packing>
                                             <property name="expand">False</property>
                                             <property name="fill">False</property>
                                             <property name="position">3</property>
                                           </packing>
                                         </child>
-                                      </widget>
+                                      </object>
                                       <packing>
                                         <property name="expand">False</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
-                                  </widget>
+                                  </object>
                                   <packing>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
+                              </object>
                             </child>
-                            <child>
-                              <widget class="GtkLabel" id="label44">
+                            <child type="tab">
+                              <object class="GtkLabel" id="label44">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">Day</property>
-                              </widget>
+                              </object>
                               <packing>
                                 <property name="position">1</property>
                                 <property name="tab_fill">False</property>
-                                <property name="type">tab</property>
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkVBox" id="weekview">
+                              <object class="GtkVBox" id="weekview">
                                 <property name="visible">True</property>
                                 <child>
-                                  <widget class="GtkFrame" id="frame4">
+                                  <object class="GtkFrame" id="frame4">
                                     <property name="visible">True</property>
                                     <property name="border_width">6</property>
                                     <property name="label_xalign">0</property>
                                     <property name="shadow_type">none</property>
                                     <child>
-                                      <widget class="GtkAlignment" id="alignment4">
+                                      <object class="GtkAlignment" id="alignment4">
                                         <property name="visible">True</property>
                                         <property name="left_padding">12</property>
                                         <child>
-                                          <widget class="GtkTable" id="table8">
+                                          <object class="GtkTable" id="table8">
                                             <property name="visible">True</property>
                                             <property name="border_width">10</property>
                                             <property name="n_rows">5</property>
@@ -3739,77 +4125,77 @@ Stage Profile/velocity</property>
                                             <property name="column_spacing">3</property>
                                             <property name="row_spacing">6</property>
                                             <child>
-                                              <widget class="GtkLabel" id="w_distance_unit">
+                                              <object class="GtkLabel" id="w_distance_unit">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="xpad">5</property>
                                                 <property name="label" translatable="yes">Km</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">5</property>
                                                 <property name="right_attach">6</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="weeka_distance">
+                                              <object class="GtkLabel" id="weeka_distance">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="label">   </property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">4</property>
                                                 <property name="right_attach">5</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label99">
+                                              <object class="GtkLabel" id="label99">
                                                 <property name="width_request">90</property>
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Distance:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">3</property>
                                                 <property name="right_attach">4</property>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label100">
+                                              <object class="GtkLabel" id="label100">
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Duration:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="x_options">GTK_FILL</property>
-                                                <property name="y_options"></property>
+                                                <property name="y_options"/>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkHBox" id="hbox15">
+                                              <object class="GtkHBox" id="hbox15">
                                                 <property name="visible">True</property>
                                                 <child>
-                                                  <widget class="GtkLabel" id="weeka_hour">
+                                                  <object class="GtkLabel" id="weeka_hour">
                                                     <property name="visible">True</property>
                                                     <property name="xalign">1</property>
                                                     <property name="label">000</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="fill">False</property>
                                                     <property name="position">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label108">
+                                                  <object class="GtkLabel" id="label108">
                                                     <property name="visible">True</property>
                                                     <property name="label">:</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
@@ -3817,10 +4203,10 @@ Stage Profile/velocity</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="weeka_minute">
+                                                  <object class="GtkLabel" id="weeka_minute">
                                                     <property name="visible">True</property>
                                                     <property name="label">00</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
@@ -3828,10 +4214,10 @@ Stage Profile/velocity</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="label109">
+                                                  <object class="GtkLabel" id="label109">
                                                     <property name="visible">True</property>
                                                     <property name="label">:</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
@@ -3839,17 +4225,17 @@ Stage Profile/velocity</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <widget class="GtkLabel" id="weeka_second">
+                                                  <object class="GtkLabel" id="weeka_second">
                                                     <property name="visible">True</property>
                                                     <property name="label">00</property>
-                                                  </widget>
+                                                  </object>
                                                   <packing>
                                                     <property name="expand">False</property>
                                                     <property name="fill">False</property>
                                                     <property name="position">4</property>
                                                   </packing>
                                                 </child>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="left_attach">1</property>
                                                 <property name="right_attach">2</property>
@@ -3858,347 +4244,347 @@ Stage Profile/velocity</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <widget class="GtkLabel" id="label102">
+                                              <object class="GtkLabel" id="label102">
                                                 <property name="width_request">90</property>
                                                 <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes"><b>Speed:</b></property>
                                                 <property name="use_markup">True</property>
-                                              </widget>
+                                              </object>
                                               <packing>
                                                 <property name="top_attach">1</property>
                                                 <property name="bottom_attach">2</property>