diff --git a/sleepyhead/daily.ui b/sleepyhead/daily.ui
index 4bec0b94..72c237ca 100644
--- a/sleepyhead/daily.ui
+++ b/sleepyhead/daily.ui
@@ -23,7 +23,16 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -52,7 +61,16 @@
         <property name="spacing">
          <number>0</number>
         </property>
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
@@ -340,6 +358,7 @@ QToolButton:pressed {
   background: transparent;
  border: 2px solid transparent;
   border-radius: 8px;
+ width: 5em;
 }
 
 #qt_calendar_monthbutton:hover {
@@ -402,7 +421,16 @@ QToolButton:pressed {
          <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
@@ -431,7 +459,16 @@ QToolButton:pressed {
          </item>
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_9">
-           <property name="margin">
+           <property name="leftMargin">
+            <number>4</number>
+           </property>
+           <property name="topMargin">
+            <number>4</number>
+           </property>
+           <property name="rightMargin">
+            <number>4</number>
+           </property>
+           <property name="bottomMargin">
             <number>4</number>
            </property>
            <item>
@@ -488,7 +525,16 @@ QToolButton:pressed {
          <property name="spacing">
           <number>0</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
           <number>0</number>
          </property>
          <item>
@@ -822,7 +868,16 @@ QSlider::handle:horizontal  {
          <property name="spacing">
           <number>6</number>
          </property>
-         <property name="margin">
+         <property name="leftMargin">
+          <number>4</number>
+         </property>
+         <property name="topMargin">
+          <number>4</number>
+         </property>
+         <property name="rightMargin">
+          <number>4</number>
+         </property>
+         <property name="bottomMargin">
           <number>4</number>
          </property>
          <item>
@@ -1032,7 +1087,7 @@ QToolButton:pressed {
              <string notr="true"/>
             </property>
             <property name="sizeAdjustPolicy">
-             <enum>QComboBox::AdjustToMinimumContentsLengthWithIcon</enum>
+             <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
             </property>
             <property name="iconSize">
              <size>
diff --git a/sleepyhead/docs/intro.html b/sleepyhead/docs/intro.html
index 5694817f..a6dfbe3c 100644
--- a/sleepyhead/docs/intro.html
+++ b/sleepyhead/docs/intro.html
@@ -8,7 +8,6 @@
 <div align=center><font color="red"><h2>PLEASE READ CAREFULLY</h2></font></div>
 <p>SleepyHead is intended merely as a data viewer, and definitely not a substitute for competent medical guidance from your Doctor.</p>
 
-
 <p>Accuracy of any data displayed is not and can not be guaranteed.</p>
 
 <p>Any reports generated are for PERSONAL USE ONLY, and NOT IN ANY WAY fit for compliance or medical diagnostic purposes.</p>
diff --git a/sleepyhead/overview.ui b/sleepyhead/overview.ui
index 878923d0..da4a967f 100644
--- a/sleepyhead/overview.ui
+++ b/sleepyhead/overview.ui
@@ -17,7 +17,16 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -166,6 +175,22 @@
         <property name="toolTip">
          <string>Reset view to selected date range</string>
         </property>
+        <property name="styleSheet">
+         <string notr="true">QToolButton {
+ background: transparent;
+ border-radius: 8px;
+ border: 2px solid transparent;
+}
+
+QToolButton:hover {
+ border: 2px solid #456789;
+}
+
+QToolButton:pressed {
+ border: 2px solid #456789;
+ background-color: #89abcd;
+}</string>
+        </property>
         <property name="text">
          <string>...</string>
         </property>
@@ -193,6 +218,22 @@
         <property name="toolTip">
          <string>Toggle Graph Visibility</string>
         </property>
+        <property name="styleSheet">
+         <string notr="true">QToolButton {
+ background: transparent;
+ border-radius: 8px;
+ border: 2px solid transparent;
+}
+
+QToolButton:hover {
+ border: 2px solid #456789;
+}
+
+QToolButton:pressed {
+ border: 2px solid #456789;
+ background-color: #89abcd;
+}</string>
+        </property>
         <property name="text">
          <string>...</string>
         </property>
diff --git a/sleepyhead/oximetry.ui b/sleepyhead/oximetry.ui
index 21fa65bd..652ef5fc 100644
--- a/sleepyhead/oximetry.ui
+++ b/sleepyhead/oximetry.ui
@@ -17,7 +17,16 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
@@ -32,6 +41,12 @@
    </item>
    <item>
     <widget class="QFrame" name="frame">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
@@ -59,8 +74,17 @@
         <property name="spacing">
          <number>4</number>
         </property>
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
         <item>
          <widget class="QLabel" name="label_4">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>Date</string>
           </property>
@@ -68,6 +92,12 @@
         </item>
         <item>
          <widget class="QDateTimeEdit" name="dateEdit">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="displayFormat">
            <string>d/MM/yy h:mm:ss AP</string>
           </property>
@@ -75,6 +105,28 @@
         </item>
         <item>
          <widget class="QToolButton" name="resetTimeButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">QToolButton {
+ background: transparent;
+ border-radius: 8px;
+ border: 2px solid transparent;
+}
+
+QToolButton:hover {
+ border: 2px solid #456789;
+}
+
+QToolButton:pressed {
+ border: 2px solid #456789;
+ background-color: #89abcd;
+}</string>
+          </property>
           <property name="text">
            <string>R&amp;eset</string>
           </property>
@@ -98,6 +150,12 @@
         </item>
         <item>
          <widget class="QLabel" name="label_3">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>SpO2</string>
           </property>
@@ -151,7 +209,7 @@
           <property name="frameShadow">
            <enum>QFrame::Sunken</enum>
           </property>
-          <property name="numDigits">
+          <property name="digitCount">
            <number>3</number>
           </property>
           <property name="segmentStyle">
@@ -177,6 +235,12 @@
         </item>
         <item>
          <widget class="QLabel" name="label_2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>Pulse</string>
           </property>
@@ -233,7 +297,7 @@
           <property name="frameShadow">
            <enum>QFrame::Sunken</enum>
           </property>
-          <property name="numDigits">
+          <property name="digitCount">
            <number>3</number>
           </property>
           <property name="segmentStyle">
@@ -256,6 +320,28 @@
         </item>
         <item>
          <widget class="QToolButton" name="saveButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">QToolButton {
+ background: transparent;
+ border-radius: 8px;
+ border: 2px solid transparent;
+}
+
+QToolButton:hover {
+ border: 2px solid #456789;
+}
+
+QToolButton:pressed {
+ border: 2px solid #456789;
+ background-color: #89abcd;
+}</string>
+          </property>
           <property name="text">
            <string>...</string>
           </property>
@@ -267,13 +353,34 @@
         </item>
         <item>
          <widget class="QPushButton" name="openButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
           <property name="text">
            <string>&amp;Open .spo/R File</string>
           </property>
+          <property name="checkable">
+           <bool>false</bool>
+          </property>
+          <property name="flat">
+           <bool>false</bool>
+          </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="ImportButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>Serial &amp;Import</string>
           </property>
@@ -282,7 +389,7 @@
         <item>
          <widget class="QPushButton" name="RunButton">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -299,8 +406,17 @@
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <property name="sizeConstraint">
+         <enum>QLayout::SetMinimumSize</enum>
+        </property>
         <item>
          <widget class="QLabel" name="label">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>Serial Port</string>
           </property>
@@ -308,6 +424,12 @@
         </item>
         <item>
          <widget class="QComboBox" name="SerialPortsCombo">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="minimumSize">
            <size>
             <width>120</width>
@@ -318,6 +440,12 @@
         </item>
         <item>
          <widget class="QToolButton" name="RefreshPortsButton">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>&amp;Rescan Ports</string>
           </property>