diff --git a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate
index 68291c9..2aa5516 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 54d4456..35f43aa 100644
--- a/Clocker/CLParentPanelController.m
+++ b/Clocker/CLParentPanelController.m
@@ -79,6 +79,12 @@ NSString *const CLYesWithExclamation = @"Yes!";
         NSNumber *userFontSize = [[NSUserDefaults standardUserDefaults] objectForKey:CLUserFontSizePreference];
         [Answers logCustomEventWithName:@"User Font Size Preference" customAttributes:@{@"Font Size" : userFontSize}];
         self.scrollViewHeight.constant = self.defaultPreferences.count * (self.mainTableview.rowHeight + userFontSize.integerValue*1.5);
+        
+        if (self.scrollViewHeight.constant > [self getScreenHeight] - 100)
+        {
+            self.scrollViewHeight.constant = [self getScreenHeight] - 100;
+        }
+        
         [self.mainTableview reloadData];
         
     }
@@ -92,6 +98,12 @@ NSString *const CLYesWithExclamation = @"Yes!";
     }
 }
 
+- (CGFloat)getScreenHeight
+{
+    NSRect frame = [[NSScreen mainScreen] frame];
+    return frame.size.height;
+}
+
 - (void)updateReviewViewFontColor
 {
     NSNumber *theme = [[NSUserDefaults standardUserDefaults] objectForKey:CLThemeKey];
@@ -116,6 +128,11 @@ NSString *const CLYesWithExclamation = @"Yes!";
     
     self.scrollViewHeight.constant = self.defaultPreferences.count * (self.mainTableview.rowHeight + userFontSize.integerValue*1.5);
     
+    if (self.scrollViewHeight.constant > [self getScreenHeight] - 100)
+    {
+        self.scrollViewHeight.constant = [self getScreenHeight] - 100;
+    }
+    
     [self updatePanelColor];
     
     if (!self.timezoneDataSource) {
diff --git a/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib b/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib
index 374af2a..27963d9 100644
--- a/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib	
+++ b/Clocker/Floating Window/en.lproj/CLFloatingWindow.xib	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16F60a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
@@ -31,7 +31,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="306" height="343"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
             <value key="minSize" type="size" width="150" height="50"/>
             <value key="maxSize" type="size" width="306" height="800"/>
             <view key="contentView" id="qEx-SC-5Qd">
@@ -43,7 +43,7 @@
                         <subviews>
                             <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="khu-OS-PzP">
                                 <rect key="frame" x="0.0" y="78" width="306" height="265"/>
-                                <clipView key="contentView" id="2rS-3B-A3C">
+                                <clipView key="contentView" copiesOnScroll="NO" id="2rS-3B-A3C">
                                     <rect key="frame" x="0.0" y="0.0" width="306" height="265"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
diff --git a/Clocker/Preferences/CLPreferencesViewController.m b/Clocker/Preferences/CLPreferencesViewController.m
index 19b2eb7..6f00c78 100644
--- a/Clocker/Preferences/CLPreferencesViewController.m
+++ b/Clocker/Preferences/CLPreferencesViewController.m
@@ -388,7 +388,7 @@ NSString *const CLTryAgainMessage = @"Try again, maybe?";
         return;
     }
     
-    if (self.selectedTimeZones.count >= 10)
+    if (self.selectedTimeZones.count >= 20)
     {
         self.messageLabel.stringValue = CLMaxTimezonesErrorMessage;
         [NSTimer scheduledTimerWithTimeInterval:5 target:self
diff --git a/Clocker/en.lproj/Panel.xib b/Clocker/en.lproj/Panel.xib
index 06c8102..d92db6f 100755
--- a/Clocker/en.lproj/Panel.xib
+++ b/Clocker/en.lproj/Panel.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11542" systemVersion="16F60a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
@@ -32,7 +32,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="306" height="343"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
             <view key="contentView" focusRingType="none" id="6" customClass="BackgroundView">
                 <rect key="frame" x="0.0" y="0.0" width="306" height="343"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -42,7 +42,7 @@
                         <subviews>
                             <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4Gd-Nv-fXr">
                                 <rect key="frame" x="0.0" y="78" width="306" height="265"/>
-                                <clipView key="contentView" id="4MZ-Di-yNR">
+                                <clipView key="contentView" copiesOnScroll="NO" id="4MZ-Di-yNR">
                                     <rect key="frame" x="0.0" y="0.0" width="306" height="265"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>