diff --git a/Clocker/Clocker/Clocker.entitlements b/Clocker/Clocker/Clocker.entitlements
index 1754713..9f43c40 100644
--- a/Clocker/Clocker/Clocker.entitlements
+++ b/Clocker/Clocker/Clocker.entitlements
@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.developer.icloud-container-identifiers</key>
-	<array/>
-	<key>com.apple.developer.ubiquity-kvstore-identifier</key>
-	<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
 	<key>com.apple.security.cs.disable-library-validation</key>
diff --git a/Clocker/Clocker/en.lproj/Panel.xib b/Clocker/Clocker/en.lproj/Panel.xib
index b6abe5b..8e150fc 100755
--- a/Clocker/Clocker/en.lproj/Panel.xib
+++ b/Clocker/Clocker/en.lproj/Panel.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -61,7 +61,6 @@
                                             <tableColumns>
                                                 <tableColumn width="347" minWidth="303" maxWidth="1000" id="LTt-db-Dwv">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                                        <font key="font" metaFont="message" size="11"/>
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                     </tableHeaderCell>
@@ -79,9 +78,9 @@
                                                                 <textField verticalHuggingPriority="750" verticalCompressionResistancePriority="749" tag="102" preferredMaxLayoutWidth="72" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QUd-7D-q14">
                                                                     <rect key="frame" x="28" y="50" width="189" height="22"/>
                                                                     <constraints>
-                                                                        <constraint firstAttribute="height" constant="22" id="JkG-8f-zhJ"/>
+                                                                        <constraint firstAttribute="height" constant="22" identifier="relative-day-height" id="JkG-8f-zhJ"/>
                                                                     </constraints>
-                                                                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" placeholderString="Tomorrow" usesSingleLineMode="YES" id="74U-rv-5xj">
+                                                                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" usesSingleLineMode="YES" id="74U-rv-5xj">
                                                                         <font key="font" size="13" name="Avenir-Heavy"/>
                                                                         <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -178,22 +177,22 @@
                                                                 </stackView>
                                                             </subviews>
                                                             <constraints>
-                                                                <constraint firstItem="etF-33-bCB" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="12" id="0yr-0x-Mrj"/>
-                                                                <constraint firstItem="QUd-7D-q14" firstAttribute="top" secondItem="etF-33-bCB" secondAttribute="bottom" constant="7" id="BEN-9I-ixx"/>
+                                                                <constraint firstItem="etF-33-bCB" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="12" identifier="custom-name-top-space" id="0yr-0x-Mrj"/>
+                                                                <constraint firstItem="Cbs-xa-uR7" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="20" id="5tC-62-8VG"/>
+                                                                <constraint firstItem="QUd-7D-q14" firstAttribute="top" secondItem="etF-33-bCB" secondAttribute="bottom" constant="7" identifier="location-bottom-constraint" id="BEN-9I-ixx"/>
+                                                                <constraint firstItem="vnv-J2-7r1" firstAttribute="top" secondItem="etF-33-bCB" secondAttribute="top" constant="-3" identifier="time-top-space" id="Ddo-fy-t7b"/>
                                                                 <constraint firstItem="uOg-ij-alO" firstAttribute="trailing" secondItem="vnv-J2-7r1" secondAttribute="trailing" id="ENb-Ol-gDA"/>
                                                                 <constraint firstItem="etF-33-bCB" firstAttribute="leading" secondItem="Cbs-xa-uR7" secondAttribute="trailing" id="F6z-Ym-WBn"/>
                                                                 <constraint firstAttribute="trailing" secondItem="6At-J8-gzZ" secondAttribute="trailing" constant="2" id="KOx-Xx-Lcj"/>
                                                                 <constraint firstItem="vnv-J2-7r1" firstAttribute="leading" secondItem="etF-33-bCB" secondAttribute="trailing" constant="10" id="QNj-Ip-TrA"/>
                                                                 <constraint firstAttribute="bottom" secondItem="6At-J8-gzZ" secondAttribute="bottom" id="ScN-F7-6DA"/>
                                                                 <constraint firstItem="6At-J8-gzZ" firstAttribute="leading" secondItem="QUd-7D-q14" secondAttribute="leading" id="TxT-72-I4I"/>
