diff --git a/Clocker.xcodeproj/project.pbxproj b/Clocker.xcodeproj/project.pbxproj
index 679f7ae..6d67482 100755
--- a/Clocker.xcodeproj/project.pbxproj
+++ b/Clocker.xcodeproj/project.pbxproj
@@ -79,12 +79,12 @@
 		9AA4AC911CEC112E0054ACB7 /* QCMethod.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AA4AC901CEC112E0054ACB7 /* QCMethod.m */; };
 		9AB2420B1CB723650017C17C /* CLFloatingWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9AB2420D1CB723650017C17C /* CLFloatingWindow.xib */; };
 		9AB89E031CE97A4900EC8EB1 /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9AB89E021CE97A4900EC8EB1 /* Media.xcassets */; };
-		9AB9357B1C1AD8F7001285A0 /* CLRatingCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AB9357A1C1AD8F7001285A0 /* CLRatingCellView.m */; };
 		9ABA2B031C671D49009DC0EF /* CLMainWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ABA2B021C671D49009DC0EF /* CLMainWindowController.m */; };
 		9ABF58721C29A80600BD0187 /* CLTimezoneData.m in Sources */ = {isa = PBXBuildFile; fileRef = 9ABF58711C29A80600BD0187 /* CLTimezoneData.m */; };
 		9ABFB3801CA6882000E10745 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ABFB37F1CA6882000E10745 /* ApplicationServices.framework */; };
 		9AC678E41C1ABAB9003B4F6B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC678E31C1ABAB9003B4F6B /* QuartzCore.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		9ACE03EF1CB0ADE00039FC01 /* Firebase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ACE03EE1CB0ADE00039FC01 /* Firebase.framework */; };
+		9ACF469D1DCBD45200C49B51 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ACF469C1DCBD45200C49B51 /* Quartz.framework */; };
 		9AF9A16B1C250AB300EE7C2A /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AF9A16A1C250AB300EE7C2A /* Reachability.m */; };
 		DD4F7C0913C30F9F00825C6E /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD4F7C0813C30F9F00825C6E /* Cocoa.framework */; };
 /* End PBXBuildFile section */
@@ -199,23 +199,14 @@
 		9A10C68D1CDAC8B500D474F1 /* CLPanelTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLPanelTextField.h; path = Clocker/CLPanelTextField.h; sourceTree = "<group>"; };
 		9A10C68E1CDAC8B500D474F1 /* CLPanelTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLPanelTextField.m; path = Clocker/CLPanelTextField.m; sourceTree = "<group>"; };
 		9A13BAC71CA86A88007C6CBE /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/CLAboutUsView.xib; sourceTree = "<group>"; };
-		9A13BAC91CA86AAE007C6CBE /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/CLAboutUsView.xib; sourceTree = "<group>"; };
 		9A13BACB1CA877A6007C6CBE /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/CLPreferencesView.xib; sourceTree = "<group>"; };
-		9A13BACD1CA877A8007C6CBE /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/CLPreferencesView.xib; sourceTree = "<group>"; };
 		9A13BACF1CA879E5007C6CBE /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/CLAppearanceView.xib; sourceTree = "<group>"; };
-		9A13BAD11CA879E8007C6CBE /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/CLAppearanceView.xib; sourceTree = "<group>"; };
 		9A13BAD31CA87DF4007C6CBE /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/CLOnboardingWindow.xib; sourceTree = "<group>"; };
-		9A13BAD51CA87DF5007C6CBE /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/CLOnboardingWindow.xib; sourceTree = "<group>"; };
 		9A13BAD71CA87F08007C6CBE /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Panel.xib; sourceTree = "<group>"; };
-		9A13BAD91CA87F09007C6CBE /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/Panel.xib; sourceTree = "<group>"; };
 		9A13BADB1CA87F3F007C6CBE /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/CLOneWindow.xib; sourceTree = "<group>"; };
-		9A13BADD1CA87F40007C6CBE /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/CLOneWindow.xib; sourceTree = "<group>"; };
 		9A13BAE11CA882FA007C6CBE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		9A13BAE31CA882FC007C6CBE /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		9A13BAE71CA889BB007C6CBE /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/CLAppFeedbackWindow.xib; sourceTree = "<group>"; };
-		9A13BAE91CA889BD007C6CBE /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/CLAppFeedbackWindow.xib; sourceTree = "<group>"; };
 		9A13BAEB1CA88A76007C6CBE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
-		9A13BAED1CA88AD3007C6CBE /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
 		9A20A04A1C4DEED200FB45AB /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		9A20A06F1C4E804D00FB45AB /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
 		9A20A0751C4EA53600FB45AB /* CLOnboardingWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLOnboardingWindowController.h; path = Clocker/Onboarding/CLOnboardingWindowController.h; sourceTree = "<group>"; };
@@ -262,29 +253,10 @@
 		9A5B6C7A1D470ECB000EAAF1 /* CLTableViewDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLTableViewDataSource.h; path = Clocker/Utilities/CLTableViewDataSource.h; sourceTree = "<group>"; };
 		9A5B6C7B1D470ECB000EAAF1 /* CLTableViewDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLTableViewDataSource.m; path = Clocker/Utilities/CLTableViewDataSource.m; sourceTree = "<group>"; };
 		9A5E6B9F1CAF71C1006E7C5C /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; };
-		9A5E6BA11CAF794D006E7C5C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		9A5E6BA21CAF794D006E7C5C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		9A5E6BA31CAF794D006E7C5C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "zh-Hans.lproj/CLOneWindow.xib"; sourceTree = "<group>"; };
-		9A5E6BA41CAF794D006E7C5C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "zh-Hans.lproj/Panel.xib"; sourceTree = "<group>"; };
-		9A5E6BA51CAF794D006E7C5C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "zh-Hans.lproj/CLAboutUsView.xib"; sourceTree = "<group>"; };
-		9A5E6BA61CAF794D006E7C5C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "zh-Hans.lproj/CLPreferencesView.xib"; sourceTree = "<group>"; };
-		9A5E6BA71CAF794D006E7C5C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "zh-Hans.lproj/CLAppearanceView.xib"; sourceTree = "<group>"; };
-		9A5E6BA81CAF794D006E7C5C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "zh-Hans.lproj/CLAppFeedbackWindow.xib"; sourceTree = "<group>"; };
-		9A5E6BA91CAF794D006E7C5C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "zh-Hans.lproj/CLOnboardingWindow.xib"; sourceTree = "<group>"; };
 		9A5E6BAA1CAF8DFA006E7C5C /* iRate.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = iRate.bundle; sourceTree = "<group>"; };
 		9A6362081C432F68004AD010 /* CLAPIConnector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLAPIConnector.h; path = Clocker/API/CLAPIConnector.h; sourceTree = "<group>"; };
 		9A6362091C432F68004AD010 /* CLAPIConnector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLAPIConnector.m; path = Clocker/API/CLAPIConnector.m; sourceTree = "<group>"; };
 		9A6D93361CF3E82F005A8690 /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; };
-		9A7654341CDC2290000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		9A7654351CDC2290000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		9A7654361CDC2290000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/CLOneWindow.xib"; sourceTree = "<group>"; };
-		9A7654371CDC2291000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/Panel.xib"; sourceTree = "<group>"; };
-		9A7654381CDC2291000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/CLAboutUsView.xib"; sourceTree = "<group>"; };
-		9A7654391CDC2291000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/CLPreferencesView.xib"; sourceTree = "<group>"; };
-		9A76543A1CDC2291000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/CLAppearanceView.xib"; sourceTree = "<group>"; };
-		9A76543B1CDC2291000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/CLAppFeedbackWindow.xib"; sourceTree = "<group>"; };
-		9A76543C1CDC2291000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/CLOnboardingWindow.xib"; sourceTree = "<group>"; };
-		9A76543D1CDC2291000FB825 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hant"; path = "zh-Hant.lproj/CLFloatingWindow.xib"; sourceTree = "<group>"; };
 		9A79E98E1CB34B6800BA7916 /* CLParentPanelController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLParentPanelController.h; path = Clocker/CLParentPanelController.h; sourceTree = "<group>"; };
 		9A79E98F1CB34B6800BA7916 /* CLParentPanelController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLParentPanelController.m; path = Clocker/CLParentPanelController.m; sourceTree = "<group>"; };
 		9A82F32B1CDFF8CE00CC8906 /* pop.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pop.xcodeproj; path = Clocker/pop/pop.xcodeproj; sourceTree = "<group>"; };
@@ -339,11 +311,7 @@
 		9AA4AC8F1CEC11270054ACB7 /* QCMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QCMethod.h; path = "Clocker/Onboarding/Onboarding Animated Views/QCMethod.h"; sourceTree = "<group>"; };
 		9AA4AC901CEC112E0054ACB7 /* QCMethod.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QCMethod.m; path = "Clocker/Onboarding/Onboarding Animated Views/QCMethod.m"; sourceTree = "<group>"; };
 		9AB2420C1CB723650017C17C /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/CLFloatingWindow.xib; sourceTree = "<group>"; };
-		9AB2420F1CB723670017C17C /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/CLFloatingWindow.xib; sourceTree = "<group>"; };
-		9AB242101CB723690017C17C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "zh-Hans"; path = "zh-Hans.lproj/CLFloatingWindow.xib"; sourceTree = "<group>"; };
 		9AB89E021CE97A4900EC8EB1 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
-		9AB935791C1AD8F7001285A0 /* CLRatingCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLRatingCellView.h; path = Clocker/CLRatingCellView.h; sourceTree = "<group>"; };
-		9AB9357A1C1AD8F7001285A0 /* CLRatingCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLRatingCellView.m; path = Clocker/CLRatingCellView.m; sourceTree = "<group>"; };
 		9ABA2B011C671D49009DC0EF /* CLMainWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLMainWindowController.h; path = Clocker/CLMainWindowController.h; sourceTree = "<group>"; };
 		9ABA2B021C671D49009DC0EF /* CLMainWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLMainWindowController.m; path = Clocker/CLMainWindowController.m; sourceTree = "<group>"; };
 		9ABF58701C29A80600BD0187 /* CLTimezoneData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLTimezoneData.h; path = Clocker/Model/CLTimezoneData.h; sourceTree = "<group>"; };
@@ -351,6 +319,7 @@
 		9ABFB37F1CA6882000E10745 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
 		9AC678E31C1ABAB9003B4F6B /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		9ACE03EE1CB0ADE00039FC01 /* Firebase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Firebase.framework; path = Frameworks/Firebase.framework; sourceTree = "<group>"; };
+		9ACF469C1DCBD45200C49B51 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
 		9AF9A1691C250AB300EE7C2A /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Reachability.h; path = Clocker/Reachability/Reachability.h; sourceTree = "<group>"; };
 		9AF9A16A1C250AB300EE7C2A /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Reachability.m; path = Clocker/Reachability/Reachability.m; sourceTree = "<group>"; };
 		DD4F7C0413C30F9F00825C6E /* Clocker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Clocker.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -363,6 +332,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9ACF469D1DCBD45200C49B51 /* Quartz.framework in Frameworks */,
 				9AC678E41C1ABAB9003B4F6B /* QuartzCore.framework in Frameworks */,
 				9A6D93371CF3E82F005A8690 /* CoreImage.framework in Frameworks */,
 				9A86E2C21CE04F4A00547EE7 /* PTHotKey.framework in Frameworks */,
