diff --git a/ConnectStats.xcodeproj/project.pbxproj b/ConnectStats.xcodeproj/project.pbxproj
index 5154cab4..45d85abe 100644
--- a/ConnectStats.xcodeproj/project.pbxproj
+++ b/ConnectStats.xcodeproj/project.pbxproj
@@ -4571,7 +4571,7 @@
 			attributes = {
 				CLASSPREFIX = GC;
 				LastSwiftUpdateCheck = 0810;
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1400;
 				ORGANIZATIONNAME = "Brice Rosenzweig";
 				TargetAttributes = {
 					422FAEA319A1DD6000D09773 = {
@@ -6392,6 +6392,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				CURRENT_PROJECT_VERSION = 3.4.0;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = M7QSSF3624;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -6435,6 +6436,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 3.4.0;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = M7QSSF3624;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -6475,6 +6477,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = "";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -6514,6 +6517,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
+				DEAD_CODE_STRIPPING = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -6655,7 +6659,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = M7QSSF3624;
-				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)",
@@ -6675,7 +6678,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 7.2;
+				MARKETING_VERSION = 7.3;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -6711,7 +6714,6 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = M7QSSF3624;
-				ENABLE_BITCODE = YES;
 				ENABLE_TESTABILITY = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6731,7 +6733,7 @@
 					"@executable_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MARKETING_VERSION = 7.2;
+				MARKETING_VERSION = 7.3;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -7148,7 +7150,7 @@
 			repositoryURL = "https://github.com/roznet/rzexternal";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.3;
+				minimumVersion = 1.0.4;
 			};
 		};
 		4221EDE626F091D3006049DE /* XCRemoteSwiftPackageReference "generic-json-swift" */ = {
@@ -7164,7 +7166,7 @@
 			repositoryURL = "https://github.com/roznet/rzutils.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.18;
+				minimumVersion = 1.0.23;
 			};
 		};
 		422DCB84258A27EF000DEE4B /* XCRemoteSwiftPackageReference "fmdb" */ = {
@@ -7188,7 +7190,7 @@
 			repositoryURL = "https://github.com/roznet/FitFileParser.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.4.5;
+				minimumVersion = 1.4.8;
 			};
 		};
 		422DCD72258A74DF000DEE4B /* XCRemoteSwiftPackageReference "rzutils-macos" */ = {
diff --git a/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStats.xcscheme b/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStats.xcscheme
index 6e12289c..c515c4e5 100644
--- a/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStats.xcscheme
+++ b/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStats.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStatsTestApp.xcscheme b/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStatsTestApp.xcscheme
index 85305f28..61fd03e1 100644
--- a/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStatsTestApp.xcscheme
+++ b/ConnectStats.xcodeproj/xcshareddata/xcschemes/ConnectStatsTestApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ConnectStats.xcodeproj/xcshareddata/xcschemes/FitFileExplorer.xcscheme b/ConnectStats.xcodeproj/xcshareddata/xcschemes/FitFileExplorer.xcscheme
index 704ef9ed..875ecc83 100644
--- a/ConnectStats.xcodeproj/xcshareddata/xcschemes/FitFileExplorer.xcscheme
+++ b/ConnectStats.xcodeproj/xcshareddata/xcschemes/FitFileExplorer.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ConnectStats.xcodeproj/xcshareddata/xcschemes/HealthStats.xcscheme b/ConnectStats.xcodeproj/xcshareddata/xcschemes/HealthStats.xcscheme
index 6c0080b7..e715d22a 100644
--- a/ConnectStats.xcodeproj/xcshareddata/xcschemes/HealthStats.xcscheme
+++ b/ConnectStats.xcodeproj/xcshareddata/xcschemes/HealthStats.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1310"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ConnectStats.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ConnectStats.xcworkspace/xcshareddata/swiftpm/Package.resolved
index c48ea4d4..05dc2393 100644
--- a/ConnectStats.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ConnectStats.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,169 +1,167 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "BrightFutures",
-        "repositoryURL": "https://github.com/Thomvis/BrightFutures.git",
-        "state": {
-          "branch": null,
-          "revision": "939858b811026f85e87847a808f0bea2f187e5c4",
-          "version": "8.1.0"
-        }
-      },
-      {
-        "package": "DeviceGuru",
-        "repositoryURL": "https://github.com/InderKumarRathore/DeviceGuru",
-        "state": {
-          "branch": "master",
-          "revision": "e78159d98ae2f933b800a4a7b2ac31c2b79ed41e",
-          "version": null
-        }
-      },
-      {
-        "package": "Erik",
-        "repositoryURL": "https://github.com/phimage/Erik.git",
-        "state": {
-          "branch": null,
-          "revision": "109a130e9cdb00789a43a7a625293eeb12d22989",
-          "version": "5.1.0"
-        }
-      },
-      {
-        "package": "FileKit",
-        "repositoryURL": "https://github.com/nvzqz/FileKit.git",
-        "state": {
-          "branch": null,
-          "revision": "826d9161b184509f80d85c28cd612d630646de98",
-          "version": "6.0.0"
-        }
-      },
-      {
-        "package": "FitFileParser",
-        "repositoryURL": "https://github.com/roznet/FitFileParser.git",
-        "state": {
-          "branch": null,
-          "revision": "f142941777e5bf1dcb2af0762b7987146df819c8",
-          "version": "1.4.5"
-        }
-      },
-      {
-        "package": "FMDB",
-        "repositoryURL": "https://github.com/ccgus/fmdb",
-        "state": {
-          "branch": null,
-          "revision": "61e51fde7f7aab6554f30ab061cc588b28a97d04",
-          "version": "2.7.7"
-        }
-      },
-      {
-        "package": "GenericJSON",
-        "repositoryURL": "https://github.com/zoul/generic-json-swift.git",
-        "state": {
-          "branch": null,
-          "revision": "a137894b2a217abe489cdf1ea287e6f7819b1051",
-          "version": "2.0.1"
-        }
-      },
-      {
-        "package": "Kanna",
-        "repositoryURL": "https://github.com/tid-kijyun/Kanna.git",
-        "state": {
-          "branch": null,
-          "revision": "f9e4922223dd0d3dfbf02ca70812cf5531fc0593",
-          "version": "5.2.7"
-        }
-      },
-      {
-        "package": "KeychainSwift",
-        "repositoryURL": "https://github.com/evgenyneu/keychain-swift",
-        "state": {
-          "branch": null,
-          "revision": "96fb84f45a96630e7583903bd7e08cf095c7a7ef",
-          "version": "19.0.0"
-        }
-      },
-      {
-        "package": "MBProgressHUD",
-        "repositoryURL": "https://github.com/jdg/MBProgressHUD",
-        "state": {
-          "branch": null,
-          "revision": "bca42b801100b2b3a4eda0ba8dd33d858c780b0d",
-          "version": "1.2.0"
-        }
-      },
-      {
-        "package": "OAuthSwift",
-        "repositoryURL": "https://github.com/OAuthSwift/OAuthSwift.git",
-        "state": {
-          "branch": null,
-          "revision": "d85964b96dbce94df961f28b996187c835089903",
-          "version": "2.2.0"
-        }
-      },
-      {
-        "package": "RZExternal",
-        "repositoryURL": "https://github.com/roznet/rzexternal",
-        "state": {
-          "branch": null,
-          "revision": "8196de67f9481c7f2a1ba2d5bf7886fe89f63ce4",
-          "version": "1.0.3"
-        }
-      },
-      {
-        "package": "RZUtils",
-        "repositoryURL": "https://github.com/roznet/rzutils.git",
-        "state": {
-          "branch": null,
-          "revision": "7e4aa6ddecad865a117a7d6eb41f510d9de57dbf",
-          "version": "1.0.18"
-        }
-      },
-      {
-        "package": "RZUtilsMacOS",
-        "repositoryURL": "https://github.com/roznet/rzutils-macos",
-        "state": {
-          "branch": null,
-          "revision": "9b567821a8113338f75c9fb83da469d07eb5e233",
-          "version": "1.0.0"
-        }
-      },
-      {
-        "package": "RZUtilsTouch",
-        "repositoryURL": "https://github.com/roznet/rzutils-touch.git",
-        "state": {
-          "branch": null,
-          "revision": "5a396243777c14257c4e0b23c9f2229fd25252ae",
-          "version": "1.0.2"
-        }
-      },
-      {
-        "package": "Swifter",
-        "repositoryURL": "https://github.com/httpswift/swifter.git",
-        "state": {
-          "branch": null,
-          "revision": "9483a5d459b45c3ffd059f7b55f9638e268632fd",
-          "version": "1.5.0"
-        }
-      },
-      {
-        "package": "SwiftKeychainWrapper",
-        "repositoryURL": "https://github.com/jrendel/SwiftKeychainWrapper",
-        "state": {
-          "branch": null,
-          "revision": "185a3165346a03767101c4f62e9a545a0fe0530f",
-          "version": "4.0.1"
-        }
-      },
-      {
-        "package": "ZIPFoundation",
-        "repositoryURL": "https://github.com/weichsel/ZIPFoundation.git",
-        "state": {
-          "branch": null,
-          "revision": "7254c74b49cec2cb81520523ba993c671f71b066",
-          "version": "0.9.14"
-        }
-      }
-    ]
-  },
-  "version": 1
+  "pins" : [
+    {
+      "identity" : "brightfutures",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/Thomvis/BrightFutures.git",
+      "state" : {
+        "revision" : "fa66fa183dce7196d431244d0215748cd14c5758",
+        "version" : "8.2.0"
+      }
+    },
+    {
+      "identity" : "deviceguru",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/InderKumarRathore/DeviceGuru",
+      "state" : {
+        "branch" : "master",
+        "revision" : "6ae76835652d68b09e3ac3ae2721961fc004f1e3"
+      }
+    },
+    {
+      "identity" : "erik",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/phimage/Erik.git",
+      "state" : {
+        "revision" : "109a130e9cdb00789a43a7a625293eeb12d22989",
+        "version" : "5.1.0"
+      }
+    },
+    {
+      "identity" : "filekit",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/nvzqz/FileKit.git",
+      "state" : {
+        "revision" : "826d9161b184509f80d85c28cd612d630646de98",
+        "version" : "6.0.0"
+      }
+    },
+    {
+      "identity" : "fitfileparser",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/roznet/FitFileParser.git",
+      "state" : {
+        "revision" : "38a855a37e07e4a07ef1867907a98a322efec63f",
+        "version" : "1.4.8"
+      }
+    },
+    {
+      "identity" : "fmdb",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/ccgus/fmdb",
+      "state" : {
+        "revision" : "61e51fde7f7aab6554f30ab061cc588b28a97d04",
+        "version" : "2.7.7"
+      }
+    },
+    {
+      "identity" : "generic-json-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/zoul/generic-json-swift.git",
+      "state" : {
+        "revision" : "a137894b2a217abe489cdf1ea287e6f7819b1051",
+        "version" : "2.0.1"
+      }
+    },
+    {
+      "identity" : "kanna",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tid-kijyun/Kanna.git",
+      "state" : {
+        "revision" : "f9e4922223dd0d3dfbf02ca70812cf5531fc0593",
+        "version" : "5.2.7"
+      }
+    },
+    {
+      "identity" : "keychain-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/evgenyneu/keychain-swift",
+      "state" : {
+        "revision" : "96fb84f45a96630e7583903bd7e08cf095c7a7ef",
+        "version" : "19.0.0"
+      }
+    },
+    {
+      "identity" : "mbprogresshud",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/jdg/MBProgressHUD",
+      "state" : {
+        "revision" : "bca42b801100b2b3a4eda0ba8dd33d858c780b0d",
+        "version" : "1.2.0"
+      }
+    },
+    {
+      "identity" : "oauthswift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/OAuthSwift/OAuthSwift.git",
+      "state" : {
+        "revision" : "d85964b96dbce94df961f28b996187c835089903",
+        "version" : "2.2.0"
+      }
+    },
+    {
+      "identity" : "rzexternal",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/roznet/rzexternal",
+      "state" : {
+        "revision" : "369f04960e18085d549400c1f7a571af8d8f3935",
+        "version" : "1.0.4"
+      }
+    },
+    {
+      "identity" : "rzutils",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/roznet/rzutils.git",
+      "state" : {
+        "revision" : "8e389bc2fd0d8e52ce7e6d7e888e8aa980a441cb",
+        "version" : "1.0.23"
+      }
+    },
+    {
+      "identity" : "rzutils-macos",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/roznet/rzutils-macos",
+      "state" : {
+        "revision" : "9b567821a8113338f75c9fb83da469d07eb5e233",
+        "version" : "1.0.0"
+      }
+    },
+    {
+      "identity" : "rzutils-touch",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/roznet/rzutils-touch.git",
+      "state" : {
+        "revision" : "5a396243777c14257c4e0b23c9f2229fd25252ae",
+        "version" : "1.0.2"
+      }
+    },
+    {
+      "identity" : "swifter",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/httpswift/swifter.git",
+      "state" : {
+        "revision" : "9483a5d459b45c3ffd059f7b55f9638e268632fd",
+        "version" : "1.5.0"
+      }
+    },
+    {
+      "identity" : "swiftkeychainwrapper",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/jrendel/SwiftKeychainWrapper",
+      "state" : {
+        "revision" : "185a3165346a03767101c4f62e9a545a0fe0530f",
+        "version" : "4.0.1"
+      }
+    },
+    {
+      "identity" : "zipfoundation",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/weichsel/ZIPFoundation.git",
+      "state" : {
+        "revision" : "f6a22e7da26314b38bf9befce34ae8e4b2543090",
+        "version" : "0.9.15"
+      }
+    }
+  ],
+  "version" : 2
 }