-                                                                <constraint firstItem="Cbs-xa-uR7" firstAttribute="top" secondItem="etF-33-bCB" secondAttribute="top" constant="8" id="Zbj-XR-eXs"/>
                                                                 <constraint firstItem="sML-fJ-nbv" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" constant="-2" id="fDa-0N-dW8"/>
                                                                 <constraint firstItem="sML-fJ-nbv" firstAttribute="leading" secondItem="QUd-7D-q14" secondAttribute="trailing" constant="10" id="hFC-6L-ahw"/>
                                                                 <constraint firstItem="uOg-ij-alO" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" constant="-2" id="jnZ-S4-3aC"/>
                                                                 <constraint firstItem="uOg-ij-alO" firstAttribute="leading" secondItem="sML-fJ-nbv" secondAttribute="trailing" constant="2" id="lOG-UM-1UX"/>
                                                                 <constraint firstItem="Cbs-xa-uR7" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" id="nZr-y8-mHE"/>
                                                                 <constraint firstItem="QUd-7D-q14" firstAttribute="leading" secondItem="etF-33-bCB" secondAttribute="leading" id="qpc-l4-zYv"/>
-                                                                <constraint firstItem="vnv-J2-7r1" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="9" id="vGp-XY-wiJ"/>
                                                                 <constraint firstAttribute="trailing" secondItem="vnv-J2-7r1" secondAttribute="trailing" constant="20" id="zXo-eA-0bQ"/>
                                                             </constraints>
                                                             <connections>