@@ -516,8 +486,6 @@
 				9A8605C51BEC155B00A810A4 /* StatusItemView.h */,
 				9A8605BC1BEC14F600A810A4 /* BackgroundView.m */,
 				9A8605B81BEC14DC00A810A4 /* StatusItemView.m */,
-				9AB935791C1AD8F7001285A0 /* CLRatingCellView.h */,
-				9AB9357A1C1AD8F7001285A0 /* CLRatingCellView.m */,
 			);
 			name = Views;
 			sourceTree = "<group>";
@@ -538,10 +506,10 @@
 				9A42394C1CB0616400A8E51A /* CLFloatingWindowController.h */,
 				9A42394D1CB0616400A8E51A /* CLFloatingWindowController.m */,
 				9A20A0751C4EA53600FB45AB /* CLOnboardingWindowController.h */,
-				9A20A0761C4EA53600FB45AB /* CLOnboardingWindowController.m */,
 				9A9E63831C2C673E009A299B /* CLAppFeedbackWindowController.h */,
 				9A9E63841C2C673E009A299B /* CLAppFeedbackWindowController.m */,
 				9A5951BE1C1D0AA0009C17AA /* CLOneWindowController.m */,
+				9A20A0761C4EA53600FB45AB /* CLOnboardingWindowController.m */,
 				9A5951BF1C1D0AA0009C17AA /* CLOneWindowController.h */,
 				9A8605CA1BEC155B00A810A4 /* ApplicationDelegate.h */,
 				9A8605B51BEC14BE00A810A4 /* ApplicationDelegate.m */,
@@ -659,6 +627,7 @@
 		DD4F7C0713C30F9F00825C6E /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				9ACF469C1DCBD45200C49B51 /* Quartz.framework */,
 				9A6D93361CF3E82F005A8690 /* CoreImage.framework */,
 				9A5E6B9F1CAF71C1006E7C5C /* libicucore.tbd */,
 				9ABFB37F1CA6882000E10745 /* ApplicationServices.framework */,
@@ -736,9 +705,6 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
-				ja,
-				"zh-Hans",
-				"zh-Hant",
 			);
 			mainGroup = DD4F7BF913C30F9F00825C6E;
 			productRefGroup = DD4F7C0513C30F9F00825C6E /* Products */;
@@ -885,7 +851,6 @@
 				9A8605BF1BEC14F600A810A4 /* BackgroundView.m in Sources */,
 				9A79E9901CB34B6800BA7916 /* CLParentPanelController.m in Sources */,
 				9A87DAC51C358FA800A8CF3B /* DTConstants.m in Sources */,
-				9AB9357B1C1AD8F7001285A0 /* CLRatingCellView.m in Sources */,
 				9A5B6C781D459438000EAAF1 /* CLTimezoneDataOperations.m in Sources */,
 				9A63620A1C432F68004AD010 /* CLAPIConnector.m in Sources */,
 				9A87DAC81C358FA800A8CF3B /* DTTimePeriodChain.m in Sources */,
@@ -944,9 +909,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				9A13BAC71CA86A88007C6CBE /* en */,
-				9A13BAC91CA86AAE007C6CBE /* ja */,
-				9A5E6BA51CAF794D006E7C5C /* zh-Hans */,
-				9A7654381CDC2291000FB825 /* zh-Hant */,
 			);
 			name = CLAboutUsView.xib;
 			path = Clocker/AboutUsWindow;
@@ -956,9 +918,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				9A13BACB1CA877A6007C6CBE /* en */,
-				9A13BACD1CA877A8007C6CBE /* ja */,
-				9A5E6BA61CAF794D006E7C5C /* zh-Hans */,
-				9A7654391CDC2291000FB825 /* zh-Hant */,
 			);
 			name = CLPreferencesView.xib;
 			path = Clocker/Preferences;
@@ -968,9 +927,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				9A13BACF1CA879E5007C6CBE /* en */,
-				9A13BAD11CA879E8007C6CBE /* ja */,
-				9A5E6BA71CAF794D006E7C5C /* zh-Hans */,
-				9A76543A1CDC2291000FB825 /* zh-Hant */,
 			);
 			name = CLAppearanceView.xib;
 			path = "Clocker/Appearance Tab";