diff --git a/ConnectStats/ConnectStats-Info.plist b/ConnectStats/ConnectStats-Info.plist
index 076e1682..d478cd4d 100644
--- a/ConnectStats/ConnectStats-Info.plist
+++ b/ConnectStats/ConnectStats-Info.plist
@@ -149,5 +149,28 @@
 			</dict>
 		</dict>
 	</array>
+	<key>UTImportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>public.data</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>FIT File</string>
+			<key>UTTypeIconFiles</key>
+			<array/>
+			<key>UTTypeIdentifier</key>
+			<string>net.ro-z.connectstats.fit</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>fit</string>
+					<string>FIT</string>
+				</array>
+			</dict>
+		</dict>
+	</array>
 </dict>
 </plist>
diff --git a/ConnectStats/Media.xcassets/HealthStatsAppIcon.appiconset/Contents.json b/ConnectStats/Media.xcassets/HealthStatsAppIcon.appiconset/Contents.json
index 23de458b..ce06f9af 100644
--- a/ConnectStats/Media.xcassets/HealthStatsAppIcon.appiconset/Contents.json
+++ b/ConnectStats/Media.xcassets/HealthStatsAppIcon.appiconset/Contents.json
@@ -167,6 +167,13 @@
       "size" : "51x51",
       "subtype" : "45mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "54x54",