diff --git a/Clocker/Panel/Data Layer/TimezoneDataOperations.swift b/Clocker/Panel/Data Layer/TimezoneDataOperations.swift
index 3b68f1d..6fa3466 100644
--- a/Clocker/Panel/Data Layer/TimezoneDataOperations.swift	
+++ b/Clocker/Panel/Data Layer/TimezoneDataOperations.swift	
@@ -138,16 +138,20 @@ extension TimezoneDataOperations {
     }
 
     func date(with sliderValue: Int, displayType: CLDateDisplayType) -> String {
-        var currentCalendar = Calendar(identifier: .gregorian)
-        currentCalendar.locale = Locale.autoupdatingCurrent
-
-        let convertedDate = timezoneDate(with: sliderValue, currentCalendar)
-
         guard let relativeDayPreference = DataStore.shared().retrieve(key: CLRelativeDateKey) as? NSNumber else {
             assertionFailure("Data was unexpectedly nil")
             return CLEmptyString
         }
 
+        if relativeDayPreference.intValue == 3 {
+            return CLEmptyString
+        }
+
+        var currentCalendar = Calendar(identifier: .gregorian)
+        currentCalendar.locale = Locale.autoupdatingCurrent
+
+        let convertedDate = timezoneDate(with: sliderValue, currentCalendar)
+
         if displayType == CLDateDisplayType.panelDisplay {
             // Yesterday, tomorrow, etc
             if relativeDayPreference.intValue == 0 {
diff --git a/Clocker/Panel/UI/FloatingWindow.xib b/Clocker/Panel/UI/FloatingWindow.xib
index f983279..b736027 100644
--- a/Clocker/Panel/UI/FloatingWindow.xib
+++ b/Clocker/Panel/UI/FloatingWindow.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -37,7 +37,7 @@
             <windowCollectionBehavior key="collectionBehavior" moveToActiveSpace="YES" ignoresCycle="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="1000" y="379" width="350" height="460"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <value key="minSize" type="size" width="150" height="50"/>
             <value key="maxSize" type="size" width="350" height="800"/>
             <view key="contentView" id="qEx-SC-5Qd">
@@ -55,14 +55,13 @@
                                     <subviews>
                                         <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="80" viewBased="YES" id="3js-Fl-DdU" customClass="PanelTableView" customModule="Clocker" customModuleProvider="target">
                                             <rect key="frame" x="0.0" y="0.0" width="350" height="265"/>
-                                            <autoresizingMask key="autoresizingMask"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="3" height="1"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                             <tableColumns>
                                                 <tableColumn width="347" minWidth="303" maxWidth="1000" id="009-6N-KRz">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                                        <font key="font" metaFont="smallSystem"/>
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                     </tableHeaderCell>
@@ -78,7 +77,7 @@
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
                                                                 <textField verticalHuggingPriority="751" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="751" tag="100" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="Nov-Lq-MHq">
-                                                                    <rect key="frame" x="33" y="45" width="178" height="25"/>
+                                                                    <rect key="frame" x="33" y="50" width="178" height="20"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" placeholderString="Timezone Name" id="NN9-pF-Axo">
                                                                         <font key="font" size="15" name="Avenir-Light"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -86,19 +85,19 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                                 <textField verticalHuggingPriority="749" tag="102" preferredMaxLayoutWidth="72" translatesAutoresizingMaskIntoConstraints="NO" id="KEf-HK-1oi">
-                                                                    <rect key="frame" x="33" y="19" width="76" height="20"/>
+                                                                    <rect key="frame" x="33" y="24" width="76" height="20"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="72" identifier="width" id="4Qb-vu-Upf"/>
                                                                         <constraint firstAttribute="height" constant="20" id="zbG-5a-kZz"/>
                                                                     </constraints>
-                                                                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" placeholderString="Tomorrow" usesSingleLineMode="YES" id="MAt-8Z-HKJ">
+                                                                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" usesSingleLineMode="YES" id="MAt-8Z-HKJ">
                                                                         <font key="font" size="13" name="Avenir-Heavy"/>
                                                                         <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                     </textFieldCell>
                                                                 </textField>
                                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="751" tag="101" preferredMaxLayoutWidth="110" translatesAutoresizingMaskIntoConstraints="NO" id="vG5-PS-a35">
-                                                                    <rect key="frame" x="215" y="33" width="114" height="37"/>
+                                                                    <rect key="frame" x="215" y="43" width="114" height="30"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="110" id="DyD-zQ-QUy"/>
                                                                     </constraints>
@@ -109,7 +108,7 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NYh-Nx-Z7X">
-                                                                    <rect key="frame" x="33" y="-3" width="296" height="22"/>
+                                                                    <rect key="frame" x="33" y="2" width="296" height="22"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="height" constant="22" id="S78-bF-ZaL"/>
                                                                     </constraints>
@@ -120,7 +119,7 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                                 <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fsY-Co-wno">
-                                                                    <rect key="frame" x="279" y="22" width="50" height="17"/>
+                                                                    <rect key="frame" x="279" y="27" width="50" height="17"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" relation="lessThanOrEqual" constant="59" id="UUh-5p-Mx2"/>
                                                                         <constraint firstAttribute="height" constant="17" id="qB5-wj-dAu"/>
@@ -132,7 +131,7 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="WfK-L4-OKG">
-                                                                    <rect key="frame" x="259" y="21" width="20" height="20"/>
+                                                                    <rect key="frame" x="259" y="26" width="20" height="20"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" constant="20" id="gDq-Uj-NYZ"/>
                                                                         <constraint firstAttribute="height" constant="20" id="rIi-uA-qtx"/>
@@ -180,21 +179,21 @@
                                                             </subviews>
                                                             <constraints>
                                                                 <constraint firstItem="NYh-Nx-Z7X" firstAttribute="leading" secondItem="KEf-HK-1oi" secondAttribute="leading" id="1Of-Y1-aUQ"/>
-                                                                <constraint firstItem="xGh-3b-9zf" firstAttribute="top" secondItem="Nov-Lq-MHq" secondAttribute="top" constant="5" id="7tt-Ds-vwo"/>
                                                                 <constraint firstItem="NYh-Nx-Z7X" firstAttribute="top" secondItem="KEf-HK-1oi" secondAttribute="bottom" id="Ape-pV-pDJ"/>
                                                                 <constraint firstItem="vG5-PS-a35" firstAttribute="leading" secondItem="Nov-Lq-MHq" secondAttribute="trailing" constant="8" id="CHc-la-Uaw"/>
                                                                 <constraint firstItem="KEf-HK-1oi" firstAttribute="top" secondItem="Nov-Lq-MHq" secondAttribute="bottom" constant="6" id="EK0-Kr-ytA"/>
                                                                 <constraint firstAttribute="trailing" secondItem="NYh-Nx-Z7X" secondAttribute="trailing" constant="20" id="HP8-8w-hBH"/>
                                                                 <constraint firstItem="KEf-HK-1oi" firstAttribute="leading" secondItem="Nov-Lq-MHq" secondAttribute="leading" id="HmM-3n-rqp"/>
+                                                                <constraint firstItem="xGh-3b-9zf" firstAttribute="top" secondItem="UES-Eo-BEf" secondAttribute="top" constant="15" id="Ktt-a9-Ez4"/>
                                                                 <constraint firstAttribute="trailing" secondItem="vG5-PS-a35" secondAttribute="trailing" constant="20" id="Rcj-BS-Maj"/>
                                                                 <constraint firstItem="Nov-Lq-MHq" firstAttribute="leading" secondItem="xGh-3b-9zf" secondAttribute="trailing" id="b1e-BW-AO3"/>
                                                                 <constraint firstItem="WfK-L4-OKG" firstAttribute="centerY" secondItem="fsY-Co-wno" secondAttribute="centerY" id="bHQ-7c-DFh"/>
                                                                 <constraint firstItem="fsY-Co-wno" firstAttribute="leading" secondItem="WfK-L4-OKG" secondAttribute="trailing" constant="2" id="biy-8h-kX4"/>
+                                                                <constraint firstItem="vG5-PS-a35" firstAttribute="top" secondItem="Nov-Lq-MHq" secondAttribute="top" constant="-3" identifier="time-top-space" id="n2c-ZY-PFy"/>
                                                                 <constraint firstItem="fsY-Co-wno" firstAttribute="top" secondItem="KEf-HK-1oi" secondAttribute="top" id="ndt-Tg-jLK"/>
                                                                 <constraint firstItem="fsY-Co-wno" firstAttribute="trailing" secondItem="vG5-PS-a35" secondAttribute="trailing" id="sQc-aG-7Mo"/>
-                                                                <constraint firstItem="Nov-Lq-MHq" firstAttribute="top" secondItem="UES-Eo-BEf" secondAttribute="top" constant="10" id="si0-gL-b4j"/>
+                                                                <constraint firstItem="Nov-Lq-MHq" firstAttribute="top" secondItem="UES-Eo-BEf" secondAttribute="top" constant="10" identifier="custom-name-top-space" id="si0-gL-b4j"/>
                                                                 <constraint firstItem="xGh-3b-9zf" firstAttribute="leading" secondItem="UES-Eo-BEf" secondAttribute="leading" constant="5" id="w6E-p7-9te"/>
-                                                                <constraint firstItem="vG5-PS-a35" firstAttribute="top" secondItem="UES-Eo-BEf" secondAttribute="top" constant="10" id="zlT-zp-59t"/>
                                                             </constraints>
                                                             <connections>
                                                                 <outlet property="currentLocationIndicator" destination="k4t-Nn-Fzn" id="cUu-XI-fvJ"/>
@@ -259,7 +258,6 @@
                                 <subviews>
                                     <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" fixedFrame="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Y83-Ew-CDw">
                                         <rect key="frame" x="80" y="30" width="185" height="20"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <subviews>
                                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsExpansionToolTips="YES" preferredMaxLayoutWidth="185" translatesAutoresizingMaskIntoConstraints="NO" id="DHg-ca-UOi">
                                                 <rect key="frame" x="-2" y="0.0" width="189" height="20"/>
@@ -283,7 +281,6 @@
                                     </stackView>
                                     <stackView distribution="fillEqually" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" fixedFrame="YES" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xts-eA-jvq">
                                         <rect key="frame" x="75" y="4" width="200" height="21"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <subviews>
                                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8oB-ID-Dka">
                                                 <rect key="frame" x="-6" y="-7" width="108" height="32"/>
diff --git a/Clocker/Panel/UI/TimezoneCellView.swift b/Clocker/Panel/UI/TimezoneCellView.swift
index f532a42..58affd1 100644
--- a/Clocker/Panel/UI/TimezoneCellView.swift
+++ b/Clocker/Panel/UI/TimezoneCellView.swift
@@ -50,8 +50,55 @@ class TimezoneCellView: NSTableCellView {
         let width = relativeDateString.size(withAttributes: [NSAttributedString.Key.font: relativeFont]).width
         let sunriseWidth = sunriseString.size(withAttributes: [NSAttributedString.Key.font: sunriseFont]).width
 
-        for constraint in relativeDate.constraints where constraint.identifier == "width" {
-            constraint.constant = width + 8
+        if relativeDateString.length > 0 {
+            if relativeDate.isHidden {
+                relativeDate.isHidden.toggle()
+            }
+            for constraint in relativeDate.constraints where constraint.identifier == "width" {
+                constraint.constant = width + 8
+            }
+            for constraint in constraints where constraint.identifier == "custom-name-top-space" {
+                if constraint.constant != 12 {
+                    constraint.constant = 12
+                }
+            }
+
+            // If sunrise/sunset times are shown, adjust the time's top space to be closer to cell's top
+
+            if !sunriseSetTime.isHidden, relativeDate.isHidden {
+                for constraint in constraints where constraint.identifier == "time-top-space" {
+                    if constraint.constant == -5.0 {
+                        constraint.constant -= 10.0
+                    }
+                }
+            } else {
+                for constraint in constraints where constraint.identifier == "time-top-space" {
+                    if constraint.constant != -5.0 {
+                        constraint.constant = -3.0
+                    }
+                }
+            }
+
+        } else {
+            relativeDate.isHidden = true
+            for constraint in constraints where constraint.identifier == "custom-name-top-space" {
+                if constraint.constant == 12 {
+                    constraint.constant += 15
+                }
+            }
+            if !sunriseSetTime.isHidden {
+                for constraint in constraints where constraint.identifier == "time-top-space" {
+                    if constraint.constant == -5.0 {
+                        constraint.constant -= 10.0
+                    }
+                }
+            } else {
+                for constraint in constraints where constraint.identifier == "time-top-space" {
+                    if constraint.constant != -5.0 {
+                        constraint.constant = -5.0
+                    }
+                }
+            }
         }
 
         for constraint in sunriseSetTime.constraints where constraint.identifier == "width" {
diff --git a/Clocker/Panel/UI/TimezoneDataSource.swift b/Clocker/Panel/UI/TimezoneDataSource.swift
index 7960c34..e013092 100644
--- a/Clocker/Panel/UI/TimezoneDataSource.swift
+++ b/Clocker/Panel/UI/TimezoneDataSource.swift
@@ -75,10 +75,15 @@ extension TimezoneDataSource: NSTableViewDataSource, NSTableViewDelegate {
             return 100
         }
 
-        if let userFontSize = DataStore.shared().retrieve(key: CLUserFontSizePreference) as? NSNumber, timezones.count > row {
+        if let userFontSize = DataStore.shared().retrieve(key: CLUserFontSizePreference) as? NSNumber, timezones.count > row, let relativeDisplay = DataStore.shared().retrieve(key: CLRelativeDateKey) as? NSNumber {
             let model = timezones[row]
 
-            let rowHeight: Int = userFontSize == 4 ? 60 : 65
+            var rowHeight: Int = userFontSize == 4 ? 60 : 65
+
+            if relativeDisplay.intValue == 3 {
+                rowHeight -= 5
+            }
+
             if let note = model.note, !note.isEmpty {
                 return CGFloat(rowHeight + userFontSize.intValue + 25)
             }
diff --git a/Clocker/Preferences/Preferences.storyboard b/Clocker/Preferences/Preferences.storyboard
index 4e55a02..17ea53c 100644
--- a/Clocker/Preferences/Preferences.storyboard
+++ b/Clocker/Preferences/Preferences.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="RHq-9Z-auA">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="RHq-9Z-auA">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -400,7 +400,6 @@
                                             <tableColumns>
                                                 <tableColumn width="299" minWidth="40" maxWidth="1000" id="nkY-HS-phl">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
-                                                        <font key="font" metaFont="label" size="11"/>
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                     </tableHeaderCell>
@@ -769,20 +768,20 @@
             <objects>
                 <viewController title=" Appearance " id="1aL-zR-8L4" userLabel="Appearance" customClass="AppearanceViewController" customModule="Clocker" customModuleProvider="target" sceneMemberID="viewController">
                     <customView key="view" wantsLayer="YES" id="7EQ-1G-xRP" customClass="ParentView" customModule="Clocker" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="766" height="652"/>
+                        <rect key="frame" x="0.0" y="0.0" width="624" height="652"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         <subviews>
                             <tabView translatesAutoresizingMaskIntoConstraints="NO" id="SGu-yd-JQh">
-                                <rect key="frame" x="13" y="23" width="748" height="615"/>
+                                <rect key="frame" x="13" y="23" width="606" height="615"/>
                                 <font key="font" metaFont="system"/>
                                 <tabViewItems>
                                     <tabViewItem label="Panel" identifier="" id="vnW-vq-Ote">
                                         <view key="view" id="zFb-Gb-3dB">
-                                            <rect key="frame" x="10" y="33" width="728" height="569"/>
+                                            <rect key="frame" x="10" y="33" width="603" height="569"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
                                                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9WW-jp-NeO">
-                                                    <rect key="frame" x="203" y="366" width="263" height="24"/>
+                                                    <rect key="frame" x="203" y="366" width="138" height="24"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="CcB-5w-IoG">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -796,7 +795,7 @@
                                                     </connections>
                                                 </segmentedControl>
                                                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gEH-vT-EqV">
-                                                    <rect key="frame" x="203" y="328" width="280" height="24"/>
+                                                    <rect key="frame" x="203" y="328" width="155" height="24"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="5Rz-xo-JB7">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -854,13 +853,14 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="d4S-hM-MSP">
-                                                    <rect key="frame" x="203" y="442" width="412" height="24"/>
+                                                    <rect key="frame" x="203" y="442" width="287" height="24"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="564-Re-f1d">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
                                                             <segment label="Relative" width="60"/>
                                                             <segment label="Actual" width="60" selected="YES" tag="1"/>
                                                             <segment label="Date in mmm/dd"/>
+                                                            <segment label="Hide"/>
                                                         </segments>
                                                     </segmentedCell>
                                                     <connections>
@@ -869,7 +869,7 @@
                                                     </connections>
                                                 </segmentedControl>
                                                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zTJ-p9-7Tx">
-                                                    <rect key="frame" x="203" y="214" width="418" height="24"/>
+                                                    <rect key="frame" x="203" y="214" width="293" height="24"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="dxE-KM-01Y">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -927,7 +927,7 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CYe-co-1Ey">
-                                                    <rect key="frame" x="203" y="404" width="256" height="24"/>
+                                                    <rect key="frame" x="203" y="404" width="131" height="24"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="17B-LG-dAa">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -942,7 +942,7 @@
                                                     </connections>
                                                 </segmentedControl>
                                                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="8IA-JL-fje">
-                                                    <rect key="frame" x="679" y="276" width="32" height="52"/>
+                                                    <rect key="frame" x="554" y="276" width="32" height="52"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="32" id="GZK-Zb-UYb"/>
                                                         <constraint firstAttribute="height" constant="52" id="SSv-hh-RFa"/>
@@ -961,7 +961,7 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <segmentedControl toolTip="Choose a theme for the main panel!" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FZb-fP-hMJ">
-                                                    <rect key="frame" x="203" y="480" width="385" height="24"/>
+                                                    <rect key="frame" x="203" y="480" width="260" height="24"/>
                                                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="hcQ-xa-e2V">
                                                         <font key="font" size="12" name="Avenir-Light"/>
                                                         <segments>
@@ -976,7 +976,7 @@
                                                     </connections>
                                                 </segmentedControl>
                                                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IW2-Bb-lEZ">
-                                                    <rect key="frame" x="203" y="251" width="344" height="25"/>
+                                                    <rect key="frame" x="203" y="251" width="219" height="25"/>
                                                     <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="center" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="noArrow" preferredEdge="maxX" id="5oE-dn-DjN">
                                                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                         <font key="font" size="12" name="Avenir-Light"/>
@@ -998,7 +998,7 @@
                                                     </textFieldCell>
                                                 </textField>
                                                 <slider verticalHuggingPriority="750" alphaValue="0.59999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="3cU-IS-3Qu">
-                                                    <rect key="frame" x="203" y="289" width="470" height="24"/>
+                                                    <rect key="frame" x="203" y="289" width="345" height="24"/>
                                                     <sliderCell key="cell" state="on" alignment="left" minValue="4" maxValue="7" doubleValue="4" tickMarkPosition="above" numberOfTickMarks="4" allowsTickMarkValuesOnly="YES" sliderType="linear" id="eAh-k3-cof"/>
                                                     <connections>
                                                         <action selector="fontSliderChanged:" target="1aL-zR-8L4" id="YAW-aA-5aR"/>
@@ -1006,7 +1006,7 @@
                                                     </connections>
                                                 </slider>
                                                 <scrollView borderType="line" autohidesScrollers="YES" horizontalLineScroll="113" horizontalPageScroll="10" verticalLineScroll="113" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ytg-0u-Mtu">
-                                                    <rect key="frame" x="164" y="67" width="400" height="100"/>
+                                                    <rect key="frame" x="102" y="67" width="400" height="100"/>
                                                     <clipView key="contentView" ambiguous="YES" id="gnX-f5-31D">
                                                         <rect key="frame" x="1" y="1" width="398" height="98"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1020,7 +1020,6 @@
                                                                 <tableColumns>
                                                                     <tableColumn width="395" minWidth="10" maxWidth="3.4028234663852886e+38" id="Ih4-zU-fT5">
                                                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
-                                                                            <font key="font" metaFont="label" size="11"/>
                                                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         </tableHeaderCell>
@@ -1040,7 +1039,7 @@
                                                                                         <constraints>
                                                                                             <constraint firstAttribute="height" constant="22" id="Y9d-ZN-9bB"/>
                                                                                         </constraints>
-                                                                                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" placeholderString="Tomorrow" usesSingleLineMode="YES" id="2kX-WP-j4N">
+                                                                                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" state="on" usesSingleLineMode="YES" id="2kX-WP-j4N">
                                                                                             <font key="font" size="13" name="Avenir-Heavy"/>
                                                                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1139,18 +1138,18 @@
                                                                                     <constraint firstItem="kIm-II-xOl" firstAttribute="leading" secondItem="2Kk-Xa-pWa" secondAttribute="trailing" constant="2" id="Azp-5G-Or3"/>
                                                                                     <constraint firstAttribute="trailing" secondItem="lUV-93-e7u" secondAttribute="trailing" constant="2" id="DoN-SG-hNg"/>
                                                                                     <constraint firstItem="dqz-hf-wTd" firstAttribute="leading" secondItem="WD5-zQ-PiS" secondAttribute="leading" id="Gp8-AB-fOn"/>
+                                                                                    <constraint firstItem="ycy-5z-TSQ" firstAttribute="top" secondItem="WD5-zQ-PiS" secondAttribute="top" constant="-3" identifier="time-top-space" id="I38-Xc-EfM"/>
                                                                                     <constraint firstItem="Wds-ZI-cnD" firstAttribute="leading" secondItem="fKc-iV-VOa" secondAttribute="leading" id="Iz0-Sc-XW7"/>
                                                                                     <constraint firstAttribute="bottom" secondItem="lUV-93-e7u" secondAttribute="bottom" id="Jb3-k5-fL3"/>
+                                                                                    <constraint firstItem="Wds-ZI-cnD" firstAttribute="top" secondItem="fKc-iV-VOa" secondAttribute="top" constant="20" id="b2D-Gm-xPG"/>
                                                                                     <constraint firstItem="ycy-5z-TSQ" firstAttribute="leading" secondItem="WD5-zQ-PiS" secondAttribute="trailing" constant="10" id="bYX-0o-pmI"/>
                                                                                     <constraint firstItem="2Kk-Xa-pWa" firstAttribute="leading" secondItem="dqz-hf-wTd" secondAttribute="trailing" constant="10" id="eXr-YI-GlP"/>
                                                                                     <constraint firstItem="2Kk-Xa-pWa" firstAttribute="top" secondItem="ycy-5z-TSQ" secondAttribute="bottom" constant="-2" id="fcF-yf-tsN"/>
-                                                                                    <constraint firstItem="WD5-zQ-PiS" firstAttribute="top" secondItem="fKc-iV-VOa" secondAttribute="top" constant="12" id="hTB-YS-dSV"/>
+                                                                                    <constraint firstItem="WD5-zQ-PiS" firstAttribute="top" secondItem="fKc-iV-VOa" secondAttribute="top" constant="12" identifier="custom-name-top-space" id="hTB-YS-dSV"/>
                                                                                     <constraint firstItem="dqz-hf-wTd" firstAttribute="top" secondItem="WD5-zQ-PiS" secondAttribute="bottom" constant="7" id="kgY-qj-cly"/>
-                                                                                    <constraint firstItem="Wds-ZI-cnD" firstAttribute="top" secondItem="WD5-zQ-PiS" secondAttribute="top" constant="8" id="nNs-QR-Jlq"/>
                                                                                     <constraint firstItem="kIm-II-xOl" firstAttribute="top" secondItem="ycy-5z-TSQ" secondAttribute="bottom" constant="-2" id="q2i-zs-S2x"/>
                                                                                     <constraint firstItem="kIm-II-xOl" firstAttribute="trailing" secondItem="ycy-5z-TSQ" secondAttribute="trailing" id="s4g-kQ-yqB"/>
                                                                                     <constraint firstItem="WD5-zQ-PiS" firstAttribute="leading" secondItem="Wds-ZI-cnD" secondAttribute="trailing" id="sjV-3F-itL"/>
-                                                                                    <constraint firstItem="ycy-5z-TSQ" firstAttribute="top" secondItem="fKc-iV-VOa" secondAttribute="top" constant="9" id="ufQ-R3-LuV"/>
                                                                                 </constraints>
                                                                                 <connections>
                                                                                     <outlet property="currentLocationIndicator" destination="r6M-RL-W27" id="JT0-pd-geS"/>
@@ -1240,18 +1239,9 @@
                                     </tabViewItem>
                                     <tabViewItem label="Menubar" identifier="" id="ztQ-ui-wYI">
                                         <view key="view" id="mF4-bp-EID">
-                                            <rect key="frame" x="10" y="33" width="728" height="569"/>
+                                            <rect key="frame" x="10" y="33" width="586" height="569"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <subviews>
-                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="xRU-aD-9Ux">
-                                                    <rect key="frame" x="173" y="530" width="179" height="22"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Menubar Display Options" id="2wM-KJ-zzm">
-                                                        <font key="font" size="12" name="Avenir-Heavy"/>
-                                                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                                    </textFieldCell>
-                                                </textField>
                                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="fTA-lS-4wJ">
                                                     <rect key="frame" x="-21" y="496" width="179" height="22"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -1285,10 +1275,6 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="21Q-le-gfq">
-                                                    <rect key="frame" x="-49" y="494" width="563" height="5"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                </box>
                                                 <segmentedControl verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KeW-e2-uQE">
                                                     <rect key="frame" x="199" y="405" width="84" height="24"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -1395,7 +1381,6 @@
                         <outlet property="includePlaceNameControl" destination="KeW-e2-uQE" id="SeV-uy-oKg"/>
                         <outlet property="informationLabel" destination="2gG-g8-lbC" id="pfN-uc-PIv"/>
                         <outlet property="largerTextLabel" destination="xwt-pY-1w9" id="XbF-MZ-dMx"/>
-                        <outlet property="menubarDisplayOptionsLabel" destination="xRU-aD-9Ux" id="xT9-mp-jVo"/>
                         <outlet property="menubarMode" destination="Mai-SZ-AEi" id="PPv-1D-lnt"/>
                         <outlet property="menubarModeLabel" destination="Utg-yF-Rso" id="Pda-Aj-81M"/>
                         <outlet property="panelTheme" destination="vrm-cg-RMn" id="yPO-LZ-Egp"/>
@@ -1413,7 +1398,7 @@
                 <customObject id="u7K-hb-gdM" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <userDefaultsController representsSharedInstance="YES" id="Gpv-Gr-MxZ"/>
             </objects>
-            <point key="canvasLocation" x="-296" y="-755"/>
+            <point key="canvasLocation" x="-367" y="-755"/>
         </scene>
         <!-- Preferences -->
         <scene sceneID="udr-95-hTV">
@@ -1430,7 +1415,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <searchField toolTip="Search a timezone" wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dha-h9-Nd0" customClass="ClockerSearchField" customModule="Clocker" customModuleProvider="target">
-                                <rect key="frame" x="8" y="241" width="329" height="23"/>
+                                <rect key="frame" x="8" y="217" width="329" height="23"/>
                                 <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" focusRingType="none" placeholderString="Enter a city, state, country name" usesSingleLineMode="YES" maximumRecents="5" id="ikU-Tm-0WZ">
                                     <font key="font" size="13" name="Avenir-Light"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1487,13 +1472,13 @@ DQ
                                 </connections>
                             </button>
                             <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="32" horizontalPageScroll="10" verticalLineScroll="32" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0wY-ff-FLW">
-                                <rect key="frame" x="8" y="30" width="329" height="201"/>
+                                <rect key="frame" x="8" y="30" width="329" height="177"/>
                                 <clipView key="contentView" drawsBackground="NO" id="rGc-3M-cCq">
-                                    <rect key="frame" x="0.0" y="0.0" width="329" height="201"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="329" height="177"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" rowHeight="30" rowSizeStyle="automatic" viewBased="YES" id="xkl-2X-ZCb">
-                                            <rect key="frame" x="0.0" y="0.0" width="329" height="201"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="329" height="177"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <size key="intercellSpacing" width="3" height="2"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -1501,7 +1486,6 @@ DQ
                                             <tableColumns>
                                                 <tableColumn identifier="availableTimezones" editable="NO" width="225" minWidth="200" maxWidth="1000" id="jkC-hh-oOC">
                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Places/Timezone(s)">
-                                                        <font key="font" metaFont="label" size="11"/>
                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                     </tableHeaderCell>
@@ -1584,14 +1568,14 @@ DQ
                                 </scroller>
                             </scrollView>
                             <progressIndicator wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="0A5-gp-lay">
-                                <rect key="frame" x="165" y="150" width="16" height="16"/>
+                                <rect key="frame" x="165" y="138" width="16" height="16"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="16" id="fgE-77-Vda"/>
                                     <constraint firstAttribute="width" constant="16" id="pwe-em-e0a"/>
                                 </constraints>
                             </progressIndicator>
                             <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xgb-wU-8RU">
-                                <rect key="frame" x="18" y="120" width="309" height="22"/>
+                                <rect key="frame" x="18" y="108" width="309" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="zqt-d8-yas"/>
                                 </constraints>
@@ -1712,7 +1696,6 @@ DQ
                                                             <tableColumns>
                                                                 <tableColumn identifier="favouriteTimezone" width="55" minWidth="50" maxWidth="55" id="1DL-qa-3rn">
                                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Favourite">
-                                                                        <font key="font" metaFont="label" size="11"/>
                                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     </tableHeaderCell>
@@ -1724,7 +1707,6 @@ DQ
                                                                 </tableColumn>
                                                                 <tableColumn identifier="formattedAddress" editable="NO" width="260" minWidth="260" maxWidth="260" id="Kib-up-9ur">
                                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Name">
-                                                                        <font key="font" metaFont="label" size="11"/>
                                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                                                     </tableHeaderCell>
@@ -1737,7 +1719,6 @@ DQ
                                                                 </tableColumn>
                                                                 <tableColumn identifier="label" width="240" minWidth="240" maxWidth="240" id="Fbd-Q4-EZ0">
                                                                     <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Label">
-                                                                        <font key="font" metaFont="label" size="11"/>
                                                                         <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                                     </tableHeaderCell>