diff --git a/Clocker.xcodeproj/project.pbxproj b/Clocker.xcodeproj/project.pbxproj
index 57c7845..36a53a7 100755
--- a/Clocker.xcodeproj/project.pbxproj
+++ b/Clocker.xcodeproj/project.pbxproj
@@ -34,7 +34,6 @@
 		9A4379271BEC223900F4E27F /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A4379231BEC223900F4E27F /* Fabric.framework */; };
 		9A43792A1BEC230A00F4E27F /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A4379291BEC230A00F4E27F /* libc++.tbd */; };
 		9A43792C1BEC231100F4E27F /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A43792B1BEC231100F4E27F /* libz.tbd */; };
-		9A43792E1BEC256200F4E27F /* Media.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9A43792D1BEC256200F4E27F /* Media.xcassets */; };
 		9A56DB801C1CFB73004CE6AF /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9A56DB7D1C1CFB73004CE6AF /* MainMenu.xib */; };
 		9A5951BA1C1D0A22009C17AA /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A5951B91C1D0A22009C17AA /* Crashlytics.framework */; };
 		9A5951BD1C1D0A8D009C17AA /* CommonStrings.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A5951BB1C1D0A8D009C17AA /* CommonStrings.m */; };
@@ -72,7 +71,12 @@
 		9A9E87681C1FEDD300A7A2DF /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A9E87671C1FEDD300A7A2DF /* Security.framework */; };
 		9A9E876A1C1FEDDB00A7A2DF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A9E87691C1FEDDB00A7A2DF /* SystemConfiguration.framework */; };
 		9A9E876C1C1FEDE700A7A2DF /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A9E876B1C1FEDE700A7A2DF /* libsqlite3.tbd */; };
+		9AA4AC8C1CEC0FA60054ACB7 /* FloatingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AA4AC871CEC0FA60054ACB7 /* FloatingView.m */; };
+		9AA4AC8D1CEC0FA60054ACB7 /* CLShortcutAnimatedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AA4AC891CEC0FA60054ACB7 /* CLShortcutAnimatedView.m */; };
+		9AA4AC8E1CEC0FA60054ACB7 /* CLFavouriteAnimatedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AA4AC8B1CEC0FA60054ACB7 /* CLFavouriteAnimatedView.m */; };
+		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 */; };
@@ -80,9 +84,6 @@
 		9AC678E41C1ABAB9003B4F6B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AC678E31C1ABAB9003B4F6B /* QuartzCore.framework */; };
 		9ACE03EF1CB0ADE00039FC01 /* Firebase.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9ACE03EE1CB0ADE00039FC01 /* Firebase.framework */; };
 		9AD6DE571CE114DA007A8401 /* CLScaleUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD6DE561CE114DA007A8401 /* CLScaleUpButton.m */; };
-		9AD6DE651CE18EB4007A8401 /* CLArrowIndicators.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AD6DE641CE18EB4007A8401 /* CLArrowIndicators.m */; };
-		9AE1FFE21CE28CF500827C80 /* CLAnimatedImages.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AE1FFDF1CE28CF500827C80 /* CLAnimatedImages.m */; };
-		9AE1FFE31CE28CF500827C80 /* QCMethod.m in Sources */ = {isa = PBXBuildFile; fileRef = 9AE1FFE11CE28CF500827C80 /* QCMethod.m */; };
 		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 */