@@ -980,9 +936,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				9A13BAD31CA87DF4007C6CBE /* en */,
-				9A13BAD51CA87DF5007C6CBE /* ja */,
-				9A5E6BA91CAF794D006E7C5C /* zh-Hans */,
-				9A76543C1CDC2291000FB825 /* zh-Hant */,
 			);
 			name = CLOnboardingWindow.xib;
 			path = Clocker/Onboarding;
@@ -992,9 +945,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				9A13BAD71CA87F08007C6CBE /* en */,
-				9A13BAD91CA87F09007C6CBE /* ja */,
-				9A5E6BA41CAF794D006E7C5C /* zh-Hans */,
-				9A7654371CDC2291000FB825 /* zh-Hant */,
 			);
 			name = Panel.xib;
 			path = Clocker;
@@ -1004,9 +954,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				9A13BADB1CA87F3F007C6CBE /* en */,
-				9A13BADD1CA87F40007C6CBE /* ja */,
-				9A5E6BA31CAF794D006E7C5C /* zh-Hans */,
-				9A7654361CDC2290000FB825 /* zh-Hant */,
 			);
 			name = CLOneWindow.xib;
 			path = Clocker/CLOneWindow;
@@ -1016,9 +963,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				9A13BAE11CA882FA007C6CBE /* en */,
-				9A13BAE31CA882FC007C6CBE /* ja */,
-				9A5E6BA11CAF794D006E7C5C /* zh-Hans */,
-				9A7654341CDC2290000FB825 /* zh-Hant */,
 			);
 			name = InfoPlist.strings;
 			path = Clocker;
@@ -1028,9 +972,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				9A13BAE71CA889BB007C6CBE /* en */,
-				9A13BAE91CA889BD007C6CBE /* ja */,
-				9A5E6BA81CAF794D006E7C5C /* zh-Hans */,
-				9A76543B1CDC2291000FB825 /* zh-Hant */,
 			);
 			name = CLAppFeedbackWindow.xib;
 			path = "Clocker/App Feedback";
@@ -1040,9 +981,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				9A13BAEB1CA88A76007C6CBE /* en */,
-				9A13BAED1CA88AD3007C6CBE /* ja */,
-				9A5E6BA21CAF794D006E7C5C /* zh-Hans */,
-				9A7654351CDC2290000FB825 /* zh-Hant */,
 			);
 			name = Localizable.strings;
 			path = Clocker;
@@ -1052,9 +990,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				9AB2420C1CB723650017C17C /* en */,
-				9AB2420F1CB723670017C17C /* ja */,
-				9AB242101CB723690017C17C /* zh-Hans */,
-				9A76543D1CDC2291000FB825 /* zh-Hant */,
 			);
 			name = CLFloatingWindow.xib;
 			path = "Clocker/Floating Window";
@@ -1117,7 +1052,7 @@
 				GCC_WARN_UNUSED_PARAMETER = NO;
 				INFOPLIST_FILE = "Clocker/Clocker-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.abhishek.Clocker;
 				PRODUCT_NAME = Clocker;
@@ -1222,7 +1157,7 @@
 				GCC_WARN_UNUSED_PARAMETER = NO;
 				INFOPLIST_FILE = "Clocker/Clocker-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.abhishek.Clocker;
@@ -1256,7 +1191,7 @@
 				GCC_WARN_UNUSED_PARAMETER = NO;
 				INFOPLIST_FILE = "Clocker/Clocker-Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				OTHER_LDFLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = com.abhishek.Clocker;
 				PRODUCT_NAME = Clocker;
diff --git a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate
index f45d107..fbd0cf4 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/en.lproj/CLAppearanceView.xib b/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib
index 1e4de0f..ce219b7 100644
--- a/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib	
+++ b/Clocker/Appearance Tab/en.lproj/CLAppearanceView.xib	
@@ -1,12 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?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">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="CLAppearanceViewController">
             <connections>
-                <outlet property="informationLabel" destination="WDP-d4-eNj" id="4Af-T9-vEI"/>
+                <outlet property="informationLabel" destination="8En-R0-gDb" id="vhH-nm-2Qk"/>
                 <outlet property="theme" destination="5tI-fU-0lZ" id="dzr-Zx-E8x"/>
                 <outlet property="timeFormat" destination="OrL-Ix-fmY" id="ZzR-ip-HS9"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
@@ -14,36 +16,24 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="439" height="578"/>
+        <customView wantsLayer="YES" id="Hz6-mo-xeY">
+            <rect key="frame" x="0.0" y="0.0" width="585" height="555"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="60" translatesAutoresizingMaskIntoConstraints="NO" id="iVw-cq-zLz">
-                    <rect key="frame" x="188" y="464" width="64" height="18"/>
+                    <rect key="frame" x="126" y="456" width="64" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="2DP-wK-Ga8"/>
                         <constraint firstAttribute="width" constant="60" id="KEa-ei-G2i"/>
                     </constraints>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Theme" id="hCb-NM-To8">
-                        <font key="font" size="13" name="HelveticaNeue-Light"/>
-                        <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" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="5TC-RQ-gzI">
-                    <rect key="frame" x="168" y="526" width="104" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="gWc-u4-D8E"/>
-                        <constraint firstAttribute="width" constant="100" id="nh0-5K-Aa0"/>
-                    </constraints>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Time Format" id="Hza-PB-FEf">
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Theme" id="hCb-NM-To8">
                         <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <segmentedControl toolTip="Choose a theme for the main panel!" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5tI-fU-0lZ">
-                    <rect key="frame" x="147" y="433" width="147" height="24"/>
+                    <rect key="frame" x="213" y="451" width="147" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="143" id="dW5-vG-EwD"/>
                     </constraints>
@@ -60,19 +50,19 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="YQi-x8-6f8">
-                    <rect key="frame" x="143" y="400" width="154" height="20"/>
+                    <rect key="frame" x="53" y="412" width="137" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="eY8-bV-QLM"/>
-                        <constraint firstAttribute="width" constant="150" id="n8S-fR-UtY"/>
+                        <constraint firstAttribute="width" constant="133" id="n8S-fR-UtY"/>
                     </constraints>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Day Display Options" id="KTv-74-itf">
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Day Display Options" id="KTv-74-itf">
                         <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <segmentedControl toolTip="Select a time-format!" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OrL-Ix-fmY">
-                    <rect key="frame" x="102" y="495" width="236" height="24"/>
+                    <rect key="frame" x="213" y="488" width="236" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="232" id="uOJ-Mi-Fin"/>
                     </constraints>
@@ -89,7 +79,7 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="3d9-qg-dNb">
-                    <rect key="frame" x="130" y="166" width="179" height="22"/>
+                    <rect key="frame" x="203" y="160" width="179" height="22"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="22" id="MdL-Dh-02n"/>
                         <constraint firstAttribute="width" constant="175" id="hHO-Wa-gmc"/>
@@ -101,11 +91,12 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="pqa-Qg-U8Y">
-                    <rect key="frame" x="130" y="137" width="179" height="20"/>
+                    <rect key="frame" x="11" y="126" width="179" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="175" id="B2I-0j-0W0"/>
+                        <constraint firstAttribute="height" constant="20" id="SA9-20-fCp"/>
                     </constraints>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Date of Favourite Place" id="IAe-wr-MUG">
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Include Date" id="IAe-wr-MUG">
                         <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -115,7 +106,7 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="atA-2r-FXV">
-                    <rect key="frame" x="179" y="109" width="84" height="24"/>
+                    <rect key="frame" x="216" y="125" width="84" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="BqM-4F-6Ta"/>
                         <constraint firstAttribute="width" constant="80" id="ZeK-lO-tUa"/>
