diff --git a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate
index 73aeec9..436071f 100644
Binary files a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate and b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Clocker/Appearance Tab/CLAppearanceView.xib b/Clocker/Appearance Tab/CLAppearanceView.xib
index 51213cd..1d32b46 100644
--- a/Clocker/Appearance Tab/CLAppearanceView.xib	
+++ b/Clocker/Appearance Tab/CLAppearanceView.xib	
@@ -50,25 +50,8 @@
                         <binding destination="WGI-5h-l6M" name="selectedLabel" keyPath="values.defaultTheme" id="vyq-YM-las"/>
                     </connections>
                 </segmentedControl>
-                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Yuq-9i-SR0">
-                    <rect key="frame" x="180" y="168" width="82" height="24"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="78" id="F56-RS-TkQ"/>
-                    </constraints>
-                    <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="wtp-4R-FaO">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
-                        <segments>
-                            <segment label="Yes"/>
-                            <segment label="No" toolTip="Customize the timezone panel by selecting a theme!" selected="YES" tag="1"/>
-                        </segments>
-                    </segmentedCell>
-                    <connections>
-                        <action selector="toggleSunriseAndSunset:" target="-2" id="7yw-7E-Oiy"/>
-                        <binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.displaySunTimings" id="CFq-VY-oBb"/>
-                    </connections>
-                </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YQi-x8-6f8">
-                    <rect key="frame" x="178" y="144" width="84" height="18"/>
+                    <rect key="frame" x="178" y="195" width="84" height="18"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Display Options" id="KTv-74-itf">
                         <font key="font" size="12" name="SFUIDisplay-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -76,7 +59,7 @@
                     </textFieldCell>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1eh-BT-2fK">
-                    <rect key="frame" x="101" y="117" width="240" height="24"/>
+                    <rect key="frame" x="101" y="168" width="240" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="236" id="uU1-9Q-cqa"/>
                     </constraints>
@@ -109,32 +92,20 @@
                         <binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.is24HourFormatSelected" id="UsS-ER-9M9"/>
                     </connections>
                 </segmentedControl>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="o8j-B8-IEv">
-                    <rect key="frame" x="149" y="195" width="142" height="18"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Show Sunrise, Sunset Time" id="gv1-YC-fw7">
-                        <font key="font" size="12" name="SFUIDisplay-Light"/>
-                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
             </subviews>
             <constraints>
-                <constraint firstItem="o8j-B8-IEv" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="0j0-b3-5B3"/>
                 <constraint firstItem="YQi-x8-6f8" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="6LU-d8-lKX"/>
-                <constraint firstItem="Yuq-9i-SR0" firstAttribute="top" secondItem="o8j-B8-IEv" secondAttribute="bottom" constant="4" id="B4y-AK-Eod"/>
                 <constraint firstItem="OrL-Ix-fmY" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="JtZ-ra-RaC"/>
                 <constraint firstItem="1eh-BT-2fK" firstAttribute="top" secondItem="YQi-x8-6f8" secondAttribute="bottom" constant="4" id="POa-Gi-Prk"/>
-                <constraint firstItem="Yuq-9i-SR0" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" constant="1.5" id="Tc9-yI-eIf"/>
                 <constraint firstItem="5tI-fU-0lZ" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Vkb-QV-unN"/>
+                <constraint firstItem="YQi-x8-6f8" firstAttribute="top" secondItem="5tI-fU-0lZ" secondAttribute="bottom" constant="8" id="WoY-W4-XuS"/>
                 <constraint firstItem="iVw-cq-zLz" firstAttribute="top" secondItem="OrL-Ix-fmY" secondAttribute="bottom" constant="8" id="XgM-Wl-Xap"/>
                 <constraint firstItem="iVw-cq-zLz" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Zh8-Vn-VxM"/>
-                <constraint firstItem="o8j-B8-IEv" firstAttribute="top" secondItem="5tI-fU-0lZ" secondAttribute="bottom" constant="8" id="bPs-wP-sL7"/>
                 <constraint firstItem="5tI-fU-0lZ" firstAttribute="top" secondItem="iVw-cq-zLz" secondAttribute="bottom" constant="4" id="bo6-s2-Vfj"/>
                 <constraint firstItem="1eh-BT-2fK" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" constant="1.5" id="fvI-By-5Ef"/>
                 <constraint firstItem="5TC-RQ-gzI" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="lc0-ud-Mnw"/>
                 <constraint firstItem="5TC-RQ-gzI" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" id="oI8-4L-ppf"/>
                 <constraint firstItem="OrL-Ix-fmY" firstAttribute="top" secondItem="5TC-RQ-gzI" secondAttribute="bottom" constant="4" id="rpk-WN-DT9"/>
-                <constraint firstItem="YQi-x8-6f8" firstAttribute="top" secondItem="Yuq-9i-SR0" secondAttribute="bottom" constant="8" id="vQl-up-u15"/>
             </constraints>
             <point key="canvasLocation" x="187" y="251"/>
         </customView>