+      "subtype" : "49mm"
+    },
     {
       "idiom" : "watch",
       "role" : "quickLook",
@@ -195,6 +202,13 @@
       "size" : "117x117",
       "subtype" : "45mm"
     },
+    {
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "129x129",
+      "subtype" : "49mm"
+    },
     {
       "idiom" : "watch-marketing",
       "scale" : "1x",
diff --git a/ConnectStats/src/GCActivitiesOrganizer.m b/ConnectStats/src/GCActivitiesOrganizer.m
index aed5e336..99bcbfa6 100644
--- a/ConnectStats/src/GCActivitiesOrganizer.m
+++ b/ConnectStats/src/GCActivitiesOrganizer.m
@@ -27,7 +27,6 @@
 #import "GCAppGlobal.h"
 #import "GCActivity.h"
 #import "GCFields.h"
-#import "Flurry.h"
 #import "GCActivitySearch.h"
 #import "GCHealthOrganizer.h"
 #import "GCWeather.h"
@@ -36,6 +35,7 @@
 #import "GCService.h"
 #import "GCActivity+Database.h"
 
+@import Flurry_iOS_SDK;
 
 #define GC_SYNC_KEY(act,service) [[act activityId] stringByAppendingString:service]
 
@@ -1589,6 +1589,11 @@ -(GCStatsDataSerieFilter*)standardFilterForField:(GCField*)field{
             filter.minValue = [GCAppGlobal configGetDouble:CONFIG_FILTER_SPEED_BELOW defaultValue:1.0];
             filter.filterMinValue = true;
             filter.unit = [GCUnit unitForKey:STOREUNIT_SPEED];
+        }else if (aField == gcFieldFlagWeightedMeanSpeed && [type isEqualToString:GC_TYPE_SWIMMING]){
+            filter = RZReturnAutorelease([[GCStatsDataSerieFilter alloc] init]);
+            filter.minValue = [GCAppGlobal configGetDouble:CONFIG_FILTER_SPEED_BELOW_SWIM defaultValue:0.2];
+            filter.filterMinValue = true;
+            filter.unit = [GCUnit unitForKey:STOREUNIT_SPEED];
         }else if ([field.key isEqualToString:@"DirectVO2Max"]){
             filter = RZReturnAutorelease([[GCStatsDataSerieFilter alloc] init]);
             filter.minValue = 1.;
diff --git a/ConnectStats/src/GCActivityDetailViewController.m b/ConnectStats/src/GCActivityDetailViewController.m
index 17eee802..a62c754b 100644
--- a/ConnectStats/src/GCActivityDetailViewController.m
+++ b/ConnectStats/src/GCActivityDetailViewController.m
@@ -33,7 +33,7 @@
 #import "GCActivityLapViewController.h"
 #import "GCActivityTrackGraphViewController.h"
 #import "GCSimpleGraphCachedDataSource+Templates.h"
-#import "Flurry.h"
+@import Flurry_iOS_SDK;
 #import "GCActivitySwimLapViewController.h"
 @import RZExternal;
 #import "GCActivityTrackGraphOptionsViewController.h"
diff --git a/ConnectStats/src/GCActivityListViewController.m b/ConnectStats/src/GCActivityListViewController.m
index bdfb9628..011e78ee 100644
--- a/ConnectStats/src/GCActivityListViewController.m
+++ b/ConnectStats/src/GCActivityListViewController.m
@@ -22,7 +22,7 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 //  
-
+@import Flurry_iOS_SDK;
 #import "GCActivityListViewController.h"
 #import "GCActivitiesOrganizer.h"
 #import "GCAppGlobal.h"
@@ -32,7 +32,6 @@
 #import "GCSplitViewController.h"
 #import "GCViewIcons.h"
 #import "GCActivityTypeListViewController.h"
-#import "Flurry.h"
 #import "GCWebConnect+Requests.h"
 #import "GCCellHealthDayActivity.h"
 #import "GCActivityPreviewingViewController.h"
diff --git a/ConnectStats/src/GCActivitySettings.m b/ConnectStats/src/GCActivitySettings.m
index 34d20e29..ad4f65f3 100644
--- a/ConnectStats/src/GCActivitySettings.m
+++ b/ConnectStats/src/GCActivitySettings.m
@@ -104,7 +104,12 @@ -(void)setupWithGlobalConfig:(GCActivity*)act{
             field = [GCField fieldForFlag:gcFieldFlagWeightedMeanSpeed andActivityType:act.activityType];
             filter = [[[GCStatsDataSerieFilter alloc] init] autorelease];
             filter.minValue = [GCAppGlobal configGetDouble:CONFIG_FILTER_SPEED_BELOW defaultValue:1.0];
-            filter.filterMinValue = [act.activityType isEqualToString:GC_TYPE_RUNNING] ||[act.activityType isEqualToString:GC_TYPE_CYCLING];
+            filter.filterMinValue = [act.activityType isEqualToString:GC_TYPE_RUNNING] || [act.activityType isEqualToString:GC_TYPE_CYCLING];
+            if ([act.activityType isEqualToString:GC_TYPE_SWIMMING]) {
+                filter.filterMinValue = true;
+                filter.minValue = [GCAppGlobal configGetDouble:CONFIG_FILTER_SPEED_BELOW_SWIM defaultValue:0.2];
+            }
+            
             if ([GCAppGlobal configGetBool:CONFIG_FILTER_BAD_ACCEL defaultValue:YES]) {
                 filter.filterHighAcceleration = true;
                 filter.maxAccelerationSpeedThreshold = 5.55; // about 20kph in mps
diff --git a/ConnectStats/src/GCActivityTrackGraphViewController.m b/ConnectStats/src/GCActivityTrackGraphViewController.m
index 771ac976..5d617b70 100644
--- a/ConnectStats/src/GCActivityTrackGraphViewController.m
+++ b/ConnectStats/src/GCActivityTrackGraphViewController.m
@@ -25,7 +25,7 @@
 
 #import "GCActivityTrackGraphViewController.h"
 #import "GCViewConfig.h"
-#import "Flurry.h"
+@import Flurry_iOS_SDK;
 #import "GCAppGlobal.h"
 #import "GCViewIcons.h"
 #import "GCTrackFieldChoices.h"
diff --git a/ConnectStats/src/GCActivityTypeListViewController.m b/ConnectStats/src/GCActivityTypeListViewController.m
index b43eda58..123a799a 100644
--- a/ConnectStats/src/GCActivityTypeListViewController.m
+++ b/ConnectStats/src/GCActivityTypeListViewController.m
@@ -23,11 +23,12 @@
 //  SOFTWARE.
 //  
 
+@import Flurry_iOS_SDK;
+
 #import "GCActivityTypeListViewController.h"
 #import "GCAppGlobal.h"
 #import "GCViewIcons.h"
 #import "GCViewConfig.h"
-#import "Flurry.h"
 #import "GCWebConnect+Requests.h"
 #import "GCActivityType.h"
 
diff --git a/ConnectStats/src/GCActivityTypeSelectionViewController.xib b/ConnectStats/src/GCActivityTypeSelectionViewController.xib
index 62c40a5d..a48badd1 100644
--- a/ConnectStats/src/GCActivityTypeSelectionViewController.xib
+++ b/ConnectStats/src/GCActivityTypeSelectionViewController.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
diff --git a/ConnectStats/src/GCAppConstants.h b/ConnectStats/src/GCAppConstants.h
index 4f5a54d2..7564d4e4 100644
--- a/ConnectStats/src/GCAppConstants.h
+++ b/ConnectStats/src/GCAppConstants.h
@@ -30,6 +30,7 @@ extern NSString * const  CONFIG_REFRESH_STARTUP;
 extern NSString * const  CONFIG_FILTER_BAD_VALUES;
 extern NSString * const  CONFIG_FILTER_ADJUST_FOR_LAP;
 extern NSString * const  CONFIG_FILTER_SPEED_BELOW;
+extern NSString * const  CONFIG_FILTER_SPEED_BELOW_SWIM;
 extern NSString * const  CONFIG_FILTER_BAD_ACCEL;
 extern NSString * const  CONFIG_FILTER_POWER_ABOVE;
 extern NSString * const  CONFIG_LAST_LATITUDE;
diff --git a/ConnectStats/src/GCAppConstants.m b/ConnectStats/src/GCAppConstants.m
index 34c125e9..b1356f42 100644
--- a/ConnectStats/src/GCAppConstants.m
+++ b/ConnectStats/src/GCAppConstants.m
@@ -32,6 +32,7 @@
 NSString * const CONFIG_FILTER_BAD_VALUES        = @"config_filter_bad_values";
 NSString * const CONFIG_FILTER_ADJUST_FOR_LAP    = @"config_filter_adjust_for_lap";
 NSString * const CONFIG_FILTER_SPEED_BELOW       = @"config_filter_speed_below";
+NSString * const CONFIG_FILTER_SPEED_BELOW_SWIM  = @"config_filter_speed_below_swim";
 NSString * const CONFIG_FILTER_BAD_ACCEL         = @"config_filter_bad_accel";
 NSString * const CONFIG_FILTER_POWER_ABOVE       = @"config_filter_power_above";
 NSString * const CONFIG_LAST_LATITUDE            = @"location_last_latitude";
diff --git a/ConnectStats/src/GCAppDelegate.m b/ConnectStats/src/GCAppDelegate.m
index 4176e822..627c6971 100644
--- a/ConnectStats/src/GCAppDelegate.m
+++ b/ConnectStats/src/GCAppDelegate.m
@@ -26,7 +26,7 @@
 #import "GCAppGlobal.h"
 #import "GCAppDelegate.h"
 #import "GCWebConnect.h"
-#import "Flurry.h"
+@import Flurry_iOS_SDK;
 #import "GCActivitiesCacheManagement.h"
 #include <execinfo.h>
 @import RZExternal;
diff --git a/ConnectStats/src/GCAppGlobal.m b/ConnectStats/src/GCAppGlobal.m
index c1f68e7f..8278a9c9 100644
--- a/ConnectStats/src/GCAppGlobal.m
+++ b/ConnectStats/src/GCAppGlobal.m
@@ -26,7 +26,7 @@
 #import "GCAppGlobal.h"
 #import "GCAppDelegate.h"
 #import "GCAppDelegate+Swift.h"
-#import "Flurry.h"
+@import Flurry_iOS_SDK;
 #import "GCHealthViewController.h"
 #import "GCWebConnect+Requests.h"
 
diff --git a/ConnectStats/src/GCAppProfiles.m b/ConnectStats/src/GCAppProfiles.m
index e662747d..0f39c811 100644
--- a/ConnectStats/src/GCAppProfiles.m
+++ b/ConnectStats/src/GCAppProfiles.m
@@ -25,7 +25,7 @@
 
 #import "GCAppGlobal.h"
 #import "GCAppProfiles.h"
-#import "Flurry.h"
+@import Flurry_iOS_SDK;
 #import "GCService.h"
 #import "GCAppProfiles+Swift.h"
 
diff --git a/ConnectStats/src/GCMapViewController.m b/ConnectStats/src/GCMapViewController.m
index 7df61e76..0451a63e 100644
--- a/ConnectStats/src/GCMapViewController.m
+++ b/ConnectStats/src/GCMapViewController.m
@@ -28,7 +28,7 @@
 #import "GCTrackPoint.h"
 #import "GCAppGlobal.h"
 #import "GCMapAnnotation.h"
-#import "Flurry.h"
+@import Flurry_iOS_SDK;
 #import "GCViewConfig.h"
 #import "GCActivity+CalculatedLaps.h"
 #import "GCFields.h"
diff --git a/ConnectStats/src/GCSettingsBugReport.swift b/ConnectStats/src/GCSettingsBugReport.swift
index 906a38b1..7e24a512 100644
--- a/ConnectStats/src/GCSettingsBugReport.swift
+++ b/ConnectStats/src/GCSettingsBugReport.swift
@@ -148,16 +148,17 @@ extension GCSettingsBugReport {
         let buildString = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String
         let versionString = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
         let device = UIDevice()
-        let deviceGuru = DeviceGuru()
+        let deviceGuru = DeviceGuruImplementation()
         let commonid = GCAppGlobal.configGet(CONFIG_BUG_COMMON_ID, defaultValue: kBugNoCommonId) ?? kBugNoCommonId
-
+        let platform = try? deviceGuru.hardwareDescription()
+        
         var rv : [String:String] = [
             "systemName" : device.systemName,
             "systemVersion": device.systemVersion,
             "applicationName" : applicationName,
             "version" : versionString ?? "Unknown Version",
             "build" : buildString ?? "Unknown Build",
-            "platformString": deviceGuru.hardwareDescription() ?? "Unknown Device",
+            "platformString": platform ?? "Unknown Device",
             "commonid" : commonid
         ]
         
diff --git a/ConnectStats/src/GCSettingsFilterViewController.m b/ConnectStats/src/GCSettingsFilterViewController.m
index a2541a66..6fb7cc89 100644
--- a/ConnectStats/src/GCSettingsFilterViewController.m
+++ b/ConnectStats/src/GCSettingsFilterViewController.m
@@ -27,12 +27,13 @@
 #import "GCCellGrid+Templates.h"
 #import "GCAppGlobal.h"
 
-#define GCVIEW_FILTER_MAIN          0
-#define GCVIEW_FILTER_LOW_SPEED     1
-#define GCVIEW_FILTER_ACCEL         2
-#define GCVIEW_FILTER_HIGH_POWER    3
-#define GCVIEW_FILTER_ADJUST_LAP    4
-#define GCVIEW_FILTER_END           5
+#define GCVIEW_FILTER_MAIN              0
+#define GCVIEW_FILTER_LOW_SPEED         1
+#define GCVIEW_FILTER_LOW_SPEED_SWIM    2
+#define GCVIEW_FILTER_ACCEL             3
+#define GCVIEW_FILTER_HIGH_POWER        4
+#define GCVIEW_FILTER_ADJUST_LAP        5
+#define GCVIEW_FILTER_END               6
 
 
 @interface GCSettingsFilterViewController ()
@@ -107,8 +108,19 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         [cell setupForRows:1 andCols:2];
         [cell labelForRow:0 andCol:0].attributedText = [GCViewConfig attributedString:NSLocalizedString(@"Minimum running speed", @"Settings Filter") attribute:@selector(attributeBold16)];
         [cell configForRow:0 andCol:0].horizontalOverflow=true;
-        NSUInteger choice = [self minimumSpeedChoiceForSpeed:[GCAppGlobal configGetDouble:CONFIG_FILTER_SPEED_BELOW defaultValue:1.0]];
-        NSString  * val = [self minimumSpeedChoicesDescriptions][choice];
+        NSUInteger choice = [self minimumSpeedChoiceForSpeed:[GCAppGlobal configGetDouble:CONFIG_FILTER_SPEED_BELOW defaultValue:1.0] activityType:GCActivityType.running];
+        NSString  * val = [self minimumSpeedChoicesDescriptions:GCActivityType.running][choice];
+        [cell labelForRow:0 andCol:1].attributedText = [GCViewConfig attributedString:val attribute:@selector(attributeBold16)];
+
+        rv = cell;
+    }else if(indexPath.row==GCVIEW_FILTER_LOW_SPEED_SWIM){
+        GCCellGrid * cell = [GCCellGrid cellGrid:tableView];
+        cell.marginx = 5.;
+        [cell setupForRows:1 andCols:2];
+        [cell labelForRow:0 andCol:0].attributedText = [GCViewConfig attributedString:NSLocalizedString(@"Minimum swimming speed", @"Settings Filter") attribute:@selector(attributeBold16)];
+        [cell configForRow:0 andCol:0].horizontalOverflow=true;
+        NSUInteger choice = [self minimumSpeedChoiceForSpeed:[GCAppGlobal configGetDouble:CONFIG_FILTER_SPEED_BELOW_SWIM defaultValue:0.2] activityType:GCActivityType.swimming];
+        NSString  * val = [self minimumSpeedChoicesDescriptions:GCActivityType.swimming][choice];
         [cell labelForRow:0 andCol:1].attributedText = [GCViewConfig attributedString:val attribute:@selector(attributeBold16)];
 
         rv = cell;
@@ -196,9 +208,9 @@ -(NSArray*)maximumPowerChoicesDescriptions{
 
 #pragma mark - Minimum Speed
 
--(NSUInteger)minimumSpeedChoiceForSpeed:(double)curr{
+-(NSUInteger)minimumSpeedChoiceForSpeed:(double)curr activityType:(GCActivityType*)activityType{
     NSUInteger idx = 0;
-    NSArray * choices = [self minimumSpeedChoices];
+    NSArray * choices = [self minimumSpeedChoices:activityType];
 
     for (idx=0; idx<choices.count; idx++) {
         if (curr <= [choices[idx] doubleValue]) {
@@ -212,15 +224,19 @@ -(NSUInteger)minimumSpeedChoiceForSpeed:(double)curr{
     return idx;
 }
 
--(NSArray*)minimumSpeedChoices{
-    return @[@0., @0.5, @1.,@1.5,@1.75,@2.,@2.25, @2.6, @3., @3.25 ];
+-(NSArray*)minimumSpeedChoices:(GCActivityType*)activityType{
+    if ( [activityType hasSamePrimaryType:GCActivityType.swimming] ){
+        return @[@0., @0.1, @0.15, @0.2, @0.3, @0.4, @0.5];
+    }else{
+        return @[@0., @0.5, @1.,@1.5,@1.75,@2.,@2.25, @2.6, @3., @3.25 ];
+    }
 }
 
--(NSArray*)minimumSpeedChoicesDescriptions{
-    NSArray * sp = [self minimumSpeedChoices];
+-(NSArray*)minimumSpeedChoicesDescriptions:(GCActivityType*)activityType{
+    NSArray * sp = [self minimumSpeedChoices:activityType];
     NSMutableArray * ar = [NSMutableArray arrayWithCapacity:sp.count];
     
-    GCUnit * unit = [GCField fieldForFlag:gcFieldFlagWeightedMeanSpeed andActivityType:GC_TYPE_RUNNING].unit;
+    GCUnit * unit = [GCField fieldForFlag:gcFieldFlagWeightedMeanSpeed andActivityTypeDetail:activityType].unit;
     unit = [unit unitForGlobalSystem];
     for (NSNumber * v in sp) {
         double mps = v.doubleValue;
@@ -249,12 +265,19 @@ -(NSArray*)minimumSpeedChoicesDescriptions{
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
     if (indexPath.row == GCVIEW_FILTER_LOW_SPEED) {
-        NSArray * choices = [self minimumSpeedChoicesDescriptions];
-        NSUInteger selected = [self minimumSpeedChoiceForSpeed:[GCAppGlobal configGetDouble:CONFIG_FILTER_SPEED_BELOW defaultValue:1.0]];
+        NSArray * choices = [self minimumSpeedChoicesDescriptions:GCActivityType.running];
+        NSUInteger selected = [self minimumSpeedChoiceForSpeed:[GCAppGlobal configGetDouble:CONFIG_FILTER_SPEED_BELOW defaultValue:1.0] activityType:GCActivityType.running];
         GCCellEntryListViewController * detailViewController = [GCViewConfig standardEntryListViewController:choices selected:selected];
         detailViewController.entryFieldDelegate = self;
         detailViewController.identifierInt = GCVIEW_FILTER_LOW_SPEED;
         [self.navigationController pushViewController:detailViewController animated:YES];
+    }else if (indexPath.row == GCVIEW_FILTER_LOW_SPEED_SWIM) {
+        NSArray * choices = [self minimumSpeedChoicesDescriptions:GCActivityType.swimming];
+        NSUInteger selected = [self minimumSpeedChoiceForSpeed:[GCAppGlobal configGetDouble:CONFIG_FILTER_SPEED_BELOW_SWIM defaultValue:0.2] activityType:GCActivityType.swimming];
+        GCCellEntryListViewController * detailViewController = [GCViewConfig standardEntryListViewController:choices selected:selected];
+        detailViewController.entryFieldDelegate = self;
+        detailViewController.identifierInt = GCVIEW_FILTER_LOW_SPEED_SWIM;
+        [self.navigationController pushViewController:detailViewController animated:YES];
     }else if (indexPath.row==GCVIEW_FILTER_HIGH_POWER){
         NSArray * choices = [self maximumPowerChoicesDescriptions];
         NSUInteger selected = [self maximumPowerChoiceForPower:[GCAppGlobal configGetDouble:CONFIG_FILTER_POWER_ABOVE defaultValue:CONFIG_FILTER_DISABLED_POWER]];
@@ -273,9 +296,14 @@ -(void)cellWasChanged:(id<GCEntryFieldProtocol>)cell{
             [GCAppGlobal saveSettings];
             break;
         case GCVIEW_FILTER_LOW_SPEED:
-            [GCAppGlobal configSet:CONFIG_FILTER_SPEED_BELOW doubleVal:[[self minimumSpeedChoices][[cell selected]] doubleValue]];
+            [GCAppGlobal configSet:CONFIG_FILTER_SPEED_BELOW doubleVal:[[self minimumSpeedChoices:GCActivityType.running][[cell selected]] doubleValue]];
             [GCAppGlobal saveSettings];
             break;
+        case GCVIEW_FILTER_LOW_SPEED_SWIM:
+            [GCAppGlobal configSet:CONFIG_FILTER_SPEED_BELOW_SWIM doubleVal:[[self minimumSpeedChoices:GCActivityType.swimming][[cell selected]] doubleValue]];
+            [GCAppGlobal saveSettings];
+            break;
+
         case GCVIEW_FILTER_HIGH_POWER:
             [GCAppGlobal configSet:CONFIG_FILTER_POWER_ABOVE doubleVal:[[self maximumPowerChoices][[cell selected]] doubleValue]];
             [GCAppGlobal saveSettings];
diff --git a/ConnectStats/src/GCSettingsHelpViewController.m b/ConnectStats/src/GCSettingsHelpViewController.m
index 9df606b3..f2ee28e2 100644
--- a/ConnectStats/src/GCSettingsHelpViewController.m
+++ b/ConnectStats/src/GCSettingsHelpViewController.m
@@ -25,7 +25,7 @@
 
 #import "GCSettingsHelpViewController.h"
 #import "GCViewIcons.h"
-#import "Flurry.h"
+@import Flurry_iOS_SDK;
 #import "GCAppGlobal.h"
 #import "GCViewConfig.h"
 
diff --git a/ConnectStats/src/GCStatsMultiFieldGraphViewController.m b/ConnectStats/src/GCStatsMultiFieldGraphViewController.m
index 2da7b74f..8ffa2226 100644
--- a/ConnectStats/src/GCStatsMultiFieldGraphViewController.m
+++ b/ConnectStats/src/GCStatsMultiFieldGraphViewController.m
@@ -26,7 +26,7 @@
 #import "GCStatsMultiFieldGraphViewController.h"
 #import "GCSimpleGraphCachedDataSource+Templates.h"
 #import "GCViewConfig.h"
-#import "Flurry.h"
+@import Flurry_iOS_SDK;
 #import "GCAppConstants.h"
 #import "GCViewIcons.h"
 #import "GCHistoryFieldDataSerie.h"
diff --git a/ConnectStats/src/GCStatsMultiFieldViewController.m b/ConnectStats/src/GCStatsMultiFieldViewController.m
index 3183dd31..e92ede8c 100644
--- a/ConnectStats/src/GCStatsMultiFieldViewController.m
+++ b/ConnectStats/src/GCStatsMultiFieldViewController.m
@@ -29,7 +29,7 @@
 #import "GCViewConfig.h"
 #import "GCStatsOneFieldViewController.h"
 #import "GCCellGrid+Templates.h"
-#import "Flurry.h"
+@import Flurry_iOS_SDK;
 #import "GCSimpleGraphCachedDataSource+Templates.h"
 #import "GCStatsOneFieldGraphViewController.h"
 #import "GCViewIcons.h"
diff --git a/ConnectStats/src/GCStatsOneFieldViewController.m b/ConnectStats/src/GCStatsOneFieldViewController.m
index 288b436f..5f0672f5 100644
--- a/ConnectStats/src/GCStatsOneFieldViewController.m
+++ b/ConnectStats/src/GCStatsOneFieldViewController.m
@@ -29,7 +29,7 @@
 #import "GCSimpleGraphCachedDataSource+Templates.h"
 #import "GCCellGrid+Templates.h"
 #import "GCStatsMultiFieldGraphViewController.h"
-#import "Flurry.h"
+@import Flurry_iOS_SDK;
 #import "GCStatsOneFieldGraphViewController.h"
 #import "GCFields.h"
 #import "GCViewConfig.h"
diff --git a/ConnectStats/src/GCTabBarController.m b/ConnectStats/src/GCTabBarController.m
index 8bd02d69..0d2c5838 100644
--- a/ConnectStats/src/GCTabBarController.m
+++ b/ConnectStats/src/GCTabBarController.m
@@ -25,7 +25,7 @@
 
 #import "GCTabBarController.h"
 #import "GCAppGlobal.h"
-#import "Flurry.h"
+@import Flurry_iOS_SDK;
 @import RZExternal;
 #import "GCViewIcons.h"
 #import "GCWebConnect+Requests.h"
diff --git a/ConnectStats/src/GCWeather.m b/ConnectStats/src/GCWeather.m
index 79f292aa..cd6140d2 100644
--- a/ConnectStats/src/GCWeather.m
+++ b/ConnectStats/src/GCWeather.m
@@ -23,8 +23,9 @@
 //  SOFTWARE.
 //  
 
+@import Flurry_iOS_SDK;
+
 #import "GCWeather.h"
-#import "Flurry.h"
 #import "GCAppGlobal.h"
 #import "GCFields.h"
 
diff --git a/FitFileExplorer/src/ActivitiesOrganizer.swift b/FitFileExplorer/src/ActivitiesOrganizer.swift
index cabac62c..4ae6295a 100644
--- a/FitFileExplorer/src/ActivitiesOrganizer.swift
+++ b/FitFileExplorer/src/ActivitiesOrganizer.swift
@@ -247,10 +247,9 @@ class ActivitiesOrganizer {
         return rv
     }
     func save(url : URL) throws {
-        if let json = try? self.json(),
-            let data = try? JSONEncoder().encode(json) {
-            try data.write(to: url)
-        }
+        let json = try self.json()
+        let data = try JSONEncoder().encode(json)
+        try data.write(to: url)
     }
     func json() throws -> JSON {
         let list : JSON = try JSON(activityList.map {
diff --git a/Podfile.lock b/Podfile.lock
index c5138320..d560deeb 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,11 +1,13 @@
 PODS:
   - Armchair (0.3.7)
   - CHCSVParser (2.1.0)
-  - Flurry-iOS-SDK/FlurrySDK (11.4.0)
-  - GoogleMaps (6.0.1):
-    - GoogleMaps/Maps (= 6.0.1)
-  - GoogleMaps/Base (6.0.1)
-  - GoogleMaps/Maps (6.0.1):
+  - Flurry-iOS-SDK/CrashReporter (12.1.1)
+  - Flurry-iOS-SDK/FlurrySDK (12.1.1):
+    - Flurry-iOS-SDK/CrashReporter
+  - GoogleMaps (7.1.0):
+    - GoogleMaps/Maps (= 7.1.0)
+  - GoogleMaps/Base (7.1.0)
+  - GoogleMaps/Maps (7.1.0):
     - GoogleMaps/Base
 
 DEPENDENCIES:
@@ -24,8 +26,8 @@ SPEC REPOS:
 SPEC CHECKSUMS:
   Armchair: ea2da13f78515da627bd63d9540bd58a50e71562
   CHCSVParser: 3bcc7bdb72111a31222e95d57eacceefe4e537e8
-  Flurry-iOS-SDK: a1dbf099040d71e89a11cdf3a30c8723c1de950f
-  GoogleMaps: c213fc2334b7374144cede914da779b99be0ab74
+  Flurry-iOS-SDK: 2ae2391515ae3248a63e95a397c1b393ae52b3a9
+  GoogleMaps: bc56ffb0324e345a2d91bac1a64a920f9c8f1b20
 
 PODFILE CHECKSUM: 19ad1230cebe2eb3b145b952512054697dd5afe8
 
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base Ext@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base Ext@2x.png
index a79f4c08..3a4c4240 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base Ext@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base Ext@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base Ext@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base Ext@3x.png
index 3e8f40f8..9839db22 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base Ext@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base Ext@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base@2x.png
index 3f054603..20872bf0 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base@3x.png
index 97781e31..b3317812 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Base@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail New Style@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail New Style@2x.png
index 720d9310..65f7bc33 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail New Style@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail New Style@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail New Style@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail New Style@3x.png
index 42c70221..7c8a94cd 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail New Style@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail New Style@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail@2x.png
index 720d9310..65f7bc33 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail@3x.png
index 42c70221..7c8a94cd 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Detail@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap New Style@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap New Style@2x.png
index f060d14f..d611c368 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap New Style@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap New Style@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap New Style@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap New Style@3x.png
index 3bcf119b..c1e6f4e8 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap New Style@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap New Style@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap@2x.png
index f060d14f..d611c368 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap@3x.png
index 3bcf119b..c1e6f4e8 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Cycle Activity Lap@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity hr@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity hr@2x.png
index abccba72..8702d1f8 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity hr@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity hr@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity hr@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity hr@3x.png
index ede9c8de..6b6574a9 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity hr@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity hr@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity nohr@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity nohr@2x.png
index 033933e8..dd58c5be 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity nohr@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity nohr@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity nohr@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity nohr@3x.png
index b18fb81a..d7181f2b 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity nohr@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Day Activity nohr@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base Ext@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base Ext@2x.png
index 7e54278b..4c805e4b 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base Ext@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base Ext@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base Ext@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base Ext@3x.png
index 5e68b347..29f011d8 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base Ext@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base Ext@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base@2x.png
index f25f189f..63b22697 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base@3x.png
index a4812c61..306b24af 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Base@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare Ext@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare Ext@2x.png
index ba48cb7f..2138ddb8 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare Ext@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare Ext@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare Ext@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare Ext@3x.png
index f5142467..2dbff4eb 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare Ext@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare Ext@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare@2x.png
index 6253a812..7a3ce24d 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare@3x.png
index 7ada2dbe..eb43aeb4 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Compare@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail New Style@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail New Style@2x.png
index 92883a17..f2c67437 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail New Style@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail New Style@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail New Style@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail New Style@3x.png
index c754f33c..904cca98 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail New Style@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail New Style@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail@2x.png
index 2dc15f2e..4d9d0618 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail@3x.png
index be989ede..dd29262c 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Detail@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap  New Style@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap  New Style@2x.png
index eb4c377d..e59ed8a4 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap  New Style@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap  New Style@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap  New Style@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap  New Style@3x.png
index 9bb3e68d..477cdc02 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap  New Style@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap  New Style@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap@2x.png
index ccab5049..d3f05117 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap@3x.png
index 071995d0..1ec626f1 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Lap@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Pace Field@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Pace Field@2x.png
index 85d41aef..a4ff8328 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Pace Field@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Activity Pace Field@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month Compare NewStyle@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month Compare NewStyle@2x.png
index 0cad0344..1b0c58bf 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month Compare NewStyle@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month Compare NewStyle@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month Compare NewStyle@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month Compare NewStyle@3x.png
index 268349b0..54c59e06 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month Compare NewStyle@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month Compare NewStyle@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month [0] NewStyle@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month [0] NewStyle@2x.png
index aed574ae..6d1221c0 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month [0] NewStyle@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month [0] NewStyle@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month [0] NewStyle@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month [0] NewStyle@3x.png
index 2905b55a..3d32cc89 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month [0] NewStyle@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Month [0] NewStyle@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Monthly@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Monthly@2x.png
index a02020af..9b555578 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Monthly@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Monthly@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Monthly@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Monthly@3x.png
index 425db774..9fb22e8c 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Monthly@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Monthly@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [0] NewStyle@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [0] NewStyle@2x.png
index bdc03773..35533adf 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [0] NewStyle@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [0] NewStyle@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [0] NewStyle@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [0] NewStyle@3x.png
index 4b5c7abd..71e51b95 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [0] NewStyle@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [0] NewStyle@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [1] NewStyle@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [1] NewStyle@2x.png
index cc18fbf2..1ecaa2f8 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [1] NewStyle@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [1] NewStyle@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [1] NewStyle@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [1] NewStyle@3x.png
index 42197104..3e3ec37d 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [1] NewStyle@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly [1] NewStyle@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly@2x.png
index 91702644..16d7f35b 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly@3x.png
index 5748307a..3f24cc54 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Running Stats Weekly@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 0@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 0@2x.png
index 1e246566..68680064 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 0@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 0@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 0@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 0@3x.png
index adbd2be6..8e8fef38 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 0@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 0@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 1@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 1@2x.png
index 97a694b6..54783937 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 1@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 1@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 1@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 1@3x.png
index ba6626d3..29edd6a0 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 1@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Geometry 1@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@2x.png
index 9b182ac5..b02ad070 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@3x.png
index 19e2af61..1ea9f483 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Sample Simple Cell Overflow@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Stats Multi Last Month@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Stats Multi Last Month@2x.png
index a02020af..9b555578 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Stats Multi Last Month@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Stats Multi Last Month@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Stats Multi Last Month@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Stats Multi Last Month@3x.png
index 425db774..9fb22e8c 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Stats Multi Last Month@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Stats Multi Last Month@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base Ext@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base Ext@2x.png
index a297eddd..2d130a22 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base Ext@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base Ext@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base Ext@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base Ext@3x.png
index 28765f71..be94b62d 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base Ext@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base Ext@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base@2x.png
index 2b6639f6..6a18a93f 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base@3x.png
index 5a2ec335..f06c451e 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Base@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail New Style@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail New Style@2x.png
index b29dee97..fcc14dce 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail New Style@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail New Style@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail New Style@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail New Style@3x.png
index f4bbdf57..1de2a577 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail New Style@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail New Style@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail@2x.png
index b29dee97..fcc14dce 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail@3x.png
index f4bbdf57..1de2a577 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Detail@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Pace Field New Style@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Pace Field New Style@2x.png
index 800b5c19..5339f830 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Pace Field New Style@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Pace Field New Style@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Pace Field@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Pace Field@2x.png
index 800b5c19..5339f830 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Pace Field@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_Swim Activity Pace Field@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1120564997@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1120564997@2x.png
index 08c62b7b..a3f40b01 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1120564997@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1120564997@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1120564997@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1120564997@3x.png
index cbc2fb33..19cdbd60 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1120564997@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1120564997@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1128198480@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1128198480@2x.png
index ab055cb5..5864f005 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1128198480@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1128198480@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1128198480@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1128198480@3x.png
index 0034d42b..1cbab952 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1128198480@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1128198480@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1249744031@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1249744031@2x.png
index 04119a53..45674cb2 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1249744031@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1249744031@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1249744031@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1249744031@3x.png
index ddef0da8..87e8ee94 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1249744031@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 1249744031@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 2162121216@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 2162121216@2x.png
index 07a5d080..8988064f 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 2162121216@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 2162121216@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 2162121216@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 2162121216@3x.png
index 27d8abf9..65160c8a 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 2162121216@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 2162121216@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 268105029@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 268105029@2x.png
index 2ca53f6b..c7aa72df 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 268105029@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 268105029@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 268105029@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 268105029@3x.png
index 0b15f9ca..4faf8ac0 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 268105029@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 268105029@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3030224769@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3030224769@2x.png
index dbfbbeaf..d9500539 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3030224769@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3030224769@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3030224769@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3030224769@3x.png
index 370ebb1c..4d3f3a39 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3030224769@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3030224769@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3447664564@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3447664564@2x.png
index f096d190..277af222 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3447664564@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3447664564@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3447664564@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3447664564@3x.png
index 0a57677e..19947f3d 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3447664564@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3447664564@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560919337@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560919337@2x.png
index ee3a8936..03efa90b 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560919337@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560919337@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560919337@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560919337@3x.png
index 9776bae5..e7af5701 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560919337@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560919337@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560921097@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560921097@2x.png
index ac59742d..3490a126 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560921097@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560921097@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560921097@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560921097@3x.png
index a16cd158..f3f4225b 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560921097@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 3560921097@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5495374463@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5495374463@2x.png
index c9f28dd5..231d8c35 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5495374463@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5495374463@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5495374463@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5495374463@3x.png
index 37599a33..b3b51544 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5495374463@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5495374463@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5583932451@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5583932451@2x.png
index 7e16bd5f..fe0e62a1 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5583932451@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5583932451@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5583932451@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5583932451@3x.png
index 1ef77f30..d450faf1 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5583932451@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5583932451@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5585111119@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5585111119@2x.png
index 03f7050f..8a717308 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5585111119@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5585111119@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5585111119@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5585111119@3x.png
index 876d6412..e355dedb 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5585111119@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5585111119@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5661400879@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5661400879@2x.png
index ac38d257..fabbc0f1 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5661400879@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5661400879@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5661400879@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5661400879@3x.png
index c2099e94..04a8ed9b 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5661400879@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5661400879@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5664306014@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5664306014@2x.png
index 10b5261a..f639b570 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5664306014@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5664306014@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5664306014@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5664306014@3x.png
index eae38a39..cb89cb1e 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5664306014@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5664306014@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5689665959@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5689665959@2x.png
index b6e608ac..50b6894a 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5689665959@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5689665959@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5689665959@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5689665959@3x.png
index e7e6dfde..b9878b47 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5689665959@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for 5689665959@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__148196@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__148196@2x.png
index c214596a..2aab6d55 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__148196@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__148196@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__148196@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__148196@3x.png
index 6487a1a6..9b2e82b8 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__148196@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__148196@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__1758559@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__1758559@2x.png
index dd782bd5..5c6d9a8e 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__1758559@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__1758559@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__1758559@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__1758559@3x.png
index 8476bc32..374f3715 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__1758559@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__1758559@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__404211@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__404211@2x.png
index 23b4a918..692b0d7e 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__404211@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__404211@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__404211@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__404211@3x.png
index 0fb11e06..3956bdcc 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__404211@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__404211@3x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__74108@2x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__74108@2x.png
index 59c36f18..ca0f13af 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__74108@2x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__74108@2x.png differ
diff --git a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__74108@3x.png b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__74108@3x.png
index c90bfc34..75f3db88 100644
Binary files a/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__74108@3x.png and b/connectstatstestapp/samples/ReferenceImages/GCTestUIUnitTest/checkGridCellSnapshot_new cell for __connectstats__74108@3x.png differ