@@ -133,12 +124,12 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="kEn-QZ-niZ">
-                    <rect key="frame" x="130" y="84" width="179" height="22"/>
+                    <rect key="frame" x="11" y="75" width="179" height="22"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="22" id="2fd-f6-8cD"/>
                         <constraint firstAttribute="width" constant="175" id="D0w-xz-gkw"/>
                     </constraints>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Day of Favourite Place" id="I99-Wp-1Iq">
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Include Day" id="I99-Wp-1Iq">
                         <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -147,26 +138,8 @@
                         <binding destination="-2" name="enabled" keyPath="self.enableOptions" id="56M-0X-vvP"/>
                     </connections>
                 </textField>
-                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XwV-hy-YiP">
-                    <rect key="frame" x="178" y="56" width="84" height="24"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="80" id="dBz-ZQ-BF1"/>
-                        <constraint firstAttribute="height" constant="21" id="y8c-hZ-MtI"/>
-                    </constraints>
-                    <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="18N-XQ-ANm">
-                        <font key="font" size="12" name="HelveticaNeue-Light"/>
-                        <segments>
-                            <segment label="Yes" width="38"/>
-                            <segment label="No" width="38" selected="YES" tag="1"/>
-                        </segments>
-                    </segmentedCell>
-                    <connections>
-                        <binding destination="-2" name="enabled" keyPath="self.enableOptions" id="5wv-GT-fne"/>
-                        <binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.showDay" id="AeO-a9-xU4"/>
-                    </connections>
-                </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="72r-oi-X0f">
-                    <rect key="frame" x="180" y="313" width="79" height="24"/>
+                    <rect key="frame" x="213" y="368" width="79" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="75" id="H8w-wg-vel"/>
                     </constraints>
@@ -183,7 +156,7 @@
                     </connections>
                 </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="14F-6y-MaJ">
-                    <rect key="frame" x="180" y="203" width="79" height="24"/>
+                    <rect key="frame" x="213" y="286" width="79" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="75" id="XbD-oF-Vod"/>
                     </constraints>
@@ -199,50 +172,32 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="HTZ-1V-qZb">
-                    <rect key="frame" x="158" y="344" width="124" height="20"/>
+                    <rect key="frame" x="66" y="372" width="124" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="1Lv-wC-hEM"/>
                     </constraints>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Future Slider" id="PE4-Ua-hkI">
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Show Future Slider" id="PE4-Ua-hkI">
                         <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <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" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="76h-05-go1">
-                    <rect key="frame" x="158" y="287" width="124" height="20"/>
+                    <rect key="frame" x="66" y="331" width="124" height="20"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="Odw-mb-nT5"/>
                     </constraints>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Clocker should be" id="ahg-YF-MX8">
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Clocker should be" id="ahg-YF-MX8">
                         <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="MHe-dB-GZr">
-                    <rect key="frame" x="0.0" y="194" width="439" height="5"/>
-                    <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                    <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                    <font key="titleFont" metaFont="system"/>
+                <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="MHe-dB-GZr">
+                    <rect key="frame" x="0.0" y="188" width="585" height="5"/>
                 </box>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="LC1-Sx-uav">
-                    <rect key="frame" x="130" y="32" width="179" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="175" id="Pdc-78-vzv"/>
-                        <constraint firstAttribute="height" constant="18" id="hsh-i8-ULY"/>
-                    </constraints>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Favourite Place Name" id="nEh-Sa-SDH">
-                        <font key="font" size="13" name="HelveticaNeue-Light"/>
-                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                    <connections>
-                        <binding destination="-2" name="enabled" keyPath="self.enableOptions" id="3ho-kS-zgV"/>
-                    </connections>
-                </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JR8-v7-K0w">
-                    <rect key="frame" x="178" y="4" width="84" height="24"/>
+                    <rect key="frame" x="216" y="24" width="84" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="Xof-eY-ZUl"/>
                         <constraint firstAttribute="width" constant="80" id="msH-Xd-mrp"/>
@@ -260,7 +215,7 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="X5s-Mc-Yfo">
-                    <rect key="frame" x="130" y="552" width="179" height="18"/>
+                    <rect key="frame" x="203" y="529" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="175" id="YaE-Og-A4W"/>
                         <constraint firstAttribute="height" constant="18" id="bTT-ve-oW9"/>
@@ -272,7 +227,7 @@
                     </textFieldCell>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1eh-BT-2fK">
-                    <rect key="frame" x="155" y="369" width="129" height="24"/>
+                    <rect key="frame" x="213" y="410" width="129" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="125" id="u9T-ks-rqA"/>
                     </constraints>
@@ -288,38 +243,8 @@
                         <binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.relativeDate" id="eKo-sG-1eE"/>
                     </connections>
                 </segmentedControl>
-                <visualEffectView wantsLayer="YES" appearanceType="vibrantLight" alphaValue="0.90000000000000002" blendingMode="withinWindow" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="kHi-mx-HdE">
-                    <rect key="frame" x="0.0" y="0.0" width="439" height="196"/>
-                    <subviews>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="320" translatesAutoresizingMaskIntoConstraints="NO" id="WDP-d4-eNj">
-                            <rect key="frame" x="57" y="84" width="324" height="39"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="320" id="3wp-Z6-TrB"/>
-                                <constraint firstAttribute="height" constant="39" id="IyN-y5-6JP"/>
-                            </constraints>
-                            <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="JHS-Tb-Aq8">
-                                <font key="font" size="13" name="HelveticaNeue-Bold"/>
-                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                            <connections>
-                                <binding destination="-2" name="hidden" keyPath="self.enableOptions" id="ZtR-jU-eva"/>
-                            </connections>
-                        </textField>
-                    </subviews>
-                    <constraints>
-                        <constraint firstItem="WDP-d4-eNj" firstAttribute="centerY" secondItem="kHi-mx-HdE" secondAttribute="centerY" constant="-5.5" id="YZN-MB-zQ8"/>
-                        <constraint firstItem="WDP-d4-eNj" firstAttribute="centerX" secondItem="kHi-mx-HdE" secondAttribute="centerX" id="xlO-Y9-7Dn"/>
-                    </constraints>
-                    <shadow key="shadow" blurRadius="10">
-                        <color key="color" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                    </shadow>
-                    <connections>
-                        <binding destination="-2" name="hidden" keyPath="self.enableOptions" id="4El-Z9-rMM"/>
-                    </connections>
-                </visualEffectView>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SbG-Qh-ziy">
-                    <rect key="frame" x="53" y="256" width="334" height="24"/>
+                    <rect key="frame" x="213" y="327" width="334" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="330" id="T2D-fB-93g"/>
                     </constraints>
@@ -335,69 +260,217 @@
                         <binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.displayAppAsForegroundApp" id="Fuh-BG-SYM"/>
                     </connections>
                 </segmentedControl>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="f2Q-vO-MPo">
+                    <rect key="frame" x="23" y="248" width="167" height="20"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="163" id="vKf-lb-QeN"/>
+                    </constraints>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Display the time in seconds" id="rh5-Qc-lnl">
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ldk-to-zYd">
+                    <rect key="frame" x="213" y="245" width="82" height="24"/>
+                    <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="bca-wW-eJM">
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
+                        <segments>
+                            <segment label="Yes"/>
+                            <segment label="No" selected="YES" tag="1"/>
+                        </segments>
+                    </segmentedCell>
+                    <connections>
+                        <binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.showSeconds" id="Zjy-8n-mQV"/>
+                    </connections>
+                </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="R46-6I-vYT">
-                    <rect key="frame" x="138" y="230" width="164" height="20"/>
+                    <rect key="frame" x="46" y="288" width="144" height="20"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="160" id="3tu-Bf-MZ4"/>
+                        <constraint firstAttribute="width" constant="140" id="3tu-Bf-MZ4"/>
                     </constraints>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Show Sunrise/Sunset" id="dPO-nm-S9e">
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Show Sunrise/Sunset" id="dPO-nm-S9e">
                         <font key="font" size="13" name="HelveticaNeue-Light"/>
                         <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" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="5TC-RQ-gzI">