diff --git a/Clocker/Appearance Tab/CLAppearanceViewController.m b/Clocker/Appearance Tab/CLAppearanceViewController.m
index b4386ec..db54636 100644
--- a/Clocker/Appearance Tab/CLAppearanceViewController.m	
+++ b/Clocker/Appearance Tab/CLAppearanceViewController.m	
@@ -14,8 +14,6 @@
 @interface CLAppearanceViewController ()
 @property (weak) IBOutlet NSSegmentedControl *timeFormat;
 @property (weak) IBOutlet NSSegmentedControl *theme;
-@property (weak) IBOutlet NSPopUpButton *fontPopup;
-@property (weak) IBOutlet NSSegmentedControl *sunriseToggle;
 
 @end
 
@@ -86,18 +84,6 @@
 
 }
 
-- (IBAction)fontChanged:(id)sender
-{
-    ApplicationDelegate *appDelegate = [[NSApplication sharedApplication] delegate];
-    PanelController *panelController = appDelegate.panelController;
-    [panelController.mainTableview reloadData];
-
-}
-
-- (IBAction)toggleSunriseAndSunset:(id)sender
-{
-}
-
 - (IBAction)changeRelativeDayDisplay:(id)sender
 {
     NSSegmentedControl *relativeDayControl = (NSSegmentedControl*) sender;
diff --git a/Clocker/Panel.xib b/Clocker/Panel.xib
index 1145ae7..b6cf8d9 100755
--- a/Clocker/Panel.xib
+++ b/Clocker/Panel.xib
@@ -59,10 +59,10 @@
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <subviews>
                                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="etF-33-bCB">
-                                                            <rect key="frame" x="7" y="32" width="134" height="20"/>
+                                                            <rect key="frame" x="7" y="33" width="134" height="22"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="130" id="32b-h6-joo"/>
-                                                                <constraint firstAttribute="height" constant="20" id="vod-YN-iNX"/>
+                                                                <constraint firstAttribute="height" constant="22" id="vod-YN-iNX"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="Timezone Name" id="rnh-AP-ooc">
                                                                 <font key="font" size="15" name="SFUIDisplay-Thin"/>
@@ -74,7 +74,7 @@
                                                             </connections>
                                                         </textField>
                                                         <textField verticalHuggingPriority="750" tag="102" translatesAutoresizingMaskIntoConstraints="NO" id="QUd-7D-q14">
-                                                            <rect key="frame" x="8" y="12" width="76" height="18"/>
+                                                            <rect key="frame" x="9" y="13" width="76" height="18"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="18" id="42Y-hy-Uo7"/>
                                                                 <constraint firstAttribute="width" constant="72" id="fkH-oq-qvM"/>
@@ -86,9 +86,9 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="101" translatesAutoresizingMaskIntoConstraints="NO" id="vnv-J2-7r1">
-                                                            <rect key="frame" x="139" y="12" width="134" height="40"/>
+                                                            <rect key="frame" x="139" y="21" width="134" height="35"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="40" id="3WU-de-OQL"/>
+                                                                <constraint firstAttribute="height" constant="35" id="3WU-de-OQL"/>
                                                                 <constraint firstAttribute="width" constant="130" id="cQV-gJ-zMz"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" placeholderString="23:46 AM" id="g8s-EU-UHx">
@@ -99,9 +99,9 @@
                                                         </textField>
                                                     </subviews>
                                                     <constraints>
-                                                        <constraint firstItem="QUd-7D-q14" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" constant="10" id="0Qz-Ev-efP"/>
-                                                        <constraint firstItem="etF-33-bCB" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="8" id="Lct-kG-usb"/>
-                                                        <constraint firstItem="vnv-J2-7r1" firstAttribute="centerY" secondItem="qbN-ba-fho" secondAttribute="centerY" constant="-2" id="TuQ-gE-ZUh"/>
+                                                        <constraint firstItem="QUd-7D-q14" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" constant="11" id="0Qz-Ev-efP"/>
+                                                        <constraint firstItem="etF-33-bCB" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="5" id="Lct-kG-usb"/>
+                                                        <constraint firstItem="vnv-J2-7r1" firstAttribute="centerY" secondItem="qbN-ba-fho" secondAttribute="centerY" constant="-8" id="TuQ-gE-ZUh"/>
                                                         <constraint firstItem="QUd-7D-q14" firstAttribute="top" secondItem="etF-33-bCB" secondAttribute="bottom" constant="2" id="VO6-Zn-eA3"/>
                                                         <constraint firstItem="etF-33-bCB" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" constant="9" id="ueW-ow-ZRq"/>
                                                         <constraint firstAttribute="trailing" secondItem="vnv-J2-7r1" secondAttribute="trailing" constant="8" id="zXo-eA-0bQ"/>
diff --git a/Clocker/Preferences/CLPreferencesViewController.m b/Clocker/Preferences/CLPreferencesViewController.m
index 349535a..ef8946c 100644
--- a/Clocker/Preferences/CLPreferencesViewController.m
+++ b/Clocker/Preferences/CLPreferencesViewController.m
@@ -479,7 +479,7 @@ NSString *const CLPreferencesAvailableTimezoneIdentifier = @"availableTimezones"
         return;
     }
     
-    self.searchField.placeholderString = @"Fetching data!";
+    self.searchField.placeholderString = @"Fetching data might take some time!";
 
     self.placeholderLabel.placeholderString = @"Retrieving timezone data";