@@ -238,7 +239,6 @@
 		9A4379231BEC223900F4E27F /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = "<group>"; };
 		9A4379291BEC230A00F4E27F /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		9A43792B1BEC231100F4E27F /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		9A43792D1BEC256200F4E27F /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
 		9A56DB7D1C1CFB73004CE6AF /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MainMenu.xib; path = Clocker/MainMenu.xib; sourceTree = "<group>"; };
 		9A5951B91C1D0A22009C17AA /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Crashlytics.framework; path = Frameworks/Crashlytics.framework; sourceTree = "<group>"; };
 		9A5951BB1C1D0A8D009C17AA /* CommonStrings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CommonStrings.m; path = Clocker/Utilities/CommonStrings.m; sourceTree = "<group>"; };
@@ -320,9 +320,18 @@
 		9A9E87671C1FEDD300A7A2DF /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		9A9E87691C1FEDDB00A7A2DF /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		9A9E876B1C1FEDE700A7A2DF /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
+		9AA4AC861CEC0FA60054ACB7 /* FloatingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FloatingView.h; path = "Clocker/Onboarding/Onboarding Animated Views/FloatingView.h"; sourceTree = "<group>"; };
+		9AA4AC871CEC0FA60054ACB7 /* FloatingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FloatingView.m; path = "Clocker/Onboarding/Onboarding Animated Views/FloatingView.m"; sourceTree = "<group>"; };
+		9AA4AC881CEC0FA60054ACB7 /* CLShortcutAnimatedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLShortcutAnimatedView.h; path = "Clocker/Onboarding/Onboarding Animated Views/CLShortcutAnimatedView.h"; sourceTree = "<group>"; };
+		9AA4AC891CEC0FA60054ACB7 /* CLShortcutAnimatedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLShortcutAnimatedView.m; path = "Clocker/Onboarding/Onboarding Animated Views/CLShortcutAnimatedView.m"; sourceTree = "<group>"; };
+		9AA4AC8A1CEC0FA60054ACB7 /* CLFavouriteAnimatedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLFavouriteAnimatedView.h; path = "Clocker/Onboarding/Onboarding Animated Views/CLFavouriteAnimatedView.h"; sourceTree = "<group>"; };
+		9AA4AC8B1CEC0FA60054ACB7 /* CLFavouriteAnimatedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLFavouriteAnimatedView.m; path = "Clocker/Onboarding/Onboarding Animated Views/CLFavouriteAnimatedView.m"; sourceTree = "<group>"; };
+		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>"; };
@@ -334,12 +343,6 @@
 		9ACE03EE1CB0ADE00039FC01 /* Firebase.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Firebase.framework; path = Frameworks/Firebase.framework; sourceTree = "<group>"; };
 		9AD6DE551CE114DA007A8401 /* CLScaleUpButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLScaleUpButton.h; path = Clocker/CLScaleUpButton.h; sourceTree = "<group>"; };
 		9AD6DE561CE114DA007A8401 /* CLScaleUpButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLScaleUpButton.m; path = Clocker/CLScaleUpButton.m; sourceTree = "<group>"; };
-		9AD6DE631CE18EB4007A8401 /* CLArrowIndicators.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLArrowIndicators.h; path = Clocker/CLArrowIndicators.h; sourceTree = "<group>"; };
-		9AD6DE641CE18EB4007A8401 /* CLArrowIndicators.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLArrowIndicators.m; path = Clocker/CLArrowIndicators.m; sourceTree = "<group>"; };
-		9AE1FFDE1CE28CF500827C80 /* CLAnimatedImages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CLAnimatedImages.h; path = Clocker/CLAnimatedImages.h; sourceTree = "<group>"; };
-		9AE1FFDF1CE28CF500827C80 /* CLAnimatedImages.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CLAnimatedImages.m; path = Clocker/CLAnimatedImages.m; sourceTree = "<group>"; };
-		9AE1FFE01CE28CF500827C80 /* QCMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QCMethod.h; path = Clocker/QCMethod.h; sourceTree = "<group>"; };
-		9AE1FFE11CE28CF500827C80 /* QCMethod.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QCMethod.m; path = Clocker/QCMethod.m; sourceTree = "<group>"; };
 		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; };
@@ -394,8 +397,6 @@
 				9A10C68E1CDAC8B500D474F1 /* CLPanelTextField.m */,
 				9AD6DE551CE114DA007A8401 /* CLScaleUpButton.h */,
 				9AD6DE561CE114DA007A8401 /* CLScaleUpButton.m */,
-				9AD6DE631CE18EB4007A8401 /* CLArrowIndicators.h */,
-				9AD6DE641CE18EB4007A8401 /* CLArrowIndicators.m */,
 			);
 			name = Utilties;
 			sourceTree = "<group>";
@@ -583,6 +584,21 @@
 			name = "Date Tools";
 			sourceTree = "<group>";
 		};