+                    <rect key="frame" x="86" y="493" width="104" height="18"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="gWc-u4-D8E"/>
+                        <constraint firstAttribute="width" constant="100" id="nh0-5K-Aa0"/>
+                    </constraints>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Time Format" id="Hza-PB-FEf">
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XwV-hy-YiP">
+                    <rect key="frame" x="216" y="74" width="84" height="24"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="80" id="dBz-ZQ-BF1"/>
+                        <constraint firstAttribute="height" constant="21" id="y8c-hZ-MtI"/>
+                    </constraints>
+                    <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="18N-XQ-ANm">
+                        <font key="font" size="12" name="HelveticaNeue-Light"/>
+                        <segments>
+                            <segment label="Yes" width="38"/>
+                            <segment label="No" width="38" selected="YES" tag="1"/>
+                        </segments>
+                    </segmentedCell>
+                    <connections>
+                        <binding destination="-2" name="enabled" keyPath="self.enableOptions" id="5wv-GT-fne"/>
+                        <binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.showDay" id="AeO-a9-xU4"/>
+                    </connections>
+                </segmentedControl>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="AV0-RE-Dcn">
+                    <rect key="frame" x="11" y="30" width="179" height="18"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="18" id="63B-fX-neA"/>
+                        <constraint firstAttribute="width" constant="175" id="HpK-tm-aDg"/>
+                    </constraints>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Include Place Name" id="ehE-BM-hQd">
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                    <connections>
+                        <binding destination="-2" name="enabled" keyPath="self.enableOptions" id="48s-vA-1Hn"/>
+                    </connections>
+                </textField>
+                <slider verticalHuggingPriority="750" alphaValue="0.59999999999999998" translatesAutoresizingMaskIntoConstraints="NO" id="110-Qf-bgG">
+                    <rect key="frame" x="241" y="205" width="256" height="24"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="252" id="WyW-ga-f0f"/>
+                    </constraints>
+                    <sliderCell key="cell" state="on" alignment="left" minValue="1" maxValue="7" doubleValue="4" tickMarkPosition="above" numberOfTickMarks="7" allowsTickMarkValuesOnly="YES" sliderType="linear" id="M0F-ob-Mjy"/>
+                    <connections>
+                        <binding destination="WGI-5h-l6M" name="value" keyPath="values.userFontSize" id="T64-QX-szn"/>
+                    </connections>
+                </slider>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="kG7-Ie-H4f">
+                    <rect key="frame" x="23" y="208" width="167" height="20"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="163" id="Tma-h6-JAz"/>
+                    </constraints>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Larger Text" id="pnT-pX-lCO">
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
+                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="YhF-Ej-nK4">
+                    <rect key="frame" x="217" y="200" width="18" height="28"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="28" id="zYn-8T-Fdr"/>
+                        <constraint firstAttribute="width" constant="18" id="zxG-Oo-Uti"/>
+                    </constraints>
+                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSFontPanel" id="cq7-TL-C6e"/>
+                </imageView>
+                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dS9-c7-MxQ">
+                    <rect key="frame" x="503" y="189" width="40" height="52"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="52" id="btN-8s-pz3"/>
+                        <constraint firstAttribute="width" constant="40" id="gXE-NP-DO0"/>
+                    </constraints>
+                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSFontPanel" id="EBW-jh-OAK"/>
+                </imageView>
+                <visualEffectView appearanceType="vibrantLight" blendingMode="behindWindow" material="light" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="Zl7-KZ-ULi">
+                    <rect key="frame" x="0.0" y="0.0" width="585" height="191"/>
+                    <subviews>
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8En-R0-gDb">
+                            <rect key="frame" x="25" y="81" width="536" height="30"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="532" id="EOs-22-kAR"/>
+                                <constraint firstAttribute="height" constant="30" id="Gf9-wk-wsf"/>
+                            </constraints>
+                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="yFW-MK-tvj">
+                                <font key="font" size="20" name="HelveticaNeue-Thin"/>
+                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                            </textFieldCell>
+                            <connections>
+                                <binding destination="-2" name="hidden" keyPath="self.enableOptions" id="zu7-dy-eZh"/>
+                            </connections>
+                        </textField>
+                    </subviews>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="191" id="5gR-et-6El"/>
+                        <constraint firstItem="8En-R0-gDb" firstAttribute="centerY" secondItem="Zl7-KZ-ULi" secondAttribute="centerY" id="BNl-mB-JTz"/>
+                        <constraint firstItem="8En-R0-gDb" firstAttribute="centerX" secondItem="Zl7-KZ-ULi" secondAttribute="centerX" id="d2S-8N-weN"/>
+                    </constraints>
+                    <connections>
+                        <binding destination="-2" name="hidden" keyPath="self.enableOptions" id="d2k-eq-Uv5"/>
+                    </connections>
+                </visualEffectView>
             </subviews>
             <constraints>
-                <constraint firstItem="5TC-RQ-gzI" firstAttribute="top" secondItem="X5s-Mc-Yfo" secondAttribute="bottom" constant="8" id="1Wi-S2-cSq"/>
-                <constraint firstItem="72r-oi-X0f" firstAttribute="top" secondItem="HTZ-1V-qZb" secondAttribute="bottom" constant="8" id="23z-Z7-vpe"/>
-                <constraint firstItem="LC1-Sx-uav" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="2M5-Z9-HrL"/>
-                <constraint firstItem="SbG-Qh-ziy" firstAttribute="top" secondItem="76h-05-go1" secondAttribute="bottom" constant="8" id="4dL-4I-aA9"/>
-                <constraint firstItem="YQi-x8-6f8" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="6LU-d8-lKX"/>
-                <constraint firstItem="3d9-qg-dNb" firstAttribute="top" secondItem="MHe-dB-GZr" secondAttribute="bottom" constant="8" id="BZ1-zf-1At"/>
+                <constraint firstItem="5tI-fU-0lZ" firstAttribute="leading" secondItem="iVw-cq-zLz" secondAttribute="trailing" constant="27" id="09M-ej-JuT"/>
+                <constraint firstItem="5TC-RQ-gzI" firstAttribute="top" secondItem="X5s-Mc-Yfo" secondAttribute="bottom" constant="18" id="1Wi-S2-cSq"/>
+                <constraint firstItem="atA-2r-FXV" firstAttribute="leading" secondItem="pqa-Qg-U8Y" secondAttribute="trailing" constant="30" id="1cB-qu-vg8"/>
+                <constraint firstItem="f2Q-vO-MPo" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="25" id="1pT-cx-PGJ"/>
+                <constraint firstItem="kG7-Ie-H4f" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="25" id="2Fb-AG-GFp"/>
+                <constraint firstItem="72r-oi-X0f" firstAttribute="leading" secondItem="HTZ-1V-qZb" secondAttribute="trailing" constant="27" id="3yw-VH-8BN"/>
+                <constraint firstItem="AV0-RE-Dcn" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="13" id="42G-Bz-thC"/>
+                <constraint firstItem="JR8-v7-K0w" firstAttribute="leading" secondItem="AV0-RE-Dcn" secondAttribute="trailing" constant="30" id="4b2-I4-DY3"/>
+                <constraint firstItem="iVw-cq-zLz" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="128" id="5uc-bV-qZ4"/>
+                <constraint firstItem="kG7-Ie-H4f" firstAttribute="top" secondItem="f2Q-vO-MPo" secondAttribute="bottom" constant="20" id="9Te-aW-Vhq"/>
+                <constraint firstItem="XwV-hy-YiP" firstAttribute="leading" secondItem="kEn-QZ-niZ" secondAttribute="trailing" constant="30" id="9cV-dY-bvk"/>
+                <constraint firstItem="14F-6y-MaJ" firstAttribute="leading" secondItem="R46-6I-vYT" secondAttribute="trailing" constant="27" id="9cx-2b-Fs7"/>
+                <constraint firstItem="pqa-Qg-U8Y" firstAttribute="top" secondItem="3d9-qg-dNb" secondAttribute="bottom" constant="14" id="BbP-bV-0Ow"/>
                 <constraint firstItem="3d9-qg-dNb" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="FBj-0N-ltc"/>
