diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d768ccc..0825f07c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [2.9.7] - 2021-1-26
+- Updated order of panel shown during onboarding [#503](https://github.com/rokwire/safer-illinois-app/issues/503)
+- Apply nextStepDate in local time when making the calculations for displayNextStepDate.
+
 ## [2.9.6] - 2021-1-22
 ### Fixed
 - Updated Onboarding Disclosure Panel text. [#497](https://github.com/rokwire/safer-illinois-app/issues/497)
diff --git a/assets/flexUI.json b/assets/flexUI.json
index 603203ca..6e1c4361 100644
--- a/assets/flexUI.json
+++ b/assets/flexUI.json
@@ -1,7 +1,7 @@
 {
 	"content": {
-		"onboarding": ["get_started", "organization", "notifications_auth", "location_auth", "bluetooth_auth", "roles", "login_netid", "login_phone", "verify_phone", "confirm_phone",
-			 "covid19_intro", "covid19_how_it_works", "health_disclosure", "covid19_consent", "covid19_qrcode", "covid19_final"],
+		"onboarding": ["get_started", "organization", "health_disclosure", "notifications_auth", "location_auth", "bluetooth_auth", "roles", "login_netid", "login_phone", "verify_phone", "confirm_phone",
+			 "covid19_intro", "covid19_how_it_works", "covid19_consent", "covid19_qrcode", "covid19_final"],
 
 		"settings": ["user_info", "connect", "customizations", "connected", "notifications", "covid19", "privacy", "account", "feedback"],
 		"settings.connect": ["netid", "phone"],
diff --git a/lib/model/Health.dart b/lib/model/Health.dart
index da717118..9ed63291 100644
--- a/lib/model/Health.dart
+++ b/lib/model/Health.dart
@@ -165,7 +165,7 @@ class Covid19StatusBlob {
 
   String displayNextStepDate({String format = _nextStepDateFormat}) {
     if (nextStepDateUtc != null) {
-      DateTime nextStepMidnightLocal = AppDateTime.midnight(nextStepDateUtc);
+      DateTime nextStepMidnightLocal = AppDateTime.midnight(nextStepDateUtc.toLocal());
       if (nextStepMidnightLocal == AppDateTime.todayMidnightLocal) {
         return Localization().getStringEx('model.explore.time.today', 'Today').toLowerCase();
       }
@@ -391,13 +391,7 @@ class Covid19History {
   }
 
   DateTime get dateMidnightLocal {
-    if (dateUtc != null) {
-      DateTime dateLocal = dateUtc.toLocal();
-      return DateTime(dateLocal.year, dateLocal.month, dateLocal.day);
-    }
-    else {
-      return null;
-    }
+    return (dateUtc != null) ? AppDateTime.midnight(dateUtc.toLocal()) : null;
   }
 
   bool matchEvent(Covid19Event event) {
diff --git a/pubspec.yaml b/pubspec.yaml
index 15ae5344..cfc025fe 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -11,7 +11,7 @@ description: Illinois client application.
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.9.6+906
+version: 2.9.7+907
 
 environment:
   sdk: ">=2.2.0 <3.0.0"