+		9AA4AC851CEC0EE40054ACB7 /* Onboarding Animated Views */ = {
+			isa = PBXGroup;
+			children = (
+				9AA4AC901CEC112E0054ACB7 /* QCMethod.m */,
+				9AA4AC8F1CEC11270054ACB7 /* QCMethod.h */,
+				9AA4AC861CEC0FA60054ACB7 /* FloatingView.h */,
+				9AA4AC871CEC0FA60054ACB7 /* FloatingView.m */,
+				9AA4AC881CEC0FA60054ACB7 /* CLShortcutAnimatedView.h */,
+				9AA4AC891CEC0FA60054ACB7 /* CLShortcutAnimatedView.m */,
+				9AA4AC8A1CEC0FA60054ACB7 /* CLFavouriteAnimatedView.h */,
+				9AA4AC8B1CEC0FA60054ACB7 /* CLFavouriteAnimatedView.m */,
+			);
+			name = "Onboarding Animated Views";
+			sourceTree = "<group>";
+		};
 		9ABF586F1C29A7EB00BD0187 /* Model */ = {
 			isa = PBXGroup;
 			children = (
@@ -604,17 +620,14 @@
 		DD4F7BF913C30F9F00825C6E = {
 			isa = PBXGroup;
 			children = (
-				9AE1FFDE1CE28CF500827C80 /* CLAnimatedImages.h */,
-				9AE1FFDF1CE28CF500827C80 /* CLAnimatedImages.m */,
-				9AE1FFE01CE28CF500827C80 /* QCMethod.h */,
-				9AE1FFE11CE28CF500827C80 /* QCMethod.m */,
+				9AA4AC851CEC0EE40054ACB7 /* Onboarding Animated Views */,
+				9AB89E021CE97A4900EC8EB1 /* Media.xcassets */,
 				9A86E2B51CE04F1600547EE7 /* ShortcutRecorder.xcodeproj */,
 				9A5E6B9C1CAF7174006E7C5C /* Firebase */,
 				9A87DA4F1C358F8200A8CF3B /* Date Tools */,
 				9ABF586F1C29A7EB00BD0187 /* Model */,
 				9AF9A1681C250AA300EE7C2A /* Reachability */,
 				9A5B1A8D1BECDFB700A77C68 /* Clocker.entitlements */,
-				9A43792D1BEC256200F4E27F /* Media.xcassets */,
 				9A2000C61BFBCEF6002BFDE8 /* Utilties */,
 				9A8605E01BEC15F400A810A4 /* XIB */,
 				9A5951F01C1D3D35009C17AA /* Table Cell Views */,
@@ -838,9 +851,9 @@
 				9A13BAE01CA882FA007C6CBE /* InfoPlist.strings in Resources */,
 				9A13BACA1CA877A6007C6CBE /* CLPreferencesView.xib in Resources */,
 				9A20A07F1C4EAAEB00FB45AB /* CLIntroView.xib in Resources */,
+				9AB89E031CE97A4900EC8EB1 /* Media.xcassets in Resources */,
 				9A13BAD61CA87F08007C6CBE /* Panel.xib in Resources */,
 				9A5E6BAB1CAF8DFA006E7C5C /* iRate.bundle in Resources */,
-				9A43792E1BEC256200F4E27F /* Media.xcassets in Resources */,
 				9A13BAC61CA86A88007C6CBE /* CLAboutUsView.xib in Resources */,
 				9A13BACE1CA879E5007C6CBE /* CLAppearanceView.xib in Resources */,
 				9A13BADA1CA87F3F007C6CBE /* CLOneWindow.xib in Resources */,
@@ -882,25 +895,26 @@
 				9A87DAC81C358FA800A8CF3B /* DTTimePeriodChain.m in Sources */,
 				9A87DAC71C358FA800A8CF3B /* DTTimePeriod.m in Sources */,
 				9A3247321C25FD3A00CF6B6E /* CLCustomSliderCell.m in Sources */,
+				9AA4AC8C1CEC0FA60054ACB7 /* FloatingView.m in Sources */,
 				9A392EED1C1CE9950072C10A /* CLPreferencesViewController.m in Sources */,
 				9A5951BD1C1D0A8D009C17AA /* CommonStrings.m in Sources */,
 				9A5951FA1C1D5214009C17AA /* iVersion.m in Sources */,
 				9A87DAC61C358FA800A8CF3B /* DTError.m in Sources */,
 				9A20A0781C4EA53600FB45AB /* CLOnboardingWindowController.m in Sources */,
+				9AA4AC8D1CEC0FA60054ACB7 /* CLShortcutAnimatedView.m in Sources */,
 				9A87DACA1C358FA800A8CF3B /* DTTimePeriodGroup.m in Sources */,
+				9AA4AC8E1CEC0FA60054ACB7 /* CLFavouriteAnimatedView.m in Sources */,
 				9A25F7471C1A5E17007D369B /* iRate.m in Sources */,
 				9A8605C01BEC14F600A810A4 /* Panel.m in Sources */,
-				9AD6DE651CE18EB4007A8401 /* CLArrowIndicators.m in Sources */,
-				9AE1FFE21CE28CF500827C80 /* CLAnimatedImages.m in Sources */,
 				9A8605BA1BEC14DC00A810A4 /* StatusItemView.m in Sources */,
 				9A87DAC91C358FA800A8CF3B /* DTTimePeriodCollection.m in Sources */,
 				9A3247391C263F4F00CF6B6E /* CLAppearanceViewController.m in Sources */,
 				9A86E2B41CE0351C00547EE7 /* EDSunriseSet.m in Sources */,
 				9ABA2B031C671D49009DC0EF /* CLMainWindowController.m in Sources */,
 				9A9E63861C2C673E009A299B /* CLAppFeedbackWindowController.m in Sources */,
+				9AA4AC911CEC112E0054ACB7 /* QCMethod.m in Sources */,
 				9A8605BB1BEC14DC00A810A4 /* PanelController.m in Sources */,
 				9A8605B61BEC14BE00A810A4 /* MenubarController.m in Sources */,
-				9AE1FFE31CE28CF500827C80 /* QCMethod.m in Sources */,
 				9A42394F1CB0616400A8E51A /* CLFloatingWindowController.m in Sources */,
 				9A10C68F1CDAC8B500D474F1 /* CLPanelTextField.m in Sources */,
 				9A5951C01C1D0AA0009C17AA /* CLOneWindowController.m in Sources */,
diff --git a/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate b/Clocker.xcodeproj/project.xcworkspace/xcuserdata/abhishekbanthia.xcuserdatad/UserInterfaceState.xcuserstate
index 4366b0a..de2d882 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.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcschemes/Clocker.xcscheme b/Clocker.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcschemes/Clocker.xcscheme
index 37c7d46..db70ec3 100644
--- a/Clocker.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcschemes/Clocker.xcscheme
+++ b/Clocker.xcodeproj/xcuserdata/abhishekbanthia.xcuserdatad/xcschemes/Clocker.xcscheme
@@ -52,7 +52,7 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       showNonLocalizedStrings = "YES"
-      region = "DE">
+      region = "US">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
          <BuildableReference
diff --git a/Clocker/Appearance Tab/zh-Hans.lproj/CLAppearanceView.xib b/Clocker/Appearance Tab/zh-Hans.lproj/CLAppearanceView.xib
index 0a7f206..3a7121f 100644
--- a/Clocker/Appearance Tab/zh-Hans.lproj/CLAppearanceView.xib	
+++ b/Clocker/Appearance Tab/zh-Hans.lproj/CLAppearanceView.xib	
@@ -232,7 +232,7 @@
                         <binding destination="WGI-5h-l6M" name="selectedIndex" keyPath="values.showPlaceName" id="374-hG-giL"/>
                     </connections>
                 </segmentedControl>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="X5s-Mc-Yfo">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="X5s-Mc-Yfo">
                     <rect key="frame" x="130" y="549" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="175" id="YaE-Og-A4W"/>
diff --git a/Clocker/Appearance Tab/zh-Hant.lproj/CLAppearanceView.xib b/Clocker/Appearance Tab/zh-Hant.lproj/CLAppearanceView.xib
index 4710999..1a95c30 100644
--- a/Clocker/Appearance Tab/zh-Hant.lproj/CLAppearanceView.xib	
+++ b/Clocker/Appearance Tab/zh-Hant.lproj/CLAppearanceView.xib	
@@ -19,7 +19,7 @@
             <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="460" width="64" height="18"/>
+                    <rect key="frame" x="188" y="458" width="64" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="2DP-wK-Ga8"/>
                         <constraint firstAttribute="width" constant="60" id="KEa-ei-G2i"/>
@@ -31,9 +31,9 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="5TC-RQ-gzI">
-                    <rect key="frame" x="168" y="522" width="104" height="18"/>
+                    <rect key="frame" x="168" y="520" width="104" height="20"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="18" id="gWc-u4-D8E"/>
+                        <constraint firstAttribute="height" constant="20" 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="时间格式" id="Hza-PB-FEf">
@@ -43,7 +43,7 @@
                     </textFieldCell>
                 </textField>
                 <segmentedControl toolTip="Choose a theme for the main panel!" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5tI-fU-0lZ">
-                    <rect key="frame" x="146" y="429" width="147" height="24"/>
+                    <rect key="frame" x="146" y="427" width="147" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="143" id="dW5-vG-EwD"/>
                     </constraints>
@@ -60,7 +60,7 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="YQi-x8-6f8">
-                    <rect key="frame" x="143" y="398" width="154" height="18"/>
+                    <rect key="frame" x="143" y="396" width="154" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="eY8-bV-QLM"/>
                         <constraint firstAttribute="width" constant="150" id="n8S-fR-UtY"/>
@@ -72,7 +72,7 @@
                     </textFieldCell>
                 </textField>
                 <segmentedControl toolTip="Select a time-format!" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OrL-Ix-fmY">
-                    <rect key="frame" x="102" y="491" width="236" height="24"/>
+                    <rect key="frame" x="102" y="489" width="236" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="232" id="uOJ-Mi-Fin"/>
                     </constraints>
@@ -89,7 +89,7 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="3d9-qg-dNb">
-                    <rect key="frame" x="130" y="175" width="179" height="18"/>
+                    <rect key="frame" x="130" y="173" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="MdL-Dh-02n"/>
                         <constraint firstAttribute="width" constant="175" id="hHO-Wa-gmc"/>
@@ -101,7 +101,7 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="pqa-Qg-U8Y">
-                    <rect key="frame" x="130" y="147" width="179" height="19"/>
+                    <rect key="frame" x="130" y="145" width="179" height="19"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="175" id="B2I-0j-0W0"/>
                     </constraints>
@@ -115,7 +115,7 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="atA-2r-FXV">
-                    <rect key="frame" x="178" y="119" width="84" height="24"/>
+                    <rect key="frame" x="178" y="117" width="84" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="BqM-4F-6Ta"/>
                         <constraint firstAttribute="width" constant="80" id="ZeK-lO-tUa"/>
@@ -133,7 +133,7 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="kEn-QZ-niZ">
-                    <rect key="frame" x="130" y="98" width="179" height="18"/>
+                    <rect key="frame" x="130" y="96" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="2fd-f6-8cD"/>
                         <constraint firstAttribute="width" constant="175" id="D0w-xz-gkw"/>
@@ -148,7 +148,7 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="XwV-hy-YiP">
-                    <rect key="frame" x="178" y="70" width="84" height="24"/>
+                    <rect key="frame" x="178" y="68" width="84" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="80" id="dBz-ZQ-BF1"/>
                         <constraint firstAttribute="height" constant="21" id="y8c-hZ-MtI"/>
@@ -166,7 +166,7 @@
                     </connections>
                 </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="72r-oi-X0f">
-                    <rect key="frame" x="180" y="312" width="79" height="24"/>
+                    <rect key="frame" x="180" y="310" width="79" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="75" id="H8w-wg-vel"/>
                     </constraints>
@@ -183,7 +183,7 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="HTZ-1V-qZb">
-                    <rect key="frame" x="158" y="343" width="124" height="19"/>
+                    <rect key="frame" x="158" y="341" width="124" height="19"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="1Lv-wC-hEM"/>
                     </constraints>
@@ -194,7 +194,7 @@
                     </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="19"/>
+                    <rect key="frame" x="158" y="285" width="124" height="19"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="Odw-mb-nT5"/>
                     </constraints>
@@ -205,13 +205,13 @@
                     </textFieldCell>
                 </textField>
                 <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="MHe-dB-GZr">
-                    <rect key="frame" x="0.0" y="195" width="439" height="5"/>
+                    <rect key="frame" x="0.0" y="193" 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" preferredMaxLayoutWidth="175" translatesAutoresizingMaskIntoConstraints="NO" id="LC1-Sx-uav">
-                    <rect key="frame" x="130" y="46" width="179" height="18"/>
+                    <rect key="frame" x="130" y="44" width="179" height="18"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="175" id="Pdc-78-vzv"/>
                         <constraint firstAttribute="height" constant="18" id="hsh-i8-ULY"/>
@@ -226,7 +226,7 @@
                     </connections>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JR8-v7-K0w">
-                    <rect key="frame" x="178" y="18" width="84" height="24"/>
+                    <rect key="frame" x="178" y="16" width="84" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="Xof-eY-ZUl"/>
                         <constraint firstAttribute="width" constant="80" id="msH-Xd-mrp"/>
@@ -256,7 +256,7 @@
                     </textFieldCell>
                 </textField>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1eh-BT-2fK">
-                    <rect key="frame" x="155" y="367" width="129" height="24"/>
+                    <rect key="frame" x="155" y="365" width="129" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="125" id="u9T-ks-rqA"/>
                     </constraints>
@@ -273,10 +273,10 @@
                     </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="197"/>
+                    <rect key="frame" x="0.0" y="0.0" width="439" height="195"/>
                     <subviews>
                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WDP-d4-eNj">
-                            <rect key="frame" x="57" y="79" width="324" height="39"/>
+                            <rect key="frame" x="57" y="78" width="324" height="39"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="320" id="3wp-Z6-TrB"/>
                                 <constraint firstAttribute="height" constant="39" id="IyN-y5-6JP"/>
@@ -303,7 +303,7 @@
                     </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="53" y="254" width="334" height="24"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="330" id="T2D-fB-93g"/>
                     </constraints>
@@ -320,7 +320,7 @@
                     </connections>
                 </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y2b-z8-bYw">
-                    <rect key="frame" x="180" y="204" width="79" height="24"/>
+                    <rect key="frame" x="180" y="202" width="79" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="21" id="HEQ-jX-Sul"/>
                         <constraint firstAttribute="width" constant="75" id="ceX-9z-Lmv"/>
@@ -337,7 +337,7 @@
                     </connections>
                 </segmentedControl>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="Huo-FT-51u">
-                    <rect key="frame" x="138" y="231" width="164" height="19"/>
+                    <rect key="frame" x="138" y="229" width="164" height="19"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="19" id="Aw5-iZ-nfi"/>
                         <constraint firstAttribute="width" constant="160" id="l2J-qp-re8"/>
diff --git a/Clocker/CLScaleUpButton.h b/Clocker/CLScaleUpButton.h
index 6423b28..5ab2553 100644
--- a/Clocker/CLScaleUpButton.h
+++ b/Clocker/CLScaleUpButton.h
@@ -11,5 +11,6 @@
 @interface CLScaleUpButton : NSButton
 
 @property (strong, nonatomic) NSTrackingArea *trackingArea;
+@property (nonatomic, strong) IBInspectable NSColor *textColor;
 
 @end
diff --git a/Clocker/CLScaleUpButton.m b/Clocker/CLScaleUpButton.m
index ae70294..e3e7797 100644
--- a/Clocker/CLScaleUpButton.m
+++ b/Clocker/CLScaleUpButton.m
@@ -11,16 +11,45 @@
 
 @implementation CLScaleUpButton
 
-- (void)drawRect:(NSRect)dirtyRect {
+- (void)drawRect:(NSRect)dirtyRect
+{
     [super drawRect:dirtyRect];
     
+    NSButtonCell *cell = [self cell];
+    
+    cell.backgroundColor = [NSColor clearColor];
+    
+
     // Drawing code here.
 }
 
+- (void)awakeFromNib
+{
+    if (self.textColor)
+    {
+        NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
+        [style setAlignment:NSCenterTextAlignment];
+        NSDictionary *attrsDictionary  = [NSDictionary dictionaryWithObjectsAndKeys:
+                                          self.textColor, NSForegroundColorAttributeName,
+                                          self.font, NSFontAttributeName,
+                                          style, NSParagraphStyleAttributeName, nil];
+        NSAttributedString *attrString = [[NSAttributedString alloc]initWithString:self.title attributes:attrsDictionary];
+        [self setAttributedTitle:attrString];
+    }
+    
+    [self addScaleAnimation];
+}
+
 -(void)mouseEntered:(NSEvent *)theEvent
 {
     [super mouseEntered:theEvent];
     
+    [self addScaleAnimation];
+
+}
+
+- (void) addScaleAnimation
+{
     POPSpringAnimation *scale = [POPSpringAnimation animationWithPropertyNamed:kPOPLayerScaleXY];
     scale.velocity = [NSValue valueWithCGPoint:CGPointMake(1, 1)];
     scale.springBounciness = 20.f;
diff --git a/Clocker/Onboarding/CLIntroView.xib b/Clocker/Onboarding/CLIntroView.xib
index 4b639c3..364ae60 100644
--- a/Clocker/Onboarding/CLIntroView.xib
+++ b/Clocker/Onboarding/CLIntroView.xib
@@ -6,53 +6,27 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="CLIntroViewController">
             <connections>
-                <outlet property="customView" destination="rjF-xt-RiU" id="U5q-Ud-5JD"/>
+                <outlet property="customView" destination="hoF-rL-74s" id="yfX-cx-X3Z"/>
+                <outlet property="headerView" destination="ogM-f9-DNE" id="vsS-T3-nOt"/>
+                <outlet property="nextActionButton" destination="YoY-cR-Bib" id="c2K-85-fX6"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
             </connections>
         </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="485" height="420"/>
+            <rect key="frame" x="0.0" y="0.0" width="440" height="487"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1DU-NA-5N0">
-                    <rect key="frame" x="14" y="193" width="81" height="32"/>
+                <button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YoY-cR-Bib">
+                    <rect key="frame" x="163" y="13" width="114" height="32"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="69" id="EqC-1t-ZIv"/>
-                        <constraint firstAttribute="height" constant="21" id="pwL-hr-muf"/>
+                        <constraint firstAttribute="height" constant="21" id="THK-gB-4tM"/>
+                        <constraint firstAttribute="width" constant="102" id="nJi-I7-YYw"/>
                     </constraints>
-                    <buttonCell key="cell" type="push" title="Left" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="lf3-xl-YrG">
+                    <buttonCell key="cell" type="push" title="Continue" bezelStyle="rounded" alignment="center" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="FBn-qW-PPa">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="leftAction:" target="-2" id="wRC-2w-a5l"/>
-                    </connections>
-                </button>
-                <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dJl-QF-kJE">
-                    <rect key="frame" x="390" y="193" width="81" height="32"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="21" id="NOu-jQ-oVL"/>
-                        <constraint firstAttribute="width" constant="69" id="xF1-9q-RgM"/>
-                    </constraints>
-                    <buttonCell key="cell" type="push" title="Right" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="S2e-yL-pup">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="rightAction:" target="-2" id="n1w-Lo-4cT"/>
-                    </connections>
-                </button>
-                <button focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sgW-1g-MOH" customClass="CLScaleUpButton">
-                    <rect key="frame" x="186" y="13" width="114" height="32"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="21" id="d55-vu-duj"/>
-                        <constraint firstAttribute="width" constant="102" id="v47-Kn-aPA"/>
-                    </constraints>
-                    <buttonCell key="cell" type="push" title="Continue" bezelStyle="rounded" alignment="center" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="VSI-LD-Fkc">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="system"/>
+                        <font key="font" size="13" name="SFUIDisplay-Light"/>
                         <string key="keyEquivalent" base64-UTF8="YES">
 DQ
 </string>
@@ -63,28 +37,54 @@ DQ
                         </userDefinedRuntimeAttributes>
                     </buttonCell>
                     <connections>
-                        <action selector="continueOnboarding:" target="-2" id="VxO-5e-FH6"/>
+                        <action selector="continueOnboarding:" target="-2" id="fnB-fh-YeI"/>
                     </connections>
                 </button>
-                <customView translatesAutoresizingMaskIntoConstraints="NO" id="rjF-xt-RiU" customClass="CLAnimatedImages">
-                    <rect key="frame" x="102" y="160" width="280" height="240"/>
+                <customView translatesAutoresizingMaskIntoConstraints="NO" id="hoF-rL-74s">
+                    <rect key="frame" x="20" y="135" width="400" height="300"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="280" id="Vyp-yW-I0s"/>
-                        <constraint firstAttribute="height" constant="240" id="YxH-Fh-3L2"/>
+                        <constraint firstAttribute="height" constant="300" id="Acb-Bl-8V3"/>
+                        <constraint firstAttribute="width" constant="400" id="YLm-9Z-74r"/>
                     </constraints>
                 </customView>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ogM-f9-DNE">
+                    <rect key="frame" x="18" y="443" width="404" height="24"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="400" id="IzC-cP-zrv"/>
+                    </constraints>
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Clocker now stays on top of all windows! 😀" placeholderString="" id="Bkk-eF-Cty">
+                        <font key="font" size="20" name="HelveticaNeue-Light"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                    </textFieldCell>
+                </textField>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="404" translatesAutoresizingMaskIntoConstraints="NO" id="P7g-c3-qDm">
+                    <rect key="frame" x="41" y="53" width="359" height="60"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="60" id="QP6-85-J64"/>
+                    </constraints>
+                    <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" placeholderString="Some random placeholder" id="PbK-v6-7An">
+                        <font key="font" size="13" name="HelveticaNeue-Light"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                    <connections>
+                        <binding destination="-2" name="value" keyPath="self.informativeText" id="uQr-bL-UC0"/>
+                    </connections>
+                </textField>
             </subviews>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="dJl-QF-kJE" secondAttribute="trailing" constant="20" id="2mU-bT-BSB"/>
-                <constraint firstItem="1DU-NA-5N0" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="Bnu-eZ-Oo7"/>
-                <constraint firstItem="rjF-xt-RiU" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" id="Mqz-PA-JYI"/>
-                <constraint firstItem="sgW-1g-MOH" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="OlA-UF-19Y"/>
-                <constraint firstItem="dJl-QF-kJE" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="Tua-SU-scv"/>
-                <constraint firstAttribute="bottom" secondItem="sgW-1g-MOH" secondAttribute="bottom" constant="20" id="Zuy-ve-Ywq"/>
-                <constraint firstItem="1DU-NA-5N0" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="aOO-sG-v9l"/>
-                <constraint firstItem="rjF-xt-RiU" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="dYe-2i-tiR"/>
+                <constraint firstItem="YoY-cR-Bib" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="ArK-1n-3M0"/>
+                <constraint firstItem="ogM-f9-DNE" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="Ta7-Ef-00H"/>
+                <constraint firstItem="hoF-rL-74s" firstAttribute="top" secondItem="ogM-f9-DNE" secondAttribute="bottom" constant="8" id="YKj-vX-Wdz"/>
+                <constraint firstAttribute="bottom" secondItem="YoY-cR-Bib" secondAttribute="bottom" constant="20" id="btU-eY-B9a"/>
+                <constraint firstAttribute="trailing" secondItem="P7g-c3-qDm" secondAttribute="trailing" constant="42" id="leT-6w-0zZ"/>
+                <constraint firstItem="hoF-rL-74s" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="ljb-uZ-Pef"/>
+                <constraint firstItem="YoY-cR-Bib" firstAttribute="top" secondItem="P7g-c3-qDm" secondAttribute="bottom" constant="12" id="m7P-83-wNr"/>
+                <constraint firstItem="P7g-c3-qDm" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="43" id="n3x-gk-PVV"/>
+                <constraint firstItem="ogM-f9-DNE" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" id="pac-RZ-Mwq"/>
             </constraints>
-            <point key="canvasLocation" x="172.5" y="347"/>
+            <point key="canvasLocation" x="173" y="239.5"/>
         </customView>
     </objects>
 </document>
diff --git a/Clocker/en.lproj/Panel.xib b/Clocker/en.lproj/Panel.xib
index 767dd28..d1b8379 100755
--- a/Clocker/en.lproj/Panel.xib
+++ b/Clocker/en.lproj/Panel.xib
@@ -97,7 +97,7 @@
                                                             </textFieldCell>
                                                         </textField>
                                                         <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7OQ-cr-VJS">
-                                                            <rect key="frame" x="199" y="6" width="20" height="20"/>
+                                                            <rect key="frame" x="194" y="6" width="20" height="20"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="20" id="Vmz-Ji-Y0Q"/>
                                                                 <constraint firstAttribute="height" constant="20" id="qNj-EP-era"/>
@@ -105,10 +105,10 @@
                                                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="U2f-NK-Gua"/>
                                                         </imageView>
                                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uOg-ij-alO">
-                                                            <rect key="frame" x="220" y="8" width="49" height="17"/>
+                                                            <rect key="frame" x="215" y="9" width="54" height="17"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="17" id="89H-r0-Dnh"/>
-                                                                <constraint firstAttribute="width" constant="45" id="8KH-Ks-d4T"/>
+                                                                <constraint firstAttribute="width" constant="50" id="8KH-Ks-d4T"/>
                                                             </constraints>
                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" alignment="center" placeholderString="" id="qpH-kn-cMT">
                                                                 <font key="font" size="11" name="SFUIDisplay-Light"/>
@@ -123,7 +123,7 @@
                                                         <constraint firstItem="etF-33-bCB" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="5" id="Lct-kG-usb"/>
                                                         <constraint firstAttribute="trailing" secondItem="uOg-ij-alO" secondAttribute="trailing" constant="12" id="Siz-97-mYl"/>
                                                         <constraint firstItem="QUd-7D-q14" firstAttribute="top" secondItem="etF-33-bCB" secondAttribute="bottom" constant="2" id="VO6-Zn-eA3"/>
-                                                        <constraint firstItem="uOg-ij-alO" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" constant="-4" id="j2E-3l-6B2"/>
+                                                        <constraint firstItem="uOg-ij-alO" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" constant="-5" id="j2E-3l-6B2"/>
                                                         <constraint firstItem="7OQ-cr-VJS" firstAttribute="top" secondItem="vnv-J2-7r1" secondAttribute="bottom" constant="-5" id="uZd-y0-d6A"/>
                                                         <constraint firstItem="etF-33-bCB" firstAttribute="leading" secondItem="qbN-ba-fho" secondAttribute="leading" constant="9" id="ueW-ow-ZRq"/>
                                                         <constraint firstItem="vnv-J2-7r1" firstAttribute="top" secondItem="qbN-ba-fho" secondAttribute="top" constant="5" id="vGp-XY-wiJ"/>