-                <constraint firstAttribute="bottom" secondItem="kHi-mx-HdE" secondAttribute="bottom" id="GqC-hp-yU9"/>
-                <constraint firstItem="R46-6I-vYT" firstAttribute="top" secondItem="SbG-Qh-ziy" secondAttribute="bottom" constant="8" id="Hiy-x3-7hE"/>
-                <constraint firstItem="OrL-Ix-fmY" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="JtZ-ra-RaC"/>
-                <constraint firstItem="SbG-Qh-ziy" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="MAr-WP-e6V"/>
-                <constraint firstItem="kEn-QZ-niZ" firstAttribute="top" secondItem="atA-2r-FXV" secondAttribute="bottom" constant="5" id="O8m-uk-Ppx"/>
-                <constraint firstItem="kHi-mx-HdE" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="Oan-Iw-Pp1"/>
+                <constraint firstItem="ldk-to-zYd" firstAttribute="leading" secondItem="f2Q-vO-MPo" secondAttribute="trailing" constant="27" id="FIY-ue-9jm"/>
+                <constraint firstItem="atA-2r-FXV" firstAttribute="top" secondItem="3d9-qg-dNb" secondAttribute="bottom" constant="12" id="FzK-Kq-gAo"/>
+                <constraint firstItem="SbG-Qh-ziy" firstAttribute="top" secondItem="72r-oi-X0f" secondAttribute="bottom" constant="20" id="GNY-9w-Fon"/>
+                <constraint firstItem="R46-6I-vYT" firstAttribute="top" secondItem="SbG-Qh-ziy" secondAttribute="bottom" constant="21" id="Hiy-x3-7hE"/>
+                <constraint firstItem="MHe-dB-GZr" firstAttribute="top" secondItem="110-Qf-bgG" secondAttribute="bottom" constant="16" id="IwT-tl-ktf"/>
+                <constraint firstItem="f2Q-vO-MPo" firstAttribute="top" secondItem="14F-6y-MaJ" secondAttribute="bottom" constant="20" id="LgU-f5-W9a"/>
+                <constraint firstItem="YhF-Ej-nK4" firstAttribute="leading" secondItem="kG7-Ie-H4f" secondAttribute="trailing" constant="29" id="Nqt-LV-E1Q"/>
                 <constraint firstItem="X5s-Mc-Yfo" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="8" id="OeD-4K-q6Y"/>
-                <constraint firstItem="HTZ-1V-qZb" firstAttribute="top" secondItem="1eh-BT-2fK" secondAttribute="bottom" constant="7" id="Ohx-zT-4Wu"/>
-                <constraint firstItem="pqa-Qg-U8Y" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="PHa-pY-kHG"/>
-                <constraint firstItem="1eh-BT-2fK" firstAttribute="top" secondItem="YQi-x8-6f8" secondAttribute="bottom" constant="8" id="POa-Gi-Prk"/>
+                <constraint firstItem="3d9-qg-dNb" firstAttribute="top" secondItem="MHe-dB-GZr" secondAttribute="bottom" constant="8" id="Oed-Un-siR"/>
+                <constraint firstItem="HTZ-1V-qZb" firstAttribute="top" secondItem="1eh-BT-2fK" secondAttribute="bottom" constant="20" id="Ohx-zT-4Wu"/>
                 <constraint firstItem="X5s-Mc-Yfo" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="PRU-TH-852"/>
-                <constraint firstItem="atA-2r-FXV" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" constant="1" id="Pjx-sg-kK0"/>
-                <constraint firstAttribute="trailing" secondItem="kHi-mx-HdE" secondAttribute="trailing" id="QaQ-6R-Oy9"/>
-                <constraint firstItem="XwV-hy-YiP" firstAttribute="top" secondItem="kEn-QZ-niZ" secondAttribute="bottom" constant="5" id="Qyy-6B-BBN"/>
-                <constraint firstItem="atA-2r-FXV" firstAttribute="top" secondItem="pqa-Qg-U8Y" secondAttribute="bottom" constant="5" id="RdE-wy-6vH"/>
+                <constraint firstItem="dS9-c7-MxQ" firstAttribute="top" secondItem="ldk-to-zYd" secondAttribute="bottom" constant="6" id="Qmk-pf-bld"/>
+                <constraint firstItem="72r-oi-X0f" firstAttribute="top" secondItem="1eh-BT-2fK" secondAttribute="bottom" constant="21" id="Rju-VD-EVQ"/>
                 <constraint firstItem="MHe-dB-GZr" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="TyR-gg-RLi"/>
-                <constraint firstItem="pqa-Qg-U8Y" firstAttribute="top" secondItem="3d9-qg-dNb" secondAttribute="bottom" constant="9" id="Uc0-mI-ciF"/>
-                <constraint firstItem="5tI-fU-0lZ" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" constant="1" id="Vkb-QV-unN"/>
-                <constraint firstItem="HTZ-1V-qZb" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Wet-hO-O6U"/>
-                <constraint firstItem="YQi-x8-6f8" firstAttribute="top" secondItem="5tI-fU-0lZ" secondAttribute="bottom" constant="15" id="WoY-W4-XuS"/>
-                <constraint firstItem="JR8-v7-K0w" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Wye-84-JgC"/>
-                <constraint firstItem="76h-05-go1" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="XcN-rp-Cxq"/>
-                <constraint firstItem="iVw-cq-zLz" firstAttribute="top" secondItem="OrL-Ix-fmY" secondAttribute="bottom" constant="15" id="XgM-Wl-Xap"/>
-                <constraint firstItem="iVw-cq-zLz" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Zh8-Vn-VxM"/>
-                <constraint firstItem="5tI-fU-0lZ" firstAttribute="top" secondItem="iVw-cq-zLz" secondAttribute="bottom" constant="8" id="bo6-s2-Vfj"/>
-                <constraint firstItem="R46-6I-vYT" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="c3p-ZZ-E8L"/>
-                <constraint firstItem="76h-05-go1" firstAttribute="top" secondItem="72r-oi-X0f" secondAttribute="bottom" constant="8" id="cgM-DZ-Mzt"/>
-                <constraint firstItem="14F-6y-MaJ" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="e4M-c0-gIC"/>
-                <constraint firstItem="kEn-QZ-niZ" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="eU3-c4-cnM"/>
-                <constraint firstItem="1eh-BT-2fK" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="fvI-By-5Ef"/>
-                <constraint firstItem="MHe-dB-GZr" firstAttribute="top" secondItem="14F-6y-MaJ" secondAttribute="bottom" constant="8" id="gpo-Qh-mTk"/>
+                <constraint firstItem="76h-05-go1" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="68" id="VRf-qe-f7g"/>
+                <constraint firstItem="dS9-c7-MxQ" firstAttribute="leading" secondItem="110-Qf-bgG" secondAttribute="trailing" constant="8" id="Vti-h4-gdv"/>
+                <constraint firstItem="YQi-x8-6f8" firstAttribute="top" secondItem="5tI-fU-0lZ" secondAttribute="bottom" constant="21" id="WoY-W4-XuS"/>
+                <constraint firstItem="iVw-cq-zLz" firstAttribute="top" secondItem="OrL-Ix-fmY" secondAttribute="bottom" constant="16" id="XgM-Wl-Xap"/>
+                <constraint firstItem="ldk-to-zYd" firstAttribute="top" secondItem="14F-6y-MaJ" secondAttribute="bottom" constant="20" id="YQJ-AQ-AaB"/>
+                <constraint firstItem="1eh-BT-2fK" firstAttribute="leading" secondItem="YQi-x8-6f8" secondAttribute="trailing" constant="27" id="YxA-gF-2C1"/>
+                <constraint firstItem="R46-6I-vYT" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="48" id="aM3-jx-h9s"/>
+                <constraint firstAttribute="bottom" secondItem="Zl7-KZ-ULi" secondAttribute="bottom" id="bg1-Yp-QGg"/>
+                <constraint firstItem="5tI-fU-0lZ" firstAttribute="top" secondItem="iVw-cq-zLz" secondAttribute="bottom" constant="-18" id="bo6-s2-Vfj"/>
+                <constraint firstItem="76h-05-go1" firstAttribute="top" secondItem="72r-oi-X0f" secondAttribute="bottom" constant="19" id="cgM-DZ-Mzt"/>
+                <constraint firstItem="110-Qf-bgG" firstAttribute="top" secondItem="ldk-to-zYd" secondAttribute="bottom" constant="18" id="dMs-8G-cPd"/>
+                <constraint firstAttribute="trailing" secondItem="Zl7-KZ-ULi" secondAttribute="trailing" id="eXh-iU-7qK"/>
+                <constraint firstItem="1eh-BT-2fK" firstAttribute="top" secondItem="5tI-fU-0lZ" secondAttribute="bottom" constant="20" id="euV-Th-hKu"/>
+                <constraint firstItem="HTZ-1V-qZb" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="68" id="hze-nB-VGS"/>
                 <constraint firstAttribute="trailing" secondItem="MHe-dB-GZr" secondAttribute="trailing" id="jL7-Cv-YuY"/>
