diff --git a/sleepyhead/SleepLib/loader_plugins/cms50_loader.h b/sleepyhead/SleepLib/loader_plugins/cms50_loader.h
index d589fe58..5d1c8fa0 100644
--- a/sleepyhead/SleepLib/loader_plugins/cms50_loader.h
+++ b/sleepyhead/SleepLib/loader_plugins/cms50_loader.h
@@ -42,6 +42,8 @@ Q_OBJECT
 
     virtual void process();
 
+    virtual bool isStartTimeValid() { return !cms50dplus; }
+
 protected slots:
 //    virtual void dataAvailable();
     virtual void resetImportTimeout();
diff --git a/sleepyhead/SleepLib/serialoximeter.h b/sleepyhead/SleepLib/serialoximeter.h
index 21360c46..c90b02e3 100644
--- a/sleepyhead/SleepLib/serialoximeter.h
+++ b/sleepyhead/SleepLib/serialoximeter.h
@@ -65,6 +65,8 @@ public:
     QVector<OxiRecord> oxirec;
 
     QDateTime startTime() { return m_startTime; }
+    virtual bool isStartTimeValid() { return true; }
+
 
 signals:
     void noDeviceFound();
diff --git a/sleepyhead/oximeterimport.cpp b/sleepyhead/oximeterimport.cpp
index 73a5440b..c5ac13b9 100644
--- a/sleepyhead/oximeterimport.cpp
+++ b/sleepyhead/oximeterimport.cpp
@@ -22,11 +22,13 @@ OximeterImport::OximeterImport(QWidget *parent) :
     setWindowTitle(tr("Oximeter Import Wizard"));
     ui->stackedWidget->setCurrentIndex(0);
     oximodule = nullptr;
-    ui->retryButton->setVisible(false);
     liveView = new gGraphView(this);
     liveView->setVisible(false);
+    ui->retryButton->setVisible(false);
     ui->stopButton->setVisible(false);
-    ui->syncSaveButton->setVisible(false);
+    ui->saveButton->setVisible(false);
+    ui->syncButton->setVisible(false);
+
 
     QVBoxLayout * lvlayout = new QVBoxLayout;
     lvlayout->setMargin(0);
@@ -80,6 +82,8 @@ OximeterImport::OximeterImport(QWidget *parent) :
         ui->nextButton->setVisible(true);
         ui->informationButton->setVisible(false);
     }
+
+    ui->dateTimeEdit->setMinimumHeight(ui->dateTimeEdit->height()+10);
 }
 
 OximeterImport::~OximeterImport()
@@ -236,13 +240,8 @@ void OximeterImport::finishedImport(SerialOximeter * oxi)
     oximodule->process();
     disconnect(oximodule, SIGNAL(updateProgress(int,int)), this, SLOT(doUpdateProgress(int,int)));
 
-    ui->stackedWidget->setCurrentWidget(ui->syncPage);
-    ui->syncSaveButton->setVisible(true);
 
-    ui->calendarWidget->setMinimumDate(PROFILE.FirstDay());
-    ui->calendarWidget->setMaximumDate(PROFILE.LastDay());
-
-    on_calendarWidget_clicked(PROFILE.LastDay());
+    on_syncButton_clicked();
 }
 
 void OximeterImport::doUpdateProgress(int v, int t)
@@ -286,13 +285,7 @@ void OximeterImport::on_fileImportButton_clicked()
     }
     ui->informationButton->setVisible(false);
 
-    ui->stackedWidget->setCurrentWidget(ui->syncPage);
-    ui->syncSaveButton->setVisible(true);
-
-    ui->calendarWidget->setMinimumDate(PROFILE.FirstDay());
-    ui->calendarWidget->setMaximumDate(PROFILE.LastDay());
-
-    on_calendarWidget_clicked(PROFILE.LastDay());
+    on_syncButton_clicked();
 }
 
 void OximeterImport::on_liveImportButton_clicked()
