diff --git a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate
index ce591c9..9322b1c 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/CLParentPanelController.m b/Clocker/CLParentPanelController.m
index 17d9954..e3b3ce9 100644
--- a/Clocker/CLParentPanelController.m
+++ b/Clocker/CLParentPanelController.m
@@ -14,6 +14,8 @@
 #import "iRate.h"
 #import "CLTableViewDataSource.h"
 #import <Crashlytics/Crashlytics.h>
+#import "ApplicationDelegate.h"
+#import <Crashlytics/Crashlytics.h>
 
 NSString *const CLNotReallyButtonTitle = @"Not Really";
 NSString *const CLFeedbackString = @"Mind giving feedback?";
@@ -21,6 +23,11 @@ NSString *const CLNoThanksTitle = @"No, thanks";
 NSString *const CLYesWithQuestionMark = @"Yes?";
 NSString *const CLYesWithExclamation = @"Yes!";
 
+typedef NS_ENUM(NSUInteger, CLClockerMode) {
+    CLMenubarMode = 0,
+    CLFloatingMode
+};
+
 @interface CLParentPanelController ()
 @property (strong) CLTableViewDataSource *timezoneDataSource;
 @end
@@ -360,6 +367,4 @@ NSString *const CLYesWithExclamation = @"Yes!";
                         }];
 }
 
-
-
 @end
diff --git a/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib
index dd9a3ea..1afe17d 100644
--- a/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib	
@@ -251,10 +251,10 @@
                                 <rect key="frame" x="0.0" y="0.0" width="306" height="28"/>
                                 <subviews>
                                     <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vKI-7t-lFg">
-                                        <rect key="frame" x="8" y="4" width="192" height="19"/>
+                                        <rect key="frame" x="8" y="4" width="216" height="19"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="15" id="3hI-5j-He1"/>
-                                            <constraint firstAttribute="width" constant="188" id="Vib-CH-6ej"/>
+                                            <constraint firstAttribute="width" constant="212" id="Vib-CH-6ej"/>
                                         </constraints>
                                         <sliderCell key="cell" alignment="left" maxValue="1440" doubleValue="726.0119047619047" tickMarkPosition="above" sliderType="linear" id="a3g-9R-U5R" customClass="CLCustomSliderCell"/>
                                         <connections>
@@ -290,23 +290,10 @@
                                             <action selector="openPreferences:" target="-2" id="37E-Lw-Pxb"/>
                                         </connections>
                                     </button>
-                                    <button toolTip="Open Preferences" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mnf-RS-e6C">
-                                        <rect key="frame" x="210" y="0.0" width="25" height="26"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="25" id="7ak-ho-N02"/>
-                                            <constraint firstAttribute="height" constant="25" id="SaG-6m-Uke"/>
-                                        </constraints>
-                                        <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="Pin" imagePosition="only" alignment="center" alternateImage="Pin" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="0zD-4v-JDt">
-                                            <behavior key="behavior" lightByContents="YES"/>
-                                            <font key="font" metaFont="systemBold" size="12"/>
-                                        </buttonCell>
-                                    </button>
                                 </subviews>
                                 <constraints>
                                     <constraint firstItem="WWN-nq-wMy" firstAttribute="leading" secondItem="Fbf-Qd-u2V" secondAttribute="trailing" id="1wI-U3-Pxk"/>
                                     <constraint firstItem="WWN-nq-wMy" firstAttribute="centerY" secondItem="Stb-ee-1GS" secondAttribute="centerY" id="6sO-vJ-DiD"/>
-                                    <constraint firstItem="mnf-RS-e6C" firstAttribute="centerY" secondItem="Stb-ee-1GS" secondAttribute="centerY" id="7PM-IQ-sZq"/>
-                                    <constraint firstItem="Fbf-Qd-u2V" firstAttribute="leading" secondItem="mnf-RS-e6C" secondAttribute="trailing" constant="1" id="7hn-8S-QBk"/>
                                     <constraint firstItem="vKI-7t-lFg" firstAttribute="centerY" secondItem="Stb-ee-1GS" secondAttribute="centerY" id="EXd-m0-roh"/>
                                     <constraint firstAttribute="height" constant="28" id="KUZ-Oj-qRa"/>
                                     <constraint firstItem="vKI-7t-lFg" firstAttribute="leading" secondItem="Stb-ee-1GS" secondAttribute="leading" constant="10" id="RJG-i0-Rjh"/>