-                <constraint firstItem="14F-6y-MaJ" firstAttribute="top" secondItem="R46-6I-vYT" secondAttribute="bottom" constant="4" id="k6X-sH-Ybz"/>
-                <constraint firstItem="5TC-RQ-gzI" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="lc0-ud-Mnw"/>
-                <constraint firstItem="JR8-v7-K0w" firstAttribute="top" secondItem="LC1-Sx-uav" secondAttribute="bottom" constant="5" id="pHX-KA-5RI"/>
-                <constraint firstItem="OrL-Ix-fmY" firstAttribute="top" secondItem="5TC-RQ-gzI" secondAttribute="bottom" constant="8" id="rpk-WN-DT9"/>
-                <constraint firstItem="kHi-mx-HdE" firstAttribute="top" secondItem="MHe-dB-GZr" secondAttribute="bottom" id="uK7-ny-f3a"/>
-                <constraint firstItem="72r-oi-X0f" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="wHU-od-8e8"/>
-                <constraint firstItem="XwV-hy-YiP" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="x6a-GW-bOn"/>
-                <constraint firstItem="LC1-Sx-uav" firstAttribute="top" secondItem="XwV-hy-YiP" secondAttribute="bottom" constant="8" id="xFV-GA-ozB"/>
+                <constraint firstItem="kEn-QZ-niZ" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="13" id="kIo-mO-HD7"/>
+                <constraint firstItem="XwV-hy-YiP" firstAttribute="top" secondItem="atA-2r-FXV" secondAttribute="bottom" constant="30" id="mXv-fb-QQR"/>
+                <constraint firstItem="110-Qf-bgG" firstAttribute="leading" secondItem="YhF-Ej-nK4" secondAttribute="trailing" constant="8" id="n5J-TZ-gmX"/>
+                <constraint firstItem="SbG-Qh-ziy" firstAttribute="leading" secondItem="76h-05-go1" secondAttribute="trailing" constant="27" id="nAt-t6-tt1"/>
+                <constraint firstItem="14F-6y-MaJ" firstAttribute="top" secondItem="SbG-Qh-ziy" secondAttribute="bottom" constant="20" id="pVQ-xo-bc4"/>
+                <constraint firstItem="pqa-Qg-U8Y" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="13" id="pXe-Rk-xtZ"/>
+                <constraint firstItem="AV0-RE-Dcn" firstAttribute="top" secondItem="XwV-hy-YiP" secondAttribute="bottom" constant="28" id="qdY-rp-pnQ"/>
+                <constraint firstItem="YhF-Ej-nK4" firstAttribute="top" secondItem="ldk-to-zYd" secondAttribute="bottom" constant="19" id="qfW-Zu-TC1"/>
+                <constraint firstItem="OrL-Ix-fmY" firstAttribute="top" secondItem="5TC-RQ-gzI" secondAttribute="bottom" constant="-18" id="rpk-WN-DT9"/>
+                <constraint firstItem="OrL-Ix-fmY" firstAttribute="leading" secondItem="5TC-RQ-gzI" secondAttribute="trailing" constant="27" id="v3g-9s-ueW"/>
+                <constraint firstItem="Zl7-KZ-ULi" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="vLb-cV-kPq"/>
+                <constraint firstItem="kEn-QZ-niZ" firstAttribute="top" secondItem="atA-2r-FXV" secondAttribute="bottom" constant="30" id="vOW-py-FUO"/>
+                <constraint firstItem="YQi-x8-6f8" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="55" id="xqh-U1-NDQ"/>
+                <constraint firstItem="JR8-v7-K0w" firstAttribute="top" secondItem="XwV-hy-YiP" secondAttribute="bottom" constant="29" id="yj8-uz-0km"/>
+                <constraint firstItem="5TC-RQ-gzI" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="88" id="ypY-5V-LTC"/>
             </constraints>
-            <point key="canvasLocation" x="186.5" y="296"/>
+            <point key="canvasLocation" x="103.5" y="284.5"/>
         </customView>
         <userDefaultsController representsSharedInstance="YES" id="WGI-5h-l6M"/>
     </objects>
+    <resources>
+        <image name="NSFontPanel" width="32" height="32"/>
+    </resources>
 </document>
diff --git a/Clocker/Appearance Tab/ja.lproj/CLAppearanceView.xib b/Clocker/Appearance Tab/ja.lproj/CLAppearanceView.xib
index ad38401..8f92f75 100644
--- a/Clocker/Appearance Tab/ja.lproj/CLAppearanceView.xib	
+++ b/Clocker/Appearance Tab/ja.lproj/CLAppearanceView.xib	
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?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">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="CLAppearanceViewController">
@@ -193,11 +194,8 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="MHe-dB-GZr">
+                <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="MHe-dB-GZr">
                     <rect key="frame" x="0.0" y="189" width="439" height="5"/>
-                    <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                    <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                    <font key="titleFont" metaFont="system"/>
                 </box>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LC1-Sx-uav">
                     <rect key="frame" x="130" y="33" width="179" height="18"/>
@@ -261,7 +259,7 @@
                         <binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.relativeDate" id="eKo-sG-1eE"/>
                     </connections>
                 </segmentedControl>
-                <visualEffectView wantsLayer="YES" appearanceType="vibrantLight" alphaValue="0.90000000000000002" blendingMode="withinWindow" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="kHi-mx-HdE">
+                <visualEffectView wantsLayer="YES" appearanceType="vibrantLight" alphaValue="0.90000000000000002" blendingMode="withinWindow" material="appearanceBased" state="followsWindowActiveState" translatesAutoresizingMaskIntoConstraints="NO" id="kHi-mx-HdE">
                     <rect key="frame" x="0.0" y="0.0" width="439" height="191"/>
                     <subviews>
                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="320" translatesAutoresizingMaskIntoConstraints="NO" id="WDP-d4-eNj">