@@ -370,14 +363,10 @@ void OximeterImport::finishedRecording()
 
     disconnect(oximodule, SIGNAL(updatePlethy(QByteArray)), this, SLOT(on_updatePlethy(QByteArray)));
 
-// Remember to clear sessionlist before deleting dummyday. or it will destroy session.
 //    delete dummyday;
 
     //ui->stackedWidget->setCurrentWidget(ui->syncPage);
-    ui->syncSaveButton->setVisible(true);
-
-    ui->calendarWidget->setMinimumDate(PROFILE.FirstDay());
-    ui->calendarWidget->setMaximumDate(PROFILE.LastDay());
+    ui->syncButton->setVisible(true);
 
     plethyGraph->SetMinX(start_ti);
     liveView->SetXBounds(start_ti, ti, 0, true);
@@ -385,7 +374,6 @@ void OximeterImport::finishedRecording()
     plethyGraph->setBlockZoom(false);
 
 
-    // detect oximeter
 }
 
 void OximeterImport::on_retryButton_clicked()
@@ -466,17 +454,20 @@ void OximeterImport::on_sessionForwardButton_clicked()
 
 void OximeterImport::on_radioSyncCPAP_clicked()
 {
-    if (!ui->syncCPAPGroup->isVisible()) {
-        if (sessbar->selected() < 0) {
-            int idx = 0;
-            if (idx < sessbar->count()) {
-                sessbar->setSelected(idx);
-                QDateTime datetime = QDateTime::fromMSecsSinceEpoch(sessbar->session(idx)->first());
-                ui->dateTimeEdit->setDateTime(datetime);
-                sessbar->update();
-            }
+    int idx = sessbar->selected();
+    if (idx < 0) {
+        if (sessbar->count() > 0) {
+            idx = 0;
+            sessbar->setSelected(0);
+            sessbar->update();
         }
     }
+    if (idx >= 0) {
+        QDateTime datetime = QDateTime::fromMSecsSinceEpoch(sessbar->session(idx)->first());
+        ui->dateTimeEdit->setDateTime(datetime);
+    }
+
+
     ui->syncCPAPGroup->setVisible(true);
 
 }
@@ -484,16 +475,7 @@ void OximeterImport::on_radioSyncCPAP_clicked()
 void OximeterImport::on_radioSyncOximeter_clicked()
 {
     ui->syncCPAPGroup->setVisible(false);
-}
-
-void OximeterImport::on_radioSyncManually_clicked()
-{
-    ui->syncCPAPGroup->setVisible(false);
-}
-
-void OximeterImport::on_syncSaveButton_clicked()
-{
-
+    if (oximodule && oximodule->isStartTimeValid()) ui->dateTimeEdit->setDateTime(oximodule->startTime());
 }
 
 void OximeterImport::on_updatePlethy(QByteArray plethy)
@@ -620,3 +602,30 @@ void OximeterImport::on_informationButton_clicked()
     ui->informationButton->setVisible(false);
 
 }
+
+void OximeterImport::on_syncButton_clicked()
+{
+    ui->stackedWidget->setCurrentWidget(ui->syncPage);
+
+    ui->syncButton->setVisible(false);
+    ui->saveButton->setVisible(true);
+
+    ui->calendarWidget->setMinimumDate(PROFILE.FirstDay());
+    ui->calendarWidget->setMaximumDate(PROFILE.LastDay());
+
+    on_calendarWidget_clicked(PROFILE.LastDay());
+    Q_ASSERT(oximodule != nullptr);
+
+    ui->radioSyncOximeter->setChecked(true);
+    on_radioSyncOximeter_clicked();
+
+    if (ELplethy != nullptr) {
+        // Live Recording
+        ui->labelSyncOximeter->setText(tr("I want to use the time my computer recorded for this live oximetry session."));
+    } else if (!oximodule->isStartTimeValid()) {
+        // Oximeter doesn't provide a clock
+        ui->labelSyncOximeter->setText(tr("I need to set the time manually, because my oximeter doesn't have an internal clock."));
+    }
+
+
+}
diff --git a/sleepyhead/oximeterimport.h b/sleepyhead/oximeterimport.h
index d2890c79..a33676d3 100644
--- a/sleepyhead/oximeterimport.h
+++ b/sleepyhead/oximeterimport.h
@@ -20,6 +20,7 @@ public:
     explicit OximeterImport(QWidget *parent = 0);
     ~OximeterImport();
 
+
 private slots:
     void on_nextButton_clicked();
 
@@ -47,10 +48,6 @@ private slots:
 
     void on_radioSyncOximeter_clicked();
 
-    void on_radioSyncManually_clicked();
-
-    void on_syncSaveButton_clicked();
-
     void on_cancelButton_clicked();
 
     void on_showLiveGraphs_clicked(bool checked);
@@ -59,6 +56,8 @@ private slots:
 
     void on_informationButton_clicked();
 
+    void on_syncButton_clicked();
+
 protected slots:
     void on_updatePlethy(QByteArray plethy);
     void finishedRecording();
diff --git a/sleepyhead/oximeterimport.ui b/sleepyhead/oximeterimport.ui
index c3377a17..a8fc5fdb 100644
--- a/sleepyhead/oximeterimport.ui
+++ b/sleepyhead/oximeterimport.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>915</width>
-    <height>615</height>
+    <width>905</width>
+    <height>625</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -644,7 +644,7 @@ border-radius: 0px;</string>
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>1</number>
+        <number>4</number>
        </property>
        <widget class="QWidget" name="welcomePage">
         <layout class="QVBoxLayout" name="verticalLayout">
@@ -1312,11 +1312,17 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
            <item>
             <widget class="QGroupBox" name="groupBox_2">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+              <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>200</height>
+              </size>
+             </property>
              <property name="title">
               <string>Day recording (normally would of) started</string>
              </property>
@@ -1334,7 +1340,14 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
                <number>0</number>
               </property>
               <item>
-               <widget class="QCalendarWidget" name="calendarWidget"/>
+               <widget class="QCalendarWidget" name="calendarWidget">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+               </widget>
               </item>
              </layout>
             </widget>
@@ -1342,16 +1355,67 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
            <item>
             <widget class="QGroupBox" name="groupBox_3">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                <horstretch>1</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="minimumSize">
+              <size>
+               <width>0</width>
+               <height>200</height>
+              </size>
+             </property>
              <property name="title">
               <string>Oximeter Starting time</string>
              </property>
-             <layout class="QVBoxLayout" name="verticalLayout_13">
-              <item>
+             <layout class="QGridLayout" name="gridLayout">
+              <item row="2" column="1">
+               <widget class="QLabel" name="labelSyncOximeter">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>I want to use the time reported by my oximeter's built in clock.</string>
+                </property>
+                <property name="wordWrap">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QLabel" name="labelSyncCPAP">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>I started this oximeter recording at (or near) the same time as a session on my CPAP machine.</string>
+                </property>
+                <property name="wordWrap">
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QRadioButton" name="radioSyncCPAP">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="0" colspan="2">
                <widget class="QLabel" name="label_9">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -1360,7 +1424,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
                  </sizepolicy>
                 </property>
                 <property name="text">
-                 <string>Which timesource do you want to use to sync this session?</string>
+                 <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;SleepyHead needs a starting time to know where to save this oximetry session to.&lt;/p&gt;&lt;p&gt;Choose one of the following options:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                 </property>
                 <property name="alignment">
                  <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@@ -1370,28 +1434,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
                 </property>
                </widget>
               </item>
-              <item>
-               <widget class="QRadioButton" name="radioSyncCPAP">
-                <property name="text">
-                 <string>CPAP</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QRadioButton" name="radioSyncOximeter">
-                <property name="text">
-                 <string>Oximeter</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QRadioButton" name="radioSyncManually">
-                <property name="text">
-                 <string>Enter Manually</string>
-                </property>
-               </widget>
-              </item>
-              <item>
+              <item row="3" column="1">
                <spacer name="verticalSpacer_4">
                 <property name="orientation">
                  <enum>Qt::Vertical</enum>
@@ -1404,6 +1447,19 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
                 </property>
                </spacer>
               </item>
+              <item row="2" column="0">
+               <widget class="QRadioButton" name="radioSyncOximeter">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>
@@ -1411,6 +1467,12 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
          </item>
          <item>
           <widget class="QGroupBox" name="syncCPAPGroup">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="title">
             <string>Choose CPAP session to sync to:</string>
            </property>
@@ -1444,6 +1506,12 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
               </property>
               <item>
                <widget class="QToolButton" name="sessionBackButton">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="text">
                  <string>...</string>
                 </property>
@@ -1461,6 +1529,12 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
                   <height>40</height>
                  </size>
                 </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>16777215</width>
+                  <height>40</height>
+                 </size>
+                </property>
                 <property name="frameShape">
                  <enum>QFrame::StyledPanel</enum>
                 </property>
@@ -1471,6 +1545,12 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
               </item>
               <item>
                <widget class="QToolButton" name="sessionForwardButton">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
                 <property name="text">
                  <string>...</string>
                 </property>
@@ -1487,27 +1567,68 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_9">
+           <item>
+            <spacer name="horizontalSpacer_5">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
            <item>
             <widget class="QLabel" name="label_10">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
              <property name="text">
               <string>You can manually adjust the time here if required:</string>
              </property>
             </widget>
            </item>
+           <item>
+            <spacer name="horizontalSpacer_6">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>40</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
            <item>
             <widget class="QDateTimeEdit" name="dateTimeEdit">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
              <property name="font">
               <font>
-               <pointsize>17</pointsize>
+               <pointsize>40</pointsize>
               </font>
              </property>
+             <property name="buttonSymbols">
+              <enum>QAbstractSpinBox::UpDownArrows</enum>
+             </property>
              <property name="displayFormat">
               <string>hh:mm:ss AP</string>
              </property>
             </widget>
            </item>
            <item>
-            <spacer name="horizontalSpacer_6">
+            <spacer name="horizontalSpacer_4">
              <property name="orientation">
               <enum>Qt::Horizontal</enum>
              </property>
@@ -1526,6 +1647,9 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
@@ -1591,7 +1715,14 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="syncSaveButton">
+       <widget class="QPushButton" name="syncButton">
+        <property name="text">
+         <string>&amp;Sync and Save</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="saveButton">
         <property name="text">
          <string>&amp;Save and Finish</string>
         </property>
diff --git a/sleepyhead/statistics.cpp b/sleepyhead/statistics.cpp
index 4bb4fc66..b697f54c 100644
--- a/sleepyhead/statistics.cpp
+++ b/sleepyhead/statistics.cpp
@@ -528,11 +528,11 @@ QString Statistics::GenerateHTML()
 
 
     if (mach.size() == 0) {
-        html += "<table class=curved height=60%>"; //cellpadding=2 cellspacing=0 border=0
+        html += "<div align=center><table class=curved height=60%>"; //cellpadding=2 cellspacing=0 border=0
         html += "<tr><td align=center><h1>" + tr("Please Import Some Data") + "</h1><i>" +
                 tr("SleepyHead is pretty much useless without it.") + "</i><br/><p>" +
                 tr("It might be a good idea to check preferences first,</br>as there are some options that affect import.")
-                + "</p><p>" + tr("First import can take a few minutes.") + "</p></td></tr></table>";
+                + "</p><p>" + tr("First import can take a few minutes.") + "</p></td></tr></table></div>";
         html += htmlFooter();
         return html;
     }