@@ -349,7 +336,6 @@
     <resources>
         <image name="ClockerIcon-16" width="16" height="16"/>
         <image name="NSActionTemplate" width="14" height="14"/>
-        <image name="Pin" width="380" height="380"/>
         <image name="PowerIcon" width="270" height="270"/>
     </resources>
 </document>
diff --git a/Clocker/en.lproj/Panel.xib b/Clocker/en.lproj/Panel.xib
index 5529eb3..3bd2b1e 100755
--- a/Clocker/en.lproj/Panel.xib
+++ b/Clocker/en.lproj/Panel.xib
@@ -251,9 +251,9 @@
                                 <rect key="frame" x="0.0" y="0.0" width="306" height="28"/>
                                 <subviews>
                                     <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="UMX-eA-G87">
-                                        <rect key="frame" x="8" y="4" width="192" height="19"/>
+                                        <rect key="frame" x="8" y="4" width="216" height="19"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" constant="188" id="0df-dM-4hx"/>
+                                            <constraint firstAttribute="width" constant="212" id="0df-dM-4hx"/>
                                             <constraint firstAttribute="height" constant="15" id="X6i-cQ-omb"/>
                                         </constraints>
                                         <sliderCell key="cell" alignment="left" maxValue="1440" doubleValue="726.0119047619047" tickMarkPosition="above" sliderType="linear" id="iIN-od-dj1" customClass="CLCustomSliderCell"/>
@@ -290,23 +290,10 @@
                                             <action selector="openPreferences:" target="-2" id="Wwy-xc-psI"/>
                                         </connections>
                                     </button>
-                                    <button toolTip="Open Preferences" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IoW-Bx-s8g">
-                                        <rect key="frame" x="210" y="0.0" width="25" height="26"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="25" id="ItM-KF-5fr"/>
-                                            <constraint firstAttribute="width" constant="25" id="c99-5W-fcf"/>
-                                        </constraints>
-                                        <buttonCell key="cell" type="recessed" bezelStyle="recessed" image="Pin" imagePosition="only" alignment="center" alternateImage="Pin" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PoE-UX-5mR">
-                                            <behavior key="behavior" lightByContents="YES"/>
-                                            <font key="font" metaFont="systemBold" size="12"/>
-                                        </buttonCell>
-                                    </button>
                                 </subviews>
                                 <constraints>
-                                    <constraint firstItem="Ctq-BV-GPN" firstAttribute="leading" secondItem="IoW-Bx-s8g" secondAttribute="trailing" constant="1" id="3jl-go-NDM"/>
                                     <constraint firstItem="Ctq-BV-GPN" firstAttribute="centerY" secondItem="B8X-sx-cjT" secondAttribute="centerY" id="6Q7-jc-cTL"/>
                                     <constraint firstItem="UMX-eA-G87" firstAttribute="centerY" secondItem="B8X-sx-cjT" secondAttribute="centerY" id="HRJ-nU-K9Z"/>
-                                    <constraint firstItem="IoW-Bx-s8g" firstAttribute="centerY" secondItem="B8X-sx-cjT" secondAttribute="centerY" id="OSb-w7-ocG"/>
                                     <constraint firstAttribute="height" constant="28" id="iYW-fj-EE2"/>
                                     <constraint firstItem="1cR-pI-osG" firstAttribute="centerY" secondItem="B8X-sx-cjT" secondAttribute="centerY" id="oVJ-Xa-cTw"/>
                                     <constraint firstAttribute="trailing" secondItem="1cR-pI-osG" secondAttribute="trailing" constant="11" id="rb9-gW-QZS"/>
@@ -351,7 +338,6 @@
     <resources>
         <image name="ClockerIcon-16" width="16" height="16"/>
         <image name="NSActionTemplate" width="14" height="14"/>
-        <image name="Pin" width="380" height="380"/>
         <image name="PowerIcon" width="270" height="270"/>
     </resources>
 </document>