diff --git a/Clocker/Preferences/en.lproj/CLPreferencesView.xib b/Clocker/Preferences/en.lproj/CLPreferencesView.xib
index 6dd8e09..28cccb2 100644
--- a/Clocker/Preferences/en.lproj/CLPreferencesView.xib
+++ b/Clocker/Preferences/en.lproj/CLPreferencesView.xib
@@ -1,7 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?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">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11542"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="CLPreferencesViewController">
@@ -21,7 +23,7 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <view id="Uu9-io-frR">
-            <rect key="frame" x="0.0" y="0.0" width="439" height="344"/>
+            <rect key="frame" x="0.0" y="0.0" width="585" height="555"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <button toolTip="Add a timezone" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4yB-vZ-tNX">
@@ -51,20 +53,20 @@ CA
                         <action selector="removeFromFavourites:" target="-2" id="M3C-EF-9kQ"/>
                     </connections>
                 </button>
-                <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="22" horizontalPageScroll="10" verticalLineScroll="22" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zBR-OH-6QQ">
-                    <rect key="frame" x="10" y="66" width="419" height="270"/>
+                <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="42" horizontalPageScroll="10" verticalLineScroll="42" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zBR-OH-6QQ">
+                    <rect key="frame" x="10" y="63" width="565" height="484"/>
                     <clipView key="contentView" id="UZ2-JA-TZe">
-                        <rect key="frame" x="0.0" y="0.0" width="419" height="270"/>
+                        <rect key="frame" x="0.0" y="0.0" width="565" height="484"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnSelection="YES" autosaveColumns="NO" rowHeight="20" headerView="igm-uc-1wh" id="LbJ-dW-ITm">
-                                <rect key="frame" x="0.0" y="0.0" width="419" height="247"/>
+                            <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnSelection="YES" autosaveColumns="NO" rowHeight="40" headerView="igm-uc-1wh" id="LbJ-dW-ITm">
+                                <rect key="frame" x="0.0" y="0.0" width="569" height="461"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
-                                    <tableColumn identifier="favouriteTimezone" width="54.0546875" minWidth="50" maxWidth="55" id="AeF-Ol-OlY">
+                                    <tableColumn identifier="favouriteTimezone" width="55" minWidth="50" maxWidth="55" id="AeF-Ol-OlY">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Favourite">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -76,27 +78,27 @@ CA
                                         </buttonCell>
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                     </tableColumn>
-                                    <tableColumn identifier="formattedAddress" editable="NO" width="250" minWidth="80" maxWidth="1000" id="YaU-AD-fOu">
-                                        <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Selected Timezone(s)">
+                                    <tableColumn identifier="formattedAddress" editable="NO" width="265" minWidth="80" maxWidth="1000" id="YaU-AD-fOu">
+                                        <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Selected Timezone(s)">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="HJL-uw-ZOC">
-                                            <font key="font" size="13" name="HelveticaNeue-Light"/>
+                                            <font key="font" size="24" name="HelveticaNeue-Thin"/>
                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                     </tableColumn>
-                                    <tableColumn identifier="label" width="106" minWidth="80" maxWidth="120" id="wmL-jC-Tny">
+                                    <tableColumn identifier="label" width="240" minWidth="80" maxWidth="240" id="wmL-jC-Tny">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Label">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </tableHeaderCell>
                                         <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="xOd-3p-ihC">
-                                            <font key="font" size="13" name="HelveticaNeue-Light"/>
+                                            <font key="font" size="24" name="HelveticaNeue-Thin"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -109,13 +111,9 @@ CA
                                 </connections>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </clipView>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="270" id="PZN-nD-VFx"/>
-                    </constraints>
-                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="QrG-bP-Ras">
-                        <rect key="frame" x="0.0" y="266" width="419" height="15"/>
+                    <scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="QrG-bP-Ras">
+                        <rect key="frame" x="0.0" y="468" width="565" height="16"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="dvf-BY-cGu">
@@ -123,7 +121,7 @@ CA
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <tableHeaderView key="headerView" focusRingType="none" id="igm-uc-1wh">
-                        <rect key="frame" x="0.0" y="0.0" width="419" height="23"/>
+                        <rect key="frame" x="0.0" y="0.0" width="569" height="23"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
@@ -143,7 +141,7 @@ CA
                     </connections>
                 </button>
                 <customView focusRingType="none" appearanceType="aqua" translatesAutoresizingMaskIntoConstraints="NO" id="DuQ-3m-l0n" customClass="SRRecorderControl">
-                    <rect key="frame" x="249" y="22" width="180" height="25"/>
+                    <rect key="frame" x="395" y="22" width="180" height="25"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="180" id="aut-wW-20E"/>
                         <constraint firstAttribute="height" constant="25" id="es4-pH-3Rc"/>
@@ -161,6 +159,7 @@ CA
                 <constraint firstItem="HMC-Ku-qrH" firstAttribute="leading" secondItem="iOG-Ey-lmD" secondAttribute="trailing" constant="8" id="RAb-Xi-AY4"/>
                 <constraint firstAttribute="bottom" secondItem="4yB-vZ-tNX" secondAttribute="bottom" constant="25" id="Zyb-ya-88h"/>
                 <constraint firstAttribute="bottom" secondItem="iOG-Ey-lmD" secondAttribute="bottom" constant="25" id="cZh-fI-Lio"/>
+                <constraint firstItem="iOG-Ey-lmD" firstAttribute="top" secondItem="zBR-OH-6QQ" secondAttribute="bottom" constant="18" id="f6i-hA-tIs"/>
                 <constraint firstAttribute="trailing" secondItem="zBR-OH-6QQ" secondAttribute="trailing" constant="10" id="p1P-Ev-oBI"/>
                 <constraint firstAttribute="bottom" secondItem="DuQ-3m-l0n" secondAttribute="bottom" constant="22" id="vzh-s2-a5z"/>
                 <constraint firstItem="iOG-Ey-lmD" firstAttribute="width" secondItem="4yB-vZ-tNX" secondAttribute="width" id="wLJ-lQ-GhP"/>
@@ -168,14 +167,14 @@ CA
                 <constraint firstItem="4yB-vZ-tNX" firstAttribute="leading" secondItem="Uu9-io-frR" secondAttribute="leading" constant="11" id="zgB-PO-97r"/>
                 <constraint firstItem="zBR-OH-6QQ" firstAttribute="leading" secondItem="Uu9-io-frR" secondAttribute="leading" constant="10" id="zoH-62-nam"/>
             </constraints>
-            <point key="canvasLocation" x="295.5" y="178"/>
+            <point key="canvasLocation" x="295.5" y="177.5"/>
         </view>
         <userDefaultsController representsSharedInstance="YES" id="1Gq-ZQ-IML"/>
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hasShadow="NO" hidesOnDeactivate="YES" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="alertPanel" appearanceType="aqua" frameAutosaveName="" id="6FL-fp-Ke1" customClass="Panel">
             <windowStyleMask key="styleMask" closable="YES" miniaturizable="YES" nonactivatingPanel="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="120" y="64" width="345" height="320"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
             <value key="minSize" type="size" width="345" height="320"/>
             <value key="maxSize" type="size" width="345" height="320"/>
             <view key="contentView" id="kXo-nl-oxR">
@@ -335,7 +334,6 @@ DQ
                                     </connections>
                                 </tableView>
                             </subviews>
-                            <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                         </clipView>
                         <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="Ge2-Rs-CZ1">
                             <rect key="frame" x="0.0" y="208" width="329" height="15"/>