diff --git a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
index 886331bab..2f79cf9f4 100644
--- a/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
+++ b/Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
@@ -281,14 +281,6 @@
       <SubType></SubType>
       <Generator></Generator>
     </AndroidResource>
-    <AndroidResource Include="Resources\drawable-zh-xhdpi\Nocontact10.png">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
-    <AndroidResource Include="Resources\drawable-zh-xxhdpi\Nocontact10.png">
-      <SubType></SubType>
-      <Generator></Generator>
-    </AndroidResource>
     <AndroidResource Include="Resources\drawable\ic_notification.xml">
       <SubType></SubType>
       <Generator></Generator>
@@ -389,6 +381,10 @@
       <SubType></SubType>
       <Generator></Generator>
     </AndroidResource>
+    <AndroidResource Include="Resources\drawable-xxhdpi\exposure_check_page_head.png">
+      <SubType></SubType>
+      <Generator></Generator>
+    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
     <None Include="Properties\AndroidManifest.xml" />
@@ -553,15 +549,9 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-ja-xhdpi\HelpPage22.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-ja-xhdpi\Nocontact10.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-ja-xxhdpi\HelpPage22.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-ja-xxhdpi\Nocontact10.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\HeaderLogo.png" />
   </ItemGroup>
@@ -571,9 +561,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\InfoMark.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\Nocontact10.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxhdpi\HeaderLogo.png" />
   </ItemGroup>
@@ -583,9 +570,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xxhdpi\InfoMark.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xxhdpi\Nocontact10.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\SplashImg.png" />
   </ItemGroup>
diff --git a/Covid19Radar/Covid19Radar.Android/Properties/AndroidManifest.xml b/Covid19Radar/Covid19Radar.Android/Properties/AndroidManifest.xml
index 4ba105ac0..310793182 100644
--- a/Covid19Radar/Covid19Radar.Android/Properties/AndroidManifest.xml
+++ b/Covid19Radar/Covid19Radar.Android/Properties/AndroidManifest.xml
@@ -29,5 +29,13 @@
 			<action android:name="android.intent.action.SEND" />
 			<data android:scheme="mailto" />
 		</intent>
+	   <intent>
+	      <action android:name="android.intent.action.VIEW"/>
+	      <category android:name="android.intent.category.BROWSABLE"/>
+	      <data android:scheme="https"
+               android:host="github.com"
+               android:path="cocoa-mhlw/cocoa/"
+               />
+	   </intent>
 	</queries>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/Nocontact10.png
deleted file mode 100644
index 8bec876b1..000000000
Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xhdpi/Nocontact10.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/Nocontact10.png
deleted file mode 100644
index 38728abac..000000000
Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-ja-xxhdpi/Nocontact10.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Nocontact10.png
deleted file mode 100644
index ae37493bc..000000000
Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xhdpi/Nocontact10.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Nocontact10.png
deleted file mode 100644
index 5da9d986d..000000000
Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/Nocontact10.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/exposure_check_page_head.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/exposure_check_page_head.png
new file mode 100644
index 000000000..36418d5ef
Binary files /dev/null and b/Covid19Radar/Covid19Radar.Android/Resources/drawable-xxhdpi/exposure_check_page_head.png differ
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/Nocontact10.png
deleted file mode 100644
index 2b49dd4e8..000000000
Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xhdpi/Nocontact10.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/Nocontact10.png b/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/Nocontact10.png
deleted file mode 100644
index cf73bae5a..000000000
Binary files a/Covid19Radar/Covid19Radar.Android/Resources/drawable-zh-xxhdpi/Nocontact10.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs b/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs
index fccc76eec..70dade75e 100644
--- a/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs
+++ b/Covid19Radar/Covid19Radar.Android/Services/DeviceCheckService.cs
@@ -14,7 +14,7 @@ public class DeviceCheckService : IDeviceVerifier
     {
         public Task<string> VerifyAsync(DiagnosisSubmissionParameter submission)
         {
-            var nonce = DeviceVerifierUtils.CreateAndroidNonceV3(submission);
+            var nonce = DeviceVerifierUtils.CreateAndroidNonceV2(submission);
             return GetSafetyNetAttestationAsync(nonce);
         }
 
diff --git a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
index b1b9b51c2..0bb45cb72 100644
--- a/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
+++ b/Covid19Radar/Covid19Radar.iOS/Covid19Radar.iOS.csproj
@@ -303,8 +303,6 @@
     <BundleResource Include="Resources\Base.lproj\privacypolicy_img01%402x.png" />
     <BundleResource Include="Resources\Base.lproj\arrow_icon%403x.png" />
     <BundleResource Include="Resources\Base.lproj\arrow_icon%402x.png" />
-    <BundleResource Include="Resources\Base.lproj\Nocontact10%402x.png" />
-    <BundleResource Include="Resources\Base.lproj\Nocontact10%403x.png" />
     <BundleResource Include="Resources\Base.lproj\HelpPage20%402x.png" />
     <BundleResource Include="Resources\Base.lproj\HelpPage20%403x.png" />
     <BundleResource Include="Resources\Base.lproj\HelpPage21%402x.png" />
@@ -329,8 +327,6 @@
     <BundleResource Include="Resources\zh-Hans.lproj\HelpPage31%403x.png" />
     <BundleResource Include="Resources\zh-Hans.lproj\HelpPage32%402x.png" />
     <BundleResource Include="Resources\zh-Hans.lproj\HelpPage32%403x.png" />
-    <BundleResource Include="Resources\zh-Hans.lproj\Nocontact10%402x.png" />
-    <BundleResource Include="Resources\zh-Hans.lproj\Nocontact10%403x.png" />
     <BundleResource Include="Resources\license.html" />
     <BundleResource Include="Resources\Base.lproj\app_share_icon%402x.png" />
     <BundleResource Include="Resources\Base.lproj\app_share_icon%403x.png" />
@@ -362,6 +358,7 @@
     <BundleResource Include="Resources\zh-Hans.lproj\icon_menu%403x.png" />
     <BundleResource Include="Resources\Base.lproj\icon_arrow%402x.png" />
     <BundleResource Include="Resources\Base.lproj\icon_arrow%403x.png" />
+    <BundleResource Include="Resources\Base.lproj\exposure_check_page_head.png" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -514,12 +511,6 @@
   <ItemGroup>
     <BundleResource Include="Resources\ja.lproj\HelpPage32%403x.png" />
   </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\ja.lproj\Nocontact10%402x.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\ja.lproj\Nocontact10%403x.png" />
-  </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\ja.lproj\HelpPage22%402x.png" />
   </ItemGroup>
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@2x.png
deleted file mode 100644
index e8e560fa6..000000000
Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@2x.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@3x.png
deleted file mode 100644
index 5da9d986d..000000000
Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/Nocontact10@3x.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/exposure_check_page_head.png b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/exposure_check_page_head.png
new file mode 100644
index 000000000..36418d5ef
Binary files /dev/null and b/Covid19Radar/Covid19Radar.iOS/Resources/Base.lproj/exposure_check_page_head.png differ
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@2x.png
deleted file mode 100644
index f2e69fd5f..000000000
Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@2x.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@3x.png
deleted file mode 100644
index c1538ddda..000000000
Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/ja.lproj/Nocontact10@3x.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@2x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@2x.png
deleted file mode 100644
index 71e8b8301..000000000
Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@2x.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@3x.png b/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@3x.png
deleted file mode 100644
index 62755aa09..000000000
Binary files a/Covid19Radar/Covid19Radar.iOS/Resources/zh-Hans.lproj/Nocontact10@3x.png and /dev/null differ
diff --git a/Covid19Radar/Covid19Radar/App.xaml b/Covid19Radar/Covid19Radar/App.xaml
index 1b5940d67..a5d2049ea 100644
--- a/Covid19Radar/Covid19Radar/App.xaml
+++ b/Covid19Radar/Covid19Radar/App.xaml
@@ -206,7 +206,7 @@
                 <Setter Property="BorderWidth" Value="4" />
                 <Setter Property="TextColor" Value="{StaticResource ButtonText}" />
                 <Setter Property="FontSize" Value="Medium" />
-                <Setter Property="Padding" Value="0,0,0,0" />
+                <Setter Property="Padding" Value="10" />
                 <Setter Property="Margin" Value="0,10,0,5" />
                 <Setter Property="HorizontalOptions" Value="Center" />
                 <Setter Property="WidthRequest" Value="{x:OnPlatform Android=300, iOS=310}" />
@@ -273,13 +273,16 @@
             </Style>
 
             <Style x:Key="FrameCardViewStyle" TargetType="Frame">
-                <Setter Property="CornerRadius" Value="5" />
+                <Setter Property="CornerRadius" Value="6" />
                 <Setter Property="Margin" Value="5" />
                 <Setter Property="Padding" Value="10" />
                 <Setter Property="HorizontalOptions" Value="FillAndExpand" />
                 <Setter Property="OutlineColor" Value="LightGray" />
                 <Setter Property="BorderColor" Value="LightGray" />
-                <Setter Property="HasShadow" Value="True" />
+            </Style>
+
+            <Style x:Key="FrameCardViewStyle_Diabled" TargetType="Frame" BasedOn="{StaticResource FrameCardViewStyle}">
+                <Setter Property="Opacity" Value="0.5" />
             </Style>
 
             <Style x:Key="LinkLabelStyleLarge" TargetType="Label">
diff --git a/Covid19Radar/Covid19Radar/App.xaml.cs b/Covid19Radar/Covid19Radar/App.xaml.cs
index c9f037fb6..5169c0c73 100644
--- a/Covid19Radar/Covid19Radar/App.xaml.cs
+++ b/Covid19Radar/Covid19Radar/App.xaml.cs
@@ -162,7 +162,6 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
             containerRegistry.RegisterForNavigation<PrivacyPolicyPage2>();
             containerRegistry.RegisterForNavigation<InqueryPage>();
             containerRegistry.RegisterForNavigation<TermsofservicePage>();
-            containerRegistry.RegisterForNavigation<ThankYouNotifyOtherPage>();
             containerRegistry.RegisterForNavigation<NotifyOtherPage>();
             containerRegistry.RegisterForNavigation<ExposureCheckPage>();
             containerRegistry.RegisterForNavigation<ContactedNotifyPage>();
@@ -183,7 +182,6 @@ private static void RegisterCommonTypes(IContainer container)
             container.Register<ILoggerService, LoggerService>(Reuse.Singleton);
             container.Register<ILogFileService, LogFileService>(Reuse.Singleton);
             container.Register<ILogPathService, LogPathService>(Reuse.Singleton);
-            container.Register<ILogUploadService, LogUploadService>(Reuse.Singleton);
             container.Register<IEssentialsService, EssentialsService>(Reuse.Singleton);
             container.Register<IUserDataService, UserDataService>(Reuse.Singleton);
             container.Register<ITermsUpdateService, TermsUpdateService>(Reuse.Singleton);
@@ -217,11 +215,12 @@ private static void RegisterCommonTypes(IContainer container)
             container.Register<IExposureConfigurationRepository, ExposureConfigurationRepository>(Reuse.Singleton);
             container.Register<IExposureRiskCalculationConfigurationRepository, ExposureRiskCalculationConfigurationRepository>(Reuse.Singleton);
 
-#if EVENT_LOG_ENABLED
-            container.Register<IEventLogService, EventLogService>(Reuse.Singleton);
-#else
+            // Privacy
             container.Register<IEventLogService, EventLogServiceNop>(Reuse.Singleton);
-#endif
+
+            // Beta
+            container.Register<ILogUploadService, LogUploadServiceNop>(Reuse.Singleton);
+            container.Register<ICheckVersionService, CheckVersionServiceNop>(Reuse.Singleton);
 
             // Utilities
             container.Register<IDateTimeUtility, DateTimeUtility>(Reuse.Singleton);
diff --git a/Covid19Radar/Covid19Radar/Common/AppConstants.cs b/Covid19Radar/Covid19Radar/Common/AppConstants.cs
index 3db48094e..de9333c55 100644
--- a/Covid19Radar/Covid19Radar/Common/AppConstants.cs
+++ b/Covid19Radar/Covid19Radar/Common/AppConstants.cs
@@ -14,7 +14,7 @@ public static class AppConstants
         /// <summary>
         /// Number of days covered from the date of diagnosis or onset
         /// </summary>
-        public const int DaysToSendTek = -15;
+        public const int DaysToSendTek = -3;
 
         /// <summary>
         /// Max Error Count
@@ -47,7 +47,7 @@ public static class AppConstants
         /// DiagnosisApi version.
         /// (e.g. v2, v3)
         /// </summary>
-        public const string DiagnosisApiVersionCode = "v3";
+        public const string DiagnosisApiVersionCode = "v2";
 
         /// <summary>
         /// Number of day(s) that ExposureConfiguration file downloaded cache.
diff --git a/Covid19Radar/Covid19Radar/Common/AppUtils.cs b/Covid19Radar/Covid19Radar/Common/AppUtils.cs
index c1aef1f2c..95976be9a 100644
--- a/Covid19Radar/Covid19Radar/Common/AppUtils.cs
+++ b/Covid19Radar/Covid19Radar/Common/AppUtils.cs
@@ -2,13 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-using Acr.UserDialogs;
-using Covid19Radar.Resources;
-using Covid19Radar.Services.Logs;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Diagnostics;
-using System.Net.Http;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 
@@ -36,45 +29,5 @@ await Share.RequestAsync(new ShareTextRequest
             }
 
         }
-
-        public static async void CheckVersion(ILoggerService loggerService)
-        {
-            loggerService.StartMethod();
-
-            var uri = AppResources.UrlVersion;
-            using (var client = new HttpClient())
-            {
-                try
-                {
-                    var json = await client.GetStringAsync(uri);
-                    var versionString = JObject.Parse(json).Value<string>("version");
-
-                    if (new Version(versionString).CompareTo(new Version(AppInfo.VersionString)) > 0)
-                    {
-                        await UserDialogs.Instance.AlertAsync(AppResources.AppUtilsGetNewVersionDescription, AppResources.AppUtilsGetNewVersionTitle, Resources.AppResources.ButtonOk);
-
-                        if (Device.RuntimePlatform == Device.iOS)
-                        {
-                            await Browser.OpenAsync(AppSettings.Instance.AppStoreUrl, BrowserLaunchMode.External);
-                        }
-                        else if (Device.RuntimePlatform == Device.Android)
-                        {
-                            await Browser.OpenAsync(AppSettings.Instance.GooglePlayUrl, BrowserLaunchMode.External);
-                        }
-
-                    }
-
-                }
-                catch (Exception ex)
-                {
-                    Debug.WriteLine(ex.ToString());
-                    loggerService.Exception("Failed to check version.", ex);
-                }
-                finally
-                {
-                    loggerService.EndMethod();
-                }
-            }
-        }
     }
 }
diff --git a/Covid19Radar/Covid19Radar/Covid19Radar.csproj b/Covid19Radar/Covid19Radar/Covid19Radar.csproj
index da5ab6bd3..7d5827cff 100644
--- a/Covid19Radar/Covid19Radar/Covid19Radar.csproj
+++ b/Covid19Radar/Covid19Radar/Covid19Radar.csproj
@@ -23,7 +23,6 @@
     <Compile Remove="Controls\**" />
     <EmbeddedResource Remove="Controls\**" />
     <None Remove="Controls\**" />
-    <None Remove="Views\ExposureCheck\" />
     <None Remove="ViewModels\ExposureCheckPage\" />
   </ItemGroup>
 
@@ -87,9 +86,6 @@
     <Compile Update="Views\HomePage\PrivacyPolicyPage2.xaml.cs">
       <DependentUpon>PrivacyPolicyPage2.xaml</DependentUpon>
     </Compile>
-    <Compile Update="Views\HomePage\ThankYouNotifyOtherPage.xaml.cs">
-      <DependentUpon>ThankYouNotifyOtherPage.xaml</DependentUpon>
-    </Compile>
     <Compile Update="Views\Settings\LicenseAgreementPage.xaml.cs">
       <DependentUpon>LicenseAgreementPage.xaml</DependentUpon>
     </Compile>
@@ -149,8 +145,6 @@
     <Folder Include="Controls\" />
     <Folder Include="Services\Migration\" />
     <Folder Include="Repository\" />
-    <Folder Include="Views\ExposureCheck\" />
-    <Folder Include="ViewModels\ExposureCheck\" />
   </ItemGroup>
   <ItemGroup Condition="'$(Configuration)'=='Release'">
     <Compile Remove="ViewModels/Settings/DebugPageViewModel.cs" />
diff --git a/Covid19Radar/Covid19Radar/Model/DiagnosisSubmissionParameter.cs b/Covid19Radar/Covid19Radar/Model/DiagnosisSubmissionParameter.cs
index dfe54d395..7620979b0 100644
--- a/Covid19Radar/Covid19Radar/Model/DiagnosisSubmissionParameter.cs
+++ b/Covid19Radar/Covid19Radar/Model/DiagnosisSubmissionParameter.cs
@@ -8,7 +8,8 @@ namespace Covid19Radar.Model
 {
     public class DiagnosisSubmissionParameter
     {
-        [JsonProperty("symptomOnsetDate")]
+        //[JsonProperty("symptomOnsetDate")]
+        [JsonIgnore]
         public string SymptomOnsetDate { get; set; }
 
         [JsonProperty("keys")]
@@ -25,7 +26,8 @@ public class DiagnosisSubmissionParameter
         [JsonProperty("verificationPayload")]
         public string VerificationPayload { get; set; }
 
-        [JsonProperty("idempotency_key")]
+        //[JsonProperty("idempotency_key")]
+        [JsonIgnore]
         public string IdempotencyKey { get; set; }
 
         // Random data to obscure the size of the request network packet sniffers.
@@ -40,7 +42,9 @@ public class Key
             public uint RollingStartNumber { get; set; }
             [JsonProperty("rollingPeriod")]
             public uint RollingPeriod { get; set; }
-            [JsonProperty("reportType")]
+
+            //[JsonProperty("reportType")]
+            [JsonIgnore]
             public uint ReportType { get; set; }
         }
     }
diff --git a/Covid19Radar/Covid19Radar/Repository/ExposureRiskCalculationConfigurationRepository.cs b/Covid19Radar/Covid19Radar/Repository/ExposureRiskCalculationConfigurationRepository.cs
index ea6f24e0f..274cf03b3 100644
--- a/Covid19Radar/Covid19Radar/Repository/ExposureRiskCalculationConfigurationRepository.cs
+++ b/Covid19Radar/Covid19Radar/Repository/ExposureRiskCalculationConfigurationRepository.cs
@@ -185,7 +185,7 @@ await SaveAsync(
             }
         }
 
-        private static V1ExposureRiskCalculationConfiguration CreateDefaultConfiguration()
+        public static V1ExposureRiskCalculationConfiguration CreateDefaultConfiguration()
         {
             return new V1ExposureRiskCalculationConfiguration()
             {
diff --git a/Covid19Radar/Covid19Radar/Repository/IExposureDataRepository.cs b/Covid19Radar/Covid19Radar/Repository/IExposureDataRepository.cs
index 992492096..887c62248 100644
--- a/Covid19Radar/Covid19Radar/Repository/IExposureDataRepository.cs
+++ b/Covid19Radar/Covid19Radar/Repository/IExposureDataRepository.cs
@@ -2,10 +2,13 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Threading.Tasks;
 using Chino;
 using Covid19Radar.Model;
+using Covid19Radar.Resources;
 
 namespace Covid19Radar.Repository
 {
@@ -38,5 +41,36 @@ int minimumRiskScore
 
         void RemoveExposureInformation();
         void RemoveOutOfDateExposureInformation(int offsetDays);
+
+        public static string ConvertToDate(DateTime utcDatetime)
+            => utcDatetime.Date
+                .ToLocalTime()
+                .ToString("D", CultureInfo.CurrentCulture);
+
+        public static string ConvertToTerm(DateTime utcDatetime)
+        {
+            var from = utcDatetime.Date.ToLocalTime();
+            var to = from.AddDays(1).ToLocalTime();
+
+            bool changeMonth = from.Month != to.Month;
+            bool changeYear = from.Year != to.Year;
+
+            string fromFormat = AppResources.ExposureDateFormatMonth;
+            string toFormat = AppResources.ExposureDateFormatDate;
+            if (changeMonth)
+            {
+                toFormat = AppResources.ExposureDateFormatMonth;
+            }
+            if (changeYear)
+            {
+                fromFormat = AppResources.ExposureDateFormatYear;
+                toFormat = AppResources.ExposureDateFormatYear;
+            }
+
+            string fromStr = from.ToString(fromFormat, CultureInfo.CurrentCulture);
+            string toStr = to.ToString(toFormat, CultureInfo.CurrentCulture);
+
+            return string.Format("{0}{1} {2} {3}", AppResources.ExposuresPageFrom, fromStr, AppResources.ExposuresPageTo, toStr);
+        }
     }
 }
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs b/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs
index 55791d0ea..276e6b489 100644
--- a/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs
+++ b/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs
@@ -449,12 +449,6 @@ public static string HelpPage3Description3 {
             }
         }
         
-        public static string NotContactPageButtonText {
-            get {
-                return ResourceManager.GetString("NotContactPageButtonText", resourceCulture);
-            }
-        }
-        
         public static string LowRiskContactPageLabel {
             get {
                 return ResourceManager.GetString("LowRiskContactPageLabel", resourceCulture);
@@ -515,33 +509,21 @@ public static string LowRiskContactPageAnnotationDecription {
             }
         }
         
-        public static string NoRiskContactPageLabel {
-            get {
-                return ResourceManager.GetString("NoRiskContactPageLabel", resourceCulture);
-            }
-        }
-        
-        public static string NoRiskContactPageDescription {
-            get {
-                return ResourceManager.GetString("NoRiskContactPageDescription", resourceCulture);
-            }
-        }
-        
-        public static string NoRiskContactPageButtonText {
+        public static string LowRiskContactPageAnnotationDecription2 {
             get {
-                return ResourceManager.GetString("NoRiskContactPageButtonText", resourceCulture);
+                return ResourceManager.GetString("LowRiskContactPageAnnotationDecription2", resourceCulture);
             }
         }
         
-        public static string ThankYouNotifyOtherPageLabel1 {
+        public static string NoRiskContactPageLabel {
             get {
-                return ResourceManager.GetString("ThankYouNotifyOtherPageLabel1", resourceCulture);
+                return ResourceManager.GetString("NoRiskContactPageLabel", resourceCulture);
             }
         }
         
-        public static string ThankYouNotifyOtherPageDescription1 {
+        public static string NoRiskContactPageDescription {
             get {
-                return ResourceManager.GetString("ThankYouNotifyOtherPageDescription1", resourceCulture);
+                return ResourceManager.GetString("NoRiskContactPageDescription", resourceCulture);
             }
         }
         
@@ -1085,6 +1067,30 @@ public static string ContactedNotifyPageDescription1 {
             }
         }
         
+        public static string ContactedNotifyPageDescription2 {
+            get {
+                return ResourceManager.GetString("ContactedNotifyPageDescription2", resourceCulture);
+            }
+        }
+        
+        public static string ContactedNotifyPageDescription3 {
+            get {
+                return ResourceManager.GetString("ContactedNotifyPageDescription3", resourceCulture);
+            }
+        }
+        
+        public static string ContactedNotifyPageDescription4 {
+            get {
+                return ResourceManager.GetString("ContactedNotifyPageDescription4", resourceCulture);
+            }
+        }
+        
+        public static string ContactedNotifyPageDescription5 {
+            get {
+                return ResourceManager.GetString("ContactedNotifyPageDescription5", resourceCulture);
+            }
+        }
+        
         public static string ReAgreeCheckButton {
             get {
                 return ResourceManager.GetString("ReAgreeCheckButton", resourceCulture);
@@ -1888,5 +1894,191 @@ public static string ThresholdTextOperatorEqual {
                 return ResourceManager.GetString("ThresholdTextOperatorEqual", resourceCulture);
             }
         }
+        
+        public static string ExposuresPageToUtcDescription {
+            get {
+                return ResourceManager.GetString("ExposuresPageToUtcDescription", resourceCulture);
+            }
+        }
+        
+        public static string ExposuresPageFrom {
+            get {
+                return ResourceManager.GetString("ExposuresPageFrom", resourceCulture);
+            }
+        }
+        
+        public static string ExposuresPageTo {
+            get {
+                return ResourceManager.GetString("ExposuresPageTo", resourceCulture);
+            }
+        }
+        
+        public static string ExposureDateFormatDate {
+            get {
+                return ResourceManager.GetString("ExposureDateFormatDate", resourceCulture);
+            }
+        }
+        
+        public static string ExposureDateFormatMonth {
+            get {
+                return ResourceManager.GetString("ExposureDateFormatMonth", resourceCulture);
+            }
+        }
+        
+        public static string ExposureDateFormatYear {
+            get {
+                return ResourceManager.GetString("ExposureDateFormatYear", resourceCulture);
+            }
+        }
+        
+        public static string OpenSourceLicense {
+            get {
+                return ResourceManager.GetString("OpenSourceLicense", resourceCulture);
+            }
+        }
+        
+        public static string OpenSourceLicense_Description1 {
+            get {
+                return ResourceManager.GetString("OpenSourceLicense_Description1", resourceCulture);
+            }
+        }
+        
+        public static string OpenSourceLicense_Description2 {
+            get {
+                return ResourceManager.GetString("OpenSourceLicense_Description2", resourceCulture);
+            }
+        }
+        
+        public static string UrlGitHubRepository {
+            get {
+                return ResourceManager.GetString("UrlGitHubRepository", resourceCulture);
+            }
+        }
+        
+        public static string OpenSourceLicense_GetSourceCode {
+            get {
+                return ResourceManager.GetString("OpenSourceLicense_GetSourceCode", resourceCulture);
+            }
+        }
+        
+        public static string InqueryBeta {
+            get {
+                return ResourceManager.GetString("InqueryBeta", resourceCulture);
+            }
+        }
+        
+        public static string InqueryBeta_Description1 {
+            get {
+                return ResourceManager.GetString("InqueryBeta_Description1", resourceCulture);
+            }
+        }
+        
+        public static string InqueryBeta_Description2 {
+            get {
+                return ResourceManager.GetString("InqueryBeta_Description2", resourceCulture);
+            }
+        }
+        
+        public static string InqueryBeta_InstallStable {
+            get {
+                return ResourceManager.GetString("InqueryBeta_InstallStable", resourceCulture);
+            }
+        }
+        
+        public static string InqueryBeta_DeveloperCommunity {
+            get {
+                return ResourceManager.GetString("InqueryBeta_DeveloperCommunity", resourceCulture);
+            }
+        }
+        
+        public static string InqueryBeta_Community_Description1 {
+            get {
+                return ResourceManager.GetString("InqueryBeta_Community_Description1", resourceCulture);
+            }
+        }
+        
+        public static string InqueryBeta_Community_Description2 {
+            get {
+                return ResourceManager.GetString("InqueryBeta_Community_Description2", resourceCulture);
+            }
+        }
+        
+        public static string InqueryBetaViaGitHub {
+            get {
+                return ResourceManager.GetString("InqueryBetaViaGitHub", resourceCulture);
+            }
+        }
+        
+        public static string InqueryBeta_Community_Description3 {
+            get {
+                return ResourceManager.GetString("InqueryBeta_Community_Description3", resourceCulture);
+            }
+        }
+        
+        public static string InqueryBeta_Community_Description4 {
+            get {
+                return ResourceManager.GetString("InqueryBeta_Community_Description4", resourceCulture);
+            }
+        }
+        
+        public static string InqueryBetaShareLog {
+            get {
+                return ResourceManager.GetString("InqueryBetaShareLog", resourceCulture);
+            }
+        }
+        
+        public static string Beta_Splash_WelcomeBeta {
+            get {
+                return ResourceManager.GetString("Beta_Splash_WelcomeBeta", resourceCulture);
+            }
+        }
+        
+        public static string Beta_Splash_Description1 {
+            get {
+                return ResourceManager.GetString("Beta_Splash_Description1", resourceCulture);
+            }
+        }
+        
+        public static string Beta_Splash_Description2 {
+            get {
+                return ResourceManager.GetString("Beta_Splash_Description2", resourceCulture);
+            }
+        }
+        
+        public static string Beta_Splash_Description3 {
+            get {
+                return ResourceManager.GetString("Beta_Splash_Description3", resourceCulture);
+            }
+        }
+        
+        public static string Beta_Splash_GitHub {
+            get {
+                return ResourceManager.GetString("Beta_Splash_GitHub", resourceCulture);
+            }
+        }
+        
+        public static string Beta_Splash_GitHubAccountRequired {
+            get {
+                return ResourceManager.GetString("Beta_Splash_GitHubAccountRequired", resourceCulture);
+            }
+        }
+        
+        public static string Beta_Splash_Acknowledge {
+            get {
+                return ResourceManager.GetString("Beta_Splash_Acknowledge", resourceCulture);
+            }
+        }
+        
+        public static string Beta_Splash_InstallStable {
+            get {
+                return ResourceManager.GetString("Beta_Splash_InstallStable", resourceCulture);
+            }
+        }
+        
+        public static string NotMedicalExpenses {
+            get {
+                return ResourceManager.GetString("NotMedicalExpenses", resourceCulture);
+            }
+        }
     }
 }
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
index 39f07cefe..bef00d3eb 100644
--- a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
+++ b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
@@ -246,21 +246,17 @@
     <value>接触の記録を削除してアプリを初期状態に戻すには</value>
     <comment>接触の記録を削除してアプリを初期状態に戻すには</comment>
   </data>
-  <data name="NotContactPageButtonText" xml:space="preserve">
-    <value>アプリを周りの人に知らせる</value>
-    <comment>アプリを周りの人に知らせる</comment>
-  </data>
   <data name="LowRiskContactPageLabel" xml:space="preserve">
     <value>陽性登録者のスマートフォンから受信した信号は基準値を下回っていました</value>
     <comment>陽性登録者のスマートフォンから受信した信号は基準値を下回っていました</comment>
   </data>
   <data name="LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Satisfied" xml:space="preserve">
-    <value>スコア: {0:#.##}</value>
-    <comment>スコア: {0:#.##}</comment>
+    <value>スコア {0:#}</value>
+    <comment>スコア {0:#}</comment>
   </data>
   <data name="LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Unsatisfied" xml:space="preserve">
-    <value>スコア: {0:#.##}</value>
-    <comment>スコア: {0:#.##}</comment>
+    <value>スコア {0:#}</value>
+    <comment>スコア {0:#}</comment>
   </data>
   <data name="LowRiskContactPage_ExposureDuration_Description_Satisfied" xml:space="preserve">
     <value>{0:#}分間の接触</value>
@@ -279,7 +275,10 @@
     <comment>分</comment>
   </data>
   <data name="LowRiskContactPageDescription" xml:space="preserve">
-    <value>陽性登録者のスマートフォンの信号を受信しましたが、基準値を超える信号はありません。行動圏内には陽性登録者がいましたので、引き続き感染予防に留意しながらお過ごし下さい。</value>
+    <value>過去14日間の陽性登録者との接触状況をスコアとして表示しています。
+ご自身の行動とスコアを照らし合わせることにより、行動圏内における日々の感染状況の変化を把握するためにご活用ください。
+なお、基準値を下回っているため、陽性登録者との濃厚接触の可能性は低いですが、咳や発熱等の症状が現れた場合は、医療機関等にご相談ください。
+    </value>
     <comment>陽性登録者のスマートフォンの信号を受信しましたが、基準値を超える信号はありません。行動圏内には陽性登録者がいましたので、引き続き感染予防に留意しながらお過ごし下さい。</comment>
   </data>
   <data name="LowRiskContactPageHeaderTextPrefix" xml:space="preserve">
@@ -287,8 +286,12 @@
     <comment>受信した信号</comment>
   </data>
   <data name="LowRiskContactPageAnnotationDecription" xml:space="preserve">
-    <value>※スコアは、受信した信号の強さと時間から算出しています。一般的な条件では1m以内・15分以上の接触で {0:#} {1:#}になるように設定しています。</value>
-    <comment>※スコアは、受信した信号の強さと時間から算出しています。一般的な条件では1m以内・15分以上の接触で {0:#} {1:#}になるように設定しています。</comment>
+    <value>スコアは、受信した信号の強さと時間から算出しています。一般的な条件では1m以内・15分以上の接触で100以上になるように設定しています。</value>
+    <comment>スコアは、受信した信号の強さと時間から算出しています。一般的な条件では1m以内・15分以上の接触で100以上になるように設定しています。</comment>
+  </data>
+  <data name="LowRiskContactPageAnnotationDecription2" xml:space="preserve">
+    <value>※日時については、協定世界時（UTC）を設定されているタイムゾーンに変換して、期間として表示しています。</value>
+    <comment>※日時については、協定世界時（UTC）をを設定されているタイムゾーンに変換して、期間として表示しています。</comment>
   </data>
   <data name="NoRiskContactPageLabel" xml:space="preserve">
     <value>陽性登録者のスマートフォンからの信号を受信していません</value>
@@ -298,18 +301,6 @@
     <value>行動圏内には、陽性登録者はいなかったようです。引き続き感染予防に留意しながらお過ごしください。</value>
     <comment>行動圏内には、陽性登録者はいなかったようです。引き続き感染予防に留意しながらお過ごしください。</comment>
   </data>
-  <data name="NoRiskContactPageButtonText" xml:space="preserve">
-    <value>アプリを周りの人に知らせる</value>
-    <comment>アプリを周りの人に知らせる</comment>
-  </data>
-  <data name="ThankYouNotifyOtherPageLabel1" xml:space="preserve">
-    <value>陽性のご登録をいただきありがとうございました</value>
-    <comment>陽性のご登録をいただきありがとうございました</comment>
-  </data>
-  <data name="ThankYouNotifyOtherPageDescription1" xml:space="preserve">
-    <value>登録は匿名で行われ、氏名や連絡先など個人が特定される情報を登録する必要はありません。また、接触した場所の位置情報が記録や通知されることもありません。</value>
-    <comment>登録は匿名で行われ、氏名や連絡先など個人が特定される情報を登録する必要はありません。また、接触した場所の位置情報が記録や通知されることもありません。</comment>
-  </data>
   <data name="TutorialPage3Title" xml:space="preserve">
     <value>利用規約</value>
     <comment>利用規約</comment>
@@ -335,12 +326,12 @@
     <comment>端末の識別</comment>
   </data>
   <data name="ContactedNotifyPageButton1" xml:space="preserve">
-    <value>陽性者との接触一覧</value>
-    <comment>陽性者との接触一覧</comment>
+    <value>陽性登録者との接触一覧</value>
+    <comment>陽性登録者との接触一覧</comment>
   </data>
   <data name="ContactedNotifyPageMainText" xml:space="preserve">
-    <value>陽性者との接触確認</value>
-    <comment>陽性者との接触確認</comment>
+    <value>陽性登録者との接触確認</value>
+    <comment>陽性登録者との接触確認</comment>
   </data>
   <data name="ContactedNotifyPageTitle" xml:space="preserve">
     <value>過去14日間の接触</value>
@@ -355,7 +346,7 @@
     <comment>お問い合わせ（メニュー）</comment>
   </data>
   <data name="HomePageDescription2" xml:space="preserve">
-    <value>陽性者との接触結果を確認</value>
+    <value>陽性登録者との接触結果を確認</value>
     <comment>陽性者との接触結果を確認</comment>
   </data>
   <data name="HomePageDescription3" xml:space="preserve">
@@ -371,8 +362,8 @@
     <comment>アプリを周りの人に知らせる</comment>
   </data>
   <data name="ExposureCheckTitle" xml:space="preserve">
-    <value>基準値を超える信号はありません</value>
-    <comment>基準値を超える信号はありません</comment>
+    <value>過去14日間の接触</value>
+    <comment>過去14日間の接触</comment>
   </data>
   <data name="HomePageTitle1" xml:space="preserve">
     <value>ホーム</value>
@@ -547,8 +538,8 @@
     <comment>過去14日間の接触一覧</comment>
   </data>
   <data name="ExposuresPageLabel1" xml:space="preserve">
-    <value>以下の日に陽性者との接触が確認されました。</value>
-    <comment>以下の日に陽性者との接触が確認されました。</comment>
+    <value>次の期間に陽性登録者との接触が確認されました。</value>
+    <comment>次の期間に陽性登録者との接触が確認されました。</comment>
   </data>
   <data name="UrlContactedPhone" xml:space="preserve">
     <value>https://covid19radarjpnprod.z11.web.core.windows.net/phone.json</value>
@@ -675,10 +666,27 @@
     <comment>検査等の相談先を探す</comment>
   </data>
   <data name="ContactedNotifyPageDescription1" xml:space="preserve">
-    <value>・発熱等の症状や基礎疾患がある、新型コロナウイルス感染症の陽性者と接触した心当たりがあるなど、検査等の相談を希望される場合は、アプリの案内に従って相談先をご確認ください。
-・受診の際に必要となる場合があるため、以下より陽性者との接触一覧のスクリーンショット（※）を保存してください。</value>
-    <comment>・発熱等の症状や基礎疾患がある、新型コロナウイルス感染症の陽性者と接触した心当たりがあるなど、検査等の相談を希望される場合は、アプリの案内に従って相談先をご確認ください。
-・受診の際に必要となる場合があるため、以下より陽性者との接触一覧のスクリーンショット（※）を保存してください。</comment>
+    <value>症状がない場合、
+陽性者と接触した心当たりがない場合は、
+感染対策に留意しつつ普段通りの生活をお送りください。
+ただし、体調に変化があった場合は、受診を検討ください。</value>
+    <comment>症状がない場合、陽性者と接触した心当たりがない場合は、感染対策に留意しつつ普段通りの生活をお送りください。ただし、体調に変化があった場合は、受診を検討ください。</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription2" xml:space="preserve">
+    <value>次のいずれかに当てはまる方は、アプリの案内に従い、診療・検査医療機関等への受診を検討ください。</value>
+    <comment>次のいずれかに当てはまる方は、アプリの案内に従い、診療・検査医療機関等への受診を検討ください。</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription3" xml:space="preserve">
+    <value>・発熱等の症状や基礎疾患がある</value>
+    <comment>・発熱等の症状や基礎疾患がある</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription4" xml:space="preserve">
+    <value>・陽性者と接触した心当たりがある</value>
+    <comment>・陽性者と接触した心当たりがある</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription5" xml:space="preserve">
+    <value>・その他、受診を希望する</value>
+    <comment>・その他、受診を希望する</comment>
   </data>
   <data name="ReAgreeCheckButton" xml:space="preserve">
     <value>確認しました</value>
@@ -1230,4 +1238,134 @@
     <comment>と同じ</comment>
   </data>
 
+  <data name="ExposuresPageToUtcDescription" xml:space="preserve">
+    <value>日時については、協定世界時（UTC）を設定されているタイムゾーンに変換して、期間として表示しています。</value>
+    <comment>日時については、協定世界時（UTC）をを設定されているタイムゾーンに変換して、期間として表示しています。</comment>
+  </data>
+  <data name="ExposuresPageFrom" xml:space="preserve">
+    <value></value>
+    <comment> </comment>
+  </data>
+  <data name="ExposuresPageTo" xml:space="preserve">
+    <value>から</value>
+    <comment>から</comment>
+  </data>
+  <data name="ExposureDateFormatDate" xml:space="preserve">
+    <value>d日 tth時mm分</value>
+    <comment>d日 tth時mm分</comment>
+  </data>
+  <data name="ExposureDateFormatMonth" xml:space="preserve">
+    <value>M月d日 tth時mm分</value>
+    <comment>M月d日 tth時mm分</comment>
+  </data>
+  <data name="ExposureDateFormatYear" xml:space="preserve">
+    <value>yyyy年M月d日 tth時mm分</value>
+    <comment>yyyy年M月d日 tth時mm分</comment>
+  </data>
+
+  <data name="OpenSourceLicense" xml:space="preserve">
+    <value>オープンソースライセンス</value>
+    <comment>オープンソースライセンス</comment>
+  </data>
+  <data name="OpenSourceLicense_Description1" xml:space="preserve">
+    <value>COCOAはオープンソースソフトウェアです。Mozilla Public License 2.0 の条項下で提供されています。</value>
+    <comment>COCOAはオープンソースソフトウェアです。Mozilla Public License 2.0 の条項下で提供されています。</comment>
+  </data>
+  <data name="OpenSourceLicense_Description2" xml:space="preserve">
+    <value>COCOAのソースコードは次のURLから入手できます。</value>
+    <comment>COCOAのソースコードは次のURLから入手できます。</comment>
+  </data>
+  <data name="UrlGitHubRepository" xml:space="preserve">
+    <value>https://github.com/cocoa-mhlw/cocoa/</value>
+    <comment>https://github.com/cocoa-mhlw/cocoa/</comment>
+  </data>
+  <data name="OpenSourceLicense_GetSourceCode" xml:space="preserve">
+    <value>ソースコードを入手</value>
+    <comment>ソースコードを入手</comment>
+  </data>
+
+  <data name="InqueryBeta" xml:space="preserve">
+    <value>COCOA(Beta)</value>
+    <comment>COCOA(Beta)</comment>
+  </data>
+  <data name="InqueryBeta_Description1" xml:space="preserve">
+    <value>COCOA(Beta)は新しい機能をテストするための実験的なバージョンです。</value>
+    <comment>COCOA(Beta)は新しい機能をテストするための実験的なバージョンです。</comment>
+  </data>
+  <data name="InqueryBeta_Description2" xml:space="preserve">
+    <value>COCOA(Beta)は安定版ではないため、現時点ではメールや電話でのサポートは行っていません。通常のサポートをご希望の方は安定版をお使いください。</value>
+    <comment>COCOA(Beta)は安定版ではないため、現時点ではメールや電話でのサポートは行っていません。通常のサポートをご希望の方は安定版をお使いください。</comment>
+  </data>
+    <data name="InqueryBeta_InstallStable" xml:space="preserve">
+    <value>安定版をインストール</value>
+    <comment>安定版をインストール</comment>
+  </data>
+
+  <data name="InqueryBeta" xml:space="preserve">
+    <value>COCOA(Beta)</value>
+    <comment>COCOA(Beta)</comment>
+  </data>
+  <data name="InqueryBeta_DeveloperCommunity" xml:space="preserve">
+    <value>開発コミュニティ</value>
+    <comment>開発コミュニティ</comment>
+  </data>
+  <data name="InqueryBeta_Community_Description1" xml:space="preserve">
+    <value>COCOAはオープンソースソフトウェアです。Mozilla Public License 2.0 の条項下で提供されています。</value>
+    <comment>COCOAはオープンソースソフトウェアです。Mozilla Public License 2.0 の条項下で提供されています。</comment>
+  </data>
+  <data name="InqueryBeta_Community_Description2" xml:space="preserve">
+    <value>なにか問題がありましたら、開発コミュニティまでお知らせください（GitHubのアカウントが必要です）。</value>
+    <comment>なにか問題がありましたら、開発コミュニティまでお知らせください（GitHubのアカウントが必要です）。</comment>
+  </data>
+  <data name="InqueryBetaViaGitHub" xml:space="preserve">
+    <value>開発コミュニティを開く</value>
+    <comment>開発コミュニティを開く</comment>
+  </data>
+  <data name="InqueryBeta_Community_Description3" xml:space="preserve">
+    <value>※ 不具合等の原因究明のために動作ログの共有をお願いする場合があります。下のボタンから動作ログを取得・保存してください。</value>
+    <comment>※ 不具合等の原因究明のために動作ログの共有をお願いする場合があります。下のボタンから動作ログを取得・保存してください。</comment>
+  </data>
+    <data name="InqueryBeta_Community_Description4" xml:space="preserve">
+    <value>ご協力ありがとうございます！</value>
+    <comment>ご協力ありがとうございます！</comment>
+  </data>
+
+  <data name="Beta_Splash_WelcomeBeta" xml:space="preserve">
+    <value>COCOA(Beta)へようこそ！</value>
+    <comment>COCOA(Beta)へようこそ！</comment>
+  </data>
+  <data name="Beta_Splash_Description1" xml:space="preserve">
+    <value>COCOA(Beta)は、新しい機能をテストするための実験的なバージョンです。</value>
+    <comment>COCOA(Beta)は、新しい機能をテストするための実験的なバージョンです。</comment>
+  </data>
+  <data name="Beta_Splash_Description2" xml:space="preserve">
+    <value>COCOA(Beta)は安定版ではありません。Beta版の実験機能をはじめ、COCOAの基本機能（陽性情報登録、接触確認機能）についても、正しく動作しない可能性があることをご了承ください。</value>
+    <comment>COCOA(Beta)は安定版ではありません。Beta版の実験機能をはじめ、COCOAの基本機能（陽性情報登録、接触確認機能）についても、正しく動作しない可能性があることをご了承ください。</comment>
+  </data>
+  <data name="Beta_Splash_Description3" xml:space="preserve">
+    <value>COCOA(Beta)では、現時点では通常のサポートは行っていません。なにか問題がありましたら開発コミュニティまでお知らせください。</value>
+    <comment>COCOA(Beta)では、現時点では通常のサポートは行っていません。なにか問題がありましたら開発コミュニティまでお知らせください。</comment>
+  </data>
+  <data name="Beta_Splash_GitHub" xml:space="preserve">
+    <value>開発コミュニティ</value>
+    <comment>開発コミュニティ</comment>
+  </data>
+  <data name="Beta_Splash_GitHubAccountRequired" xml:space="preserve">
+    <value>（GitHubのアカウントが必要です）</value>
+    <comment>（GitHubのアカウントが必要です）</comment>
+  </data>
+  <data name="Beta_Splash_Acknowledge" xml:space="preserve">
+    <value>確認して利用する</value>
+    <comment>確認して利用する</comment>
+  </data>
+  <data name="Beta_Splash_InstallStable" xml:space="preserve">
+    <value>安定版をインストール</value>
+    <comment>安定版をインストール</comment>
+  </data>
+
+  <data name="NotMedicalExpenses" xml:space="preserve">
+    <value>COCOA(Beta)は安定版ではありません。このバージョンから接触通知を受け取ったことによる検査費用は無料（公費負担）にはなりません。</value>
+    <comment>COCOA(Beta)は安定版ではありません。このバージョンから接触通知を受け取ったことによる検査費用は無料（公費負担）にはなりません。</comment>
+  </data>
+
 </root>
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.resx
index c78632564..b6f9e4adb 100644
--- a/Covid19Radar/Covid19Radar/Resources/AppResources.resx
+++ b/Covid19Radar/Covid19Radar/Resources/AppResources.resx
@@ -376,10 +376,6 @@
     <value>Register by entering provided processing number into this app</value>
     <comment>本アプリを用いて処理番号の登録を行います。</comment>
   </data>
-  <data name="NotContactPageButtonText" xml:space="preserve">
-    <value>Share this app</value>
-    <comment>アプリを周りの人に知らせる</comment>
-  </data>
   <data name="LowRiskContactPageLabel" xml:space="preserve">
     <value>The signal received from the smartphone of the person who has registered as positive for COVID-19 was below the standard value</value>
     <comment>陽性登録者のスマートフォンから受信した信号は基準値を下回っていました</comment>
@@ -401,12 +397,12 @@
     <comment>受信した信号</comment>
   </data>
   <data name="LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Satisfied" xml:space="preserve">
-    <value>Score: {0:#.##}</value>
-    <comment>スコア: {0:#.##}</comment>
+    <value>Score {0:#}</value>
+    <comment>スコア {0:#}</comment>
   </data>
   <data name="LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Unsatisfied" xml:space="preserve">
-    <value>Score: {0:#.##}</value>
-    <comment>スコア: {0:#.##}</comment>
+    <value>Score {0:#}</value>
+    <comment>スコア {0:#}</comment>
   </data>
   <data name="LowRiskContactPage_ExposureDuration_Description_Satisfied" xml:space="preserve">
     <value>{0:#} minutes of contact</value>
@@ -417,8 +413,12 @@
     <comment>{0:#}分間の接触のため通知の対象外</comment>
   </data>
   <data name="LowRiskContactPageAnnotationDecription" xml:space="preserve">
-    <value>*The score is calculated based on the strength and time of the received signal. It is set to be {0:#} {1:#} with contact within 1 m for 15 minutes or more under regular conditions.</value>
-    <comment>※スコアは、受信した信号の強さと時間から算出しています。1m以内・15分以上の接触で {0:#} {1:#}になるように設定しています。</comment>
+    <value>*The score is calculated based on the strength and time of the received signal. It is set to be 100 or more with contact within 1 m for 15 minutes or more under regular conditions.</value>
+    <comment>※スコアは、受信した信号の強さと時間から算出しています。1m以内・15分以上の接触で100以上になるように設定しています。</comment>
+  </data>
+  <data name="LowRiskContactPageAnnotationDecription2" xml:space="preserve">
+    <value>* For the date and time, the Coordinated Universal Time (UTC) is converted to the set time zone of the device and displayed.​</value>
+    <comment>※日時については、協定世界時（UTC）をを設定されているタイムゾーンに変換して、期間として表示しています。</comment>
   </data>
   <data name="NoRiskContactPageLabel" xml:space="preserve">
     <value>No signal has being received from the smartphone of a person who has registered positive for COVID-19 </value>
@@ -428,18 +428,6 @@
     <value>It appears there have been no persons who have registered positive for COVID-19 within your sphere of activities. Please continue to pay attention to preventing COVID-19 infections.</value>
     <comment>行動圏内には、陽性登録者はいなかったようです。引き続き感染予防に留意しながらお過ごしください。</comment>
   </data>
-  <data name="NoRiskContactPageButtonText" xml:space="preserve">
-    <value>Share this app</value>
-    <comment>アプリを周りの人に知らせる</comment>
-  </data>
-  <data name="ThankYouNotifyOtherPageLabel1" xml:space="preserve">
-    <value>Thank you for registering your test results!</value>
-    <comment>陽性のご登録をいただきありがとうございました</comment>
-  </data>
-  <data name="ThankYouNotifyOtherPageDescription1" xml:space="preserve">
-    <value>Registration is anonymous. You do not have to enter your name or any other personal information. No information regarding location of close contact is recorded.</value>
-    <comment>登録は匿名で行われ、氏名や連絡先など個人が特定される情報を登録する必要はありません。また、接触した場所の位置情報が記録や通知されることもありません。</comment>
-  </data>
   <data name="TutorialPage3Title" xml:space="preserve">
     <value>Terms of use</value>
     <comment>利用規約</comment>
@@ -501,8 +489,8 @@
     <comment>アプリを周りの人に知らせる</comment>
   </data>
   <data name="ExposureCheckTitle" xml:space="preserve">
-    <value>There is no signal exceeding the standard value</value>
-    <comment>基準値を超える信号はありません</comment>
+    <value>Close contacts for the past 14 days</value>
+    <comment>過去14日間の接触</comment>
   </data>
   <data name="HomePageTitle1" xml:space="preserve">
     <value>Home</value>
@@ -793,11 +781,25 @@
     <comment>検査等の相談先を探す</comment>
   </data>
   <data name="ContactedNotifyPageDescription1" xml:space="preserve">
-    <value>・If you have any symptoms such as fever, pre-existing conditions, or if you have been in contact with a person that has been tested positive for COVID-19, 
-please follow the app. guidance and check the Consultation Centers List to receive a consultation.
-・Please take a screenshot of the Close Contacts List below, as it may be necessary during the medical examination</value>
-    <comment>・発熱等の症状や基礎疾患がある、新型コロナウイルス感染症の陽性者と接触した心当たりがあるなど、検査等の相談を希望される場合は、アプリの案内に従って相談先をご確認ください。
-・受診の際に必要となる場合があるため、以下より陽性者との接触一覧のスクリーンショットを保存してください。</comment>
+    <value>In case you have no symptoms, or you had no contact with a positive person, please lead a normal life while paying attention to infection prevention measures.​
+However, if your physical condition changes, please consider consulting a doctor.​</value>
+    <comment>症状がない場合、陽性者と接触した心当たりがない場合は、感染対策に留意しつつ普段通りの生活をお送りください。ただし、体調に変化があった場合は、受診を検討ください。</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription2" xml:space="preserve">
+    <value>If you fall under any of the below cases, please consider going to a clinic / examination medical institution, etc. according to the guidance of the app.</value>
+    <comment>次のいずれかに当てはまる方は、アプリの案内に従って相談先をご確認ください。</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription3" xml:space="preserve">
+    <value>・Symptoms such as fever and underlying illness​</value>
+    <comment>・発熱等の症状や基礎疾患がある</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription4" xml:space="preserve">
+    <value>・Chance of close contact with a positive person​</value>
+    <comment>・陽性者と接触した心当たりがある</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription5" xml:space="preserve">
+    <value>・Others such as necessity of consult a doctor​</value>
+    <comment>・その他、受診を希望する</comment>
   </data>
   <data name="ReAgreeCheckButton" xml:space="preserve">
     <value>Agree</value>
@@ -1341,4 +1343,138 @@ Note: this app does not collect users’ location information.</value>
     <comment>と同じ</comment>
   </data>
 
+  <data name="ExposuresPageToUtcDescription" xml:space="preserve">
+    <value>* For the date and time, the Coordinated Universal Time (UTC) is converted to the set time zone of the device and displayed.​</value>
+    <comment>日時については、協定世界時（UTC）をを設定されているタイムゾーンに変換して、期間として表示しています。</comment>
+  </data>
+  <data name="ExposuresPageFrom" xml:space="preserve">
+    <value>From </value>
+    <comment> </comment>
+  </data>
+  <data name="ExposuresPageTo" xml:space="preserve">
+    <value>to</value>
+    <comment>から</comment>
+  </data>
+  <data name="ExposureDateFormatDate" xml:space="preserve">
+    <value>d h:mm tt</value>
+    <comment>d日 tth時mm分</comment>
+  </data>
+  <data name="ExposureDateFormatMonth" xml:space="preserve">
+    <value>d MMM h:mm tt</value>
+    <comment>M月d日 tth時mm分</comment>
+  </data>
+  <data name="ExposureDateFormatYear" xml:space="preserve">
+    <value>d MMM, yyyy h:mm tt</value>
+    <comment>yyyy年M月d日 tth時mm分</comment>
+  </data>
+
+  <data name="OpenSourceLicense" xml:space="preserve">
+    <value>Open Source License</value>
+    <comment>オープンソースライセンス</comment>
+  </data>
+  <data name="OpenSourceLicense_Description1" xml:space="preserve">
+    <value>COCOA is open source software, made available to you under the Mozilla Public License 2.0 (MPL).</value>
+    <comment>COCOAはオープンソースソフトウェアです。Mozilla Public License 2.0 の条項下で提供されています。</comment>
+  </data>
+  <data name="OpenSourceLicense_Description2" xml:space="preserve">
+    <value>The source code can download from the following URL.</value>
+    <comment>COCOAのソースコードは次のURLから入手できます。</comment>
+  </data>
+  <data name="UrlGitHubRepository" xml:space="preserve">
+    <value>https://github.com/cocoa-mhlw/cocoa/</value>
+    <comment>https://github.com/cocoa-mhlw/cocoa/</comment>
+  </data>
+  <data name="OpenSourceLicense_GetSourceCode" xml:space="preserve">
+    <value>Get source code</value>
+    <comment>ソースコードを入手</comment>
+  </data>
+
+  <data name="InqueryBeta" xml:space="preserve">
+    <value>COCOA(Beta)</value>
+    <comment>COCOA(Beta)</comment>
+  </data>
+  <data name="InqueryBeta_Description1" xml:space="preserve">
+    <value>COCOA(Beta) is the experimental version of COCOA, that is COCOA open source project uses to test out new features before it adds them to the stable release.</value>
+    <comment>COCOA(Beta)は新しい機能をテストするための実験的なバージョンです。</comment>
+  </data>
+  <data name="InqueryBeta_Description2" xml:space="preserve">
+    <value>We do not provide support by e-mail or phone at this time. If you would like regular support, please use the stable version.</value>
+    <comment>COCOA(Beta)は安定版ではないため、現時点ではメールや電話でのサポートは行っていません。通常サポートをご希望の方は安定版をお使いください。</comment>
+  </data>
+    <data name="InqueryBeta_InstallStable" xml:space="preserve">
+    <value>Install stable version</value>
+    <comment>安定版をインストール</comment>
+  </data>
+
+  <data name="InqueryBeta_DeveloperCommunity" xml:space="preserve">
+    <value>Community</value>
+    <comment>開発コミュニティ</comment>
+  </data>
+  <data name="InqueryBeta_Community_Description1" xml:space="preserve">
+    <value>COCOA is open source software, made available to you under the Mozilla Public License 2.0 (MPL).</value>
+    <comment>COCOAはオープンソースソフトウェアです。Mozilla Public License 2.0 の条項下で提供されています。</comment>
+  </data>
+  <data name="InqueryBeta_Community_Description2" xml:space="preserve">
+    <value>If you have any problems, please let the community know (GitHub account is required).</value>
+    <comment>なにか問題があれば、開発コミュニティまでお知らせください（GitHubのアカウントが必要です）。</comment>
+  </data>
+  <data name="InqueryBetaViaGitHub" xml:space="preserve">
+    <value>Community</value>
+    <comment>開発コミュニティを開く</comment>
+  </data>
+  <data name="InqueryBeta_Community_Description3" xml:space="preserve">
+    <value> * The community may ask you to share the operation log in order to investigate the cause of problems. If an error occurs, please get and save the logs.</value>
+    <comment>※ 不具合等の原因究明のために動作ログの共有を求める場合があります。下のボタンから動作ログを取得・保存してください。</comment>
+  </data>
+  <data name="InqueryBeta_Community_Description4" xml:space="preserve">
+    <value>Thank you for your cooperation!</value>
+    <comment>ご協力ありがとうございます！</comment>
+  </data>
+  <data name="InqueryBetaViaGitHub" xml:space="preserve">
+    <value>Open GitHub</value>
+    <comment>GitHubを開く</comment>
+  </data>
+  <data name="InqueryBetaShareLog" xml:space="preserve">
+    <value>動作ログを取得</value>
+    <comment>動作ログを取得</comment>
+  </data>
+
+  <data name="Beta_Splash_WelcomeBeta" xml:space="preserve">
+    <value>Welcome COCOA(Beta)!!</value>
+    <comment>COCOA(Beta)へようこそ！</comment>
+  </data>
+  <data name="Beta_Splash_Description1" xml:space="preserve">
+    <value>COCOA(Beta) is the experimental version of COCOA, that is COCOA open source project uses to test out new features before it adds them to the stable release.</value>
+    <comment>COCOA(Beta)は、新しい機能をテストするための実験的なバージョンです。</comment>
+  </data>
+  <data name="Beta_Splash_Description2" xml:space="preserve">
+    <value>COCOA(Beta) is not a stable version. Please understand that there is a possibility that not only the experimental functions but also the basic functions of COCOA (Diagnosis submission and exposure detection) may not work properly.</value>
+    <comment>COCOA(Beta)は安定版ではありません。実験的な機能をはじめ、COCOAの基本機能（陽性情報登録、接触確認機能）についても、正しく動作しない可能性があることをご理解ください。</comment>
+  </data>
+  <data name="Beta_Splash_Description3" xml:space="preserve">
+    <value>We do not provide support by e-mail or phone at this time. If you have any problems, please let the community know.</value>
+    <comment>COCOA(Beta)では通常のサポートは行っていません。何か問題等ありましたら開発コミュニティまでお知らせください。</comment>
+  </data>
+  <data name="Beta_Splash_GitHub" xml:space="preserve">
+    <value>Community</value>
+    <comment>開発コミュニティ</comment>
+  </data>
+  <data name="Beta_Splash_GitHubAccountRequired" xml:space="preserve">
+    <value>(GitHub account is required)</value>
+    <comment>（GitHubのアカウントが必要です）</comment>
+  </data>
+  <data name="Beta_Splash_Acknowledge" xml:space="preserve">
+    <value>Use COCOA(Beta)</value>
+    <comment>COCOA(Beta)を利用する</comment>
+  </data>
+  <data name="Beta_Splash_InstallStable" xml:space="preserve">
+    <value>Use Stable veriosn</value>
+    <comment>安定版をインストール</comment>
+  </data>
+
+  <data name="NotMedicalExpenses" xml:space="preserve">
+    <value>If you receive the contact notification from this version, public funds will not cover the cost of the testing due.</value>
+    <comment>COCOA(Beta)は安定版ではありません。このバージョンから接触通知を受け取ったことによる検査費用は無料（公費負担）にはなりません。</comment>
+  </data>
+
 </root>
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
index 046a167a7..fe150b86d 100644
--- a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
+++ b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
@@ -268,21 +268,17 @@
     <value>删除接触记录并将应用恢复到初始状态</value>
     <comment>接触の記録を削除してアプリを初期状態に戻すには</comment>
   </data>
-  <data name="NotContactPageButtonText" xml:space="preserve">
-    <value>分享此APP</value>
-    <comment>アプリを周りの人に知らせる</comment>
-  </data>
   <data name="LowRiskContactPageLabel" xml:space="preserve">
     <value>来自阳性登记者所持智能手机的信号低于基准值</value>
     <comment>陽性登録者のスマートフォンから受信した信号は基準値を下回っていました</comment>
   </data>
   <data name="LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Satisfied" xml:space="preserve">
-    <value>分数: {0:#.##}</value>
-    <comment>スコア: {0:#.##}</comment>
+    <value>分数 {0:#}</value>
+    <comment>スコア {0:#}</comment>
   </data>
   <data name="LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Unsatisfied" xml:space="preserve">
-    <value>分数: {0:#.##}</value>
-    <comment>スコア: {0:#.##}</comment>
+    <value>分数 {0:#}</value>
+    <comment>スコア {0:#}</comment>
   </data>
   <data name="LowRiskContactPage_ExposureDuration_Description_Satisfied" xml:space="preserve">
     <value>接触时间为{0:#}分钟</value>
@@ -309,8 +305,12 @@
     <comment>受信した信号</comment>
   </data>
   <data name="LowRiskContactPageAnnotationDecription" xml:space="preserve">
-    <value>※总和是根据所收到的信号的强度和时间计算的。一般条件下，1米以内、15分钟以上的接触设定为{0:#}{1:#}。</value>
-    <comment>※スコアは、受信した信号の強さと時間から算出しています。一般的な条件では1m以内・15分以上の接触で {0:#} {1:#}になるように設定しています。</comment>
+    <value>※总和是根据所收到的信号的强度和时间计算的。一般条件下，1米以内、15分钟以上的接触设定为100以上。</value>
+    <comment>※スコアは、受信した信号の強さと時間から算出しています。一般的な条件では1m以内・15分以上の接触で100以上になるように設定しています。</comment>
+  </data>
+  <data name="LowRiskContactPageAnnotationDecription2" xml:space="preserve">
+    <value>* 对于日期和时间，以协调世界时 (UTC) 转换成设置的时区来显示时间段。​</value>
+    <comment>※日時については、協定世界時（UTC）をを設定されているタイムゾーンに変換して、期間として表示しています。</comment>
   </data>
   <data name="NoRiskContactPageLabel" xml:space="preserve">
     <value>未收到来自阳性登记者所持智能手机的信号</value>
@@ -320,18 +320,6 @@
     <value>您的行动范围内似乎没有阳性登记者。请继续注意防止感染。</value>
     <comment>行動圏内には、陽性登録者はいなかったようです。引き続き感染予防に留意しながらお過ごしください。</comment>
   </data>
-  <data name="NoRiskContactPageButtonText" xml:space="preserve">
-    <value>分享此APP</value>
-    <comment>アプリを周りの人に知らせる</comment>
-  </data>
-  <data name="ThankYouNotifyOtherPageLabel1" xml:space="preserve">
-    <value>感谢提供检查结果</value>
-    <comment>陽性のご登録をいただきありがとうございました</comment>
-  </data>
-  <data name="ThankYouNotifyOtherPageDescription1" xml:space="preserve">
-    <value>本次注册为匿名注册，您不必输入姓名或任何其他个人信息。另外，该应用不会记录并通知密切接触的地点信息。</value>
-    <comment>登録は匿名で行われ、氏名や連絡先など個人が特定される情報を登録する必要はありません。また、接触した場所の位置情報が記録や通知されることもありません。</comment>
-  </data>
   <data name="TutorialPage3Title" xml:space="preserve">
     <value>使用条款</value>
     <comment>利用規約</comment>
@@ -357,16 +345,16 @@
     <comment>端末の識別</comment>
   </data>
   <data name="ContactedNotifyPageButton1" xml:space="preserve">
-    <value>和阳性患者的密切接触一览</value>
-    <comment>陽性者との接触一覧</comment>
+    <value>与阳性登记者的接触一览​</value>
+    <comment>陽性登録者との接触一覧</comment>
   </data>
   <data name="ContactedNotifyPageCountText" xml:space="preserve">
     <value>times</value>
     <comment>件</comment>
   </data>
   <data name="ContactedNotifyPageMainText" xml:space="preserve">
-    <value>查询跟阳性患者的密切接触情况</value>
-    <comment>陽性者との接触確認</comment>
+    <value>确认与阳性登记者的接触​</value>
+    <comment>陽性登録者との接触確認</comment>
   </data>
   <data name="ContactedNotifyPageTitle" xml:space="preserve">
     <value>查询过去14天内里的接触情况</value>
@@ -381,8 +369,8 @@
     <comment>お問い合わせ（メニュー）</comment>
   </data>
   <data name="HomePageDescription2" xml:space="preserve">
-    <value>确认与阳性者接触的结果</value>
-    <comment>陽性者との接触結果を確認</comment>
+    <value>确认与阳性登记者接触的结果</value>
+    <comment>陽性登録者との接触結果を確認</comment>
   </data>
   <data name="HomePageDescription3" xml:space="preserve">
     <value>确诊新型冠状病毒呈阳性</value>
@@ -397,8 +385,8 @@
     <comment>アプリを周りの人に知らせる</comment>
   </data>
   <data name="ExposureCheckTitle" xml:space="preserve">
-    <value>不存在高于基准值的信号</value>
-    <comment>基準値を超える信号はありません</comment>
+    <value>查询过去14天内里的接触情况</value>
+    <comment>過去14日間の接触</comment>
   </data>
   <data name="HomePageTitle1" xml:space="preserve">
     <value>主页</value>
@@ -553,8 +541,8 @@
     <comment>過去14日間の接触一覧</comment>
   </data>
   <data name="ExposuresPageLabel1" xml:space="preserve">
-    <value>以下日期确认到您与阳性患者存在密切接触。</value>
-    <comment>以下の日に陽性者との接触が確認されました。</comment>
+    <value>在下记时间段检测到与阳性登记者的接触。</value>
+    <comment>次の日に陽性登録者との接触が確認されました。</comment>
   </data>
   <data name="UrlContactedPhone" xml:space="preserve">
     <value>https://covid19radarjpnprod.z11.web.core.windows.net/phone.json</value>
@@ -681,10 +669,27 @@
     <comment>検査等の相談先を探す</comment>
   </data>
   <data name="ContactedNotifyPageDescription1" xml:space="preserve">
-    <value>・如果您有发烧，既往病状等症状，或者与经检测COVID-19呈阳性的人接触过，如果你想进行检查方面咨询，请按照本应用的指导，查看咨询中心列表以进行咨询。
-・请保存以下“感染者的接触一览”的屏幕截图，身体检查时可能需要</value>
-    <comment>・発熱等の症状や基礎疾患がある、新型コロナウイルス感染症の陽性者と接触した心当たりがあるなど、検査等の相談を希望される場合は、アプリの案内に従って相談先をご確認ください。
-・受診の際に必要となる場合があるため、以下より陽性者との接触一覧のスクリーンショットを保存してください。</comment>
+    <value>如果没有症状，​
+如果您没有与阳性者接触的印象，请在注意感染控制的同时可以正常的生活。​
+但是，如果您感觉有任何身体变化，请考虑去接受诊疗。
+    </value>
+    <comment>症状がない場合、陽性者と接触した心当たりがない場合は、感染対策に留意しつつ普段通りの生活をお送りください。ただし、体調に変化があった場合は、受診を検討ください。</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription2" xml:space="preserve">
+    <value>如果您属于以下任何一种情况，请考虑根据应用的指导去诊疗机构。</value>
+    <comment>次のいずれかに当てはまる方は、アプリの案内に従って相談先をご確認ください。</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription3" xml:space="preserve">
+    <value>・发烧或者有基础疾病</value>
+    <comment>・発熱等の症状や基礎疾患がある</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription4" xml:space="preserve">
+    <value>・有与阳性者接触的印象</value>
+    <comment>・陽性者と接触した心当たりがある</comment>
+  </data>
+  <data name="ContactedNotifyPageDescription5" xml:space="preserve">
+    <value>・其他想接受诊疗的情况</value>
+    <comment>・その他、受診を希望する</comment>
   </data>
   <data name="ReAgreeCheckButton" xml:space="preserve">
     <value>同意</value>
@@ -1239,4 +1244,29 @@
     <comment>と同じ</comment>
   </data>
 
+  <data name="ExposuresPageToUtcDescription" xml:space="preserve">
+    <value>* 对于日期和时间，以协调世界时 (UTC) 转换成设置的时区来显示时间段。​</value>
+    <comment>日時については、協定世界時（UTC）をを設定されているタイムゾーンに変換して、期間として表示しています。</comment>
+  </data>
+  <data name="ExposuresPageFrom" xml:space="preserve">
+    <value></value>
+    <comment></comment>
+  </data>
+  <data name="ExposuresPageTo" xml:space="preserve">
+    <value>到</value>
+    <comment>から</comment>
+  </data>
+  <data name="ExposureDateFormatDate" xml:space="preserve">
+    <value>d日 tth点mm分</value>
+    <comment>d日 tth時mm分</comment>
+  </data>
+  <data name="ExposureDateFormatMonth" xml:space="preserve">
+    <value>M月d日 tth点mm分</value>
+    <comment>M月d日 tth時mm分</comment>
+  </data>
+  <data name="ExposureDateFormatYear" xml:space="preserve">
+    <value>yyyy年M月d日 tth点mm分</value>
+    <comment>yyyy年M月d日 tth時mm分</comment>
+  </data>
+
 </root>
diff --git a/Covid19Radar/Covid19Radar/Services/CheckVersionService.cs b/Covid19Radar/Covid19Radar/Services/CheckVersionService.cs
new file mode 100644
index 000000000..945d86424
--- /dev/null
+++ b/Covid19Radar/Covid19Radar/Services/CheckVersionService.cs
@@ -0,0 +1,78 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Acr.UserDialogs;
+using Covid19Radar.Resources;
+using Covid19Radar.Services.Logs;
+using Newtonsoft.Json.Linq;
+using Xamarin.Essentials;
+
+namespace Covid19Radar.Services
+{
+    public interface ICheckVersionService
+    {
+        public Task CheckVersionAsync();
+    }
+
+    public class CheckVersionServiceNop : ICheckVersionService
+    {
+        public Task CheckVersionAsync()
+            => Task.CompletedTask;
+    }
+
+    public class CheckVersionService : ICheckVersionService
+    {
+        private readonly HttpClient _httpClient;
+        private readonly IEssentialsService _essentialsService;
+        private readonly ILoggerService _loggerService;
+
+        public CheckVersionService(
+            IHttpClientService httpClientService,
+            IEssentialsService essentialsService,
+            ILoggerService loggerService
+            )
+        {
+            _httpClient = httpClientService.Create();
+            _essentialsService = essentialsService;
+            _loggerService = loggerService;
+        }
+
+        public async Task CheckVersionAsync()
+        {
+            _loggerService.StartMethod();
+
+            var uri = AppResources.UrlVersion;
+
+            try
+            {
+                //var json = await _httpClient.GetStringAsync(uri);
+                //var versionString = JObject.Parse(json).Value<string>("version");
+                //if (new Version(versionString).CompareTo(new Version(_essentialsService.AppVersion)) > 0)
+                //{
+                if(true)
+                {
+                    await UserDialogs.Instance.AlertAsync(
+                        AppResources.AppUtilsGetNewVersionDescription,
+                        AppResources.AppUtilsGetNewVersionTitle,
+                        AppResources.ButtonOk
+                        );
+                    await Browser.OpenAsync(_essentialsService.StoreUrl, BrowserLaunchMode.External);
+                }
+
+            }
+            catch (Exception exception)
+            {
+                _loggerService.Exception("Failed to check version.", exception);
+            }
+            finally
+            {
+                _loggerService.EndMethod();
+            }
+        }
+
+    }
+}
diff --git a/Covid19Radar/Covid19Radar/Services/EssentialsService.cs b/Covid19Radar/Covid19Radar/Services/EssentialsService.cs
index 06c1b6aa3..7b28ba06b 100644
--- a/Covid19Radar/Covid19Radar/Services/EssentialsService.cs
+++ b/Covid19Radar/Covid19Radar/Services/EssentialsService.cs
@@ -25,5 +25,17 @@ public class EssentialsService : IEssentialsService
 
         // PhoneDialer
         public void PhoneDialerOpen(string number) => PhoneDialer.Open(number);
+
+        // Store URL
+        public string StoreUrl
+        {
+            get {
+                if (IsAndroid)
+                {
+                    return AppSettings.Instance.GooglePlayUrl;
+                }
+                return AppSettings.Instance.AppStoreUrl;
+            }
+        }
     }
 }
diff --git a/Covid19Radar/Covid19Radar/Services/EventLogServiceNop.cs b/Covid19Radar/Covid19Radar/Services/EventLogServiceNop.cs
index eccf1b9d7..f40370d60 100644
--- a/Covid19Radar/Covid19Radar/Services/EventLogServiceNop.cs
+++ b/Covid19Radar/Covid19Radar/Services/EventLogServiceNop.cs
@@ -10,6 +10,10 @@ namespace Covid19Radar.Services
 {
     public class EventLogServiceNop : IEventLogService
     {
+        public EventLogServiceNop()
+        {
+        }
+
         public Task SendExposureDataAsync(
             string idempotencyKey,
             ExposureConfiguration exposureConfiguration,
diff --git a/Covid19Radar/Covid19Radar/Services/IEssentialsService.cs b/Covid19Radar/Covid19Radar/Services/IEssentialsService.cs
index 7c246858a..94841e1ac 100644
--- a/Covid19Radar/Covid19Radar/Services/IEssentialsService.cs
+++ b/Covid19Radar/Covid19Radar/Services/IEssentialsService.cs
@@ -24,5 +24,8 @@ public interface IEssentialsService
 
         // PhoneDialer
         void PhoneDialerOpen(string number);
+
+        // Store URL
+        string StoreUrl { get; }
     }
 }
diff --git a/Covid19Radar/Covid19Radar/Services/Logs/ILogFileService.cs b/Covid19Radar/Covid19Radar/Services/Logs/ILogFileService.cs
index abf8a1b55..c88485848 100644
--- a/Covid19Radar/Covid19Radar/Services/Logs/ILogFileService.cs
+++ b/Covid19Radar/Covid19Radar/Services/Logs/ILogFileService.cs
@@ -8,9 +8,9 @@ public interface ILogFileService
     {
         // Log upload
         string CreateLogId();
-        string LogUploadingFileName(string logId);
-        bool CreateLogUploadingFileToTmpPath(string logUploadingFileName);
-        bool CopyLogUploadingFileToPublicPath(string logUploadingFileName);
+        string CreateZipFileName(string logId);
+        string CreateZipFile(string fileName);
+        string CopyLogUploadingFileToPublicPath(string logPath);
         bool DeleteAllLogUploadingFiles();
 
         // Log rotate
diff --git a/Covid19Radar/Covid19Radar/Services/Logs/ILogUploadService.cs b/Covid19Radar/Covid19Radar/Services/Logs/ILogUploadService.cs
index bb2010c44..e97013624 100644
--- a/Covid19Radar/Covid19Radar/Services/Logs/ILogUploadService.cs
+++ b/Covid19Radar/Covid19Radar/Services/Logs/ILogUploadService.cs
@@ -8,6 +8,6 @@ namespace Covid19Radar.Services.Logs
 {
     public interface ILogUploadService
     {
-        Task<bool> UploadAsync(string zipFileName);
+        Task<bool> UploadAsync(string zipFilePath);
     }
 }
diff --git a/Covid19Radar/Covid19Radar/Services/Logs/LogFileService.cs b/Covid19Radar/Covid19Radar/Services/Logs/LogFileService.cs
index 807847219..b8bcede72 100644
--- a/Covid19Radar/Covid19Radar/Services/Logs/LogFileService.cs
+++ b/Covid19Radar/Covid19Radar/Services/Logs/LogFileService.cs
@@ -13,8 +13,8 @@ public class LogFileService : ILogFileService
     {
         #region Static Fields
 
-        private static readonly string logUploadFilePrefix = "cocoa_log_";
-        private static readonly string logUploadFileExtension = "zip";
+        private static readonly string logFilePrefix = "cocoa_log_";
+        private static readonly string logFileExtension = "zip";
 
         #endregion
 
@@ -45,12 +45,12 @@ IBackupAttributeService backupAttributeService
 
         public string CreateLogId() => Guid.NewGuid().ToString();
 
-        public string LogUploadingFileName(string logId)
+        public string CreateZipFileName(string logId)
         {
-            return logUploadFilePrefix + logId + "." + logUploadFileExtension;
+            return logFilePrefix + logId + "." + logFileExtension;
         }
 
-        public bool CreateLogUploadingFileToTmpPath(string logUploadingFileName)
+        public string CreateZipFile(string fileName)
         {
             loggerService.StartMethod();
             try
@@ -59,42 +59,50 @@ public bool CreateLogUploadingFileToTmpPath(string logUploadingFileName)
                 var logFiles = Directory.GetFiles(logsDirPath, logPathService.LogFileWildcardName);
                 if (logFiles.Length == 0)
                 {
-                    loggerService.EndMethod();
-                    return false;
+                    return null;
                 }
-                ZipFile.CreateFromDirectory(logsDirPath, Path.Combine(logPathService.LogUploadingTmpPath, logUploadingFileName));
-                loggerService.EndMethod();
-                return true;
+
+                var zipFilePath = Path.Combine(logPathService.LogUploadingTmpPath, fileName);
+                ZipFile.CreateFromDirectory(logsDirPath, zipFilePath);
+
+                return zipFilePath;
             }
-            catch (Exception)
+            catch (Exception exception)
+            {
+                loggerService.Exception("Failed to create uploading file", exception);
+                return null;
+            }
+            finally
             {
-                loggerService.Error("Failed to create uploading file");
                 loggerService.EndMethod();
-                return false;
             }
         }
 
-        public bool CopyLogUploadingFileToPublicPath(string logUploadingFileName)
+        public string CopyLogUploadingFileToPublicPath(string logPath)
         {
             loggerService.StartMethod();
             try
             {
+                var logFileName = Path.GetFileName(logPath);
                 var tmpPath = logPathService.LogUploadingTmpPath;
                 var publicPath = logPathService.LogUploadingPublicPath;
                 if (string.IsNullOrEmpty(tmpPath) || string.IsNullOrEmpty(publicPath))
                 {
-                    loggerService.EndMethod();
-                    return false;
+                    return null;
                 }
-                File.Copy(Path.Combine(tmpPath, logUploadingFileName), Path.Combine(publicPath, logUploadingFileName), true);
-                loggerService.EndMethod();
-                return true;
+                var destPath = Path.Combine(publicPath, logFileName);
+                File.Copy(logPath, destPath, true);
+
+                return destPath;
             }
-            catch (Exception)
+            catch (Exception exception)
+            {
+                loggerService.Exception("Failed to copy log file", exception);
+                return null;
+            }
+            finally
             {
-                loggerService.Error("Failed to copy log file");
                 loggerService.EndMethod();
-                return false;
             }
         }
 
diff --git a/Covid19Radar/Covid19Radar/Services/Logs/LogUploadService.cs b/Covid19Radar/Covid19Radar/Services/Logs/LogUploadService.cs
index 7400ae530..ef0df8e9b 100644
--- a/Covid19Radar/Covid19Radar/Services/Logs/LogUploadService.cs
+++ b/Covid19Radar/Covid19Radar/Services/Logs/LogUploadService.cs
@@ -28,7 +28,7 @@ public LogUploadService(
             this.storageService = storageService;
         }
 
-        public async Task<bool> UploadAsync(string zipFileName)
+        public async Task<bool> UploadAsync(string zipFilePath)
         {
             loggerService.StartMethod();
 
@@ -49,7 +49,6 @@ public async Task<bool> UploadAsync(string zipFileName)
 
                 // Upload to storage.
                 var logTmpPath = logPathService.LogUploadingTmpPath;
-                var logZipPath = Path.Combine(logTmpPath, zipFileName);
 
                 var setting = AppSettings.Instance;
                 var endpoint = setting.LogStorageEndpoint;
@@ -57,7 +56,7 @@ public async Task<bool> UploadAsync(string zipFileName)
                 var accountName = setting.LogStorageAccountName;
                 var sasToken = logStorageSasResponse.Result.SasToken;
 
-                var uploadResult = await storageService.UploadAsync(endpoint, uploadPath, accountName, sasToken, logZipPath);
+                var uploadResult = await storageService.UploadAsync(endpoint, uploadPath, accountName, sasToken, zipFilePath);
                 if (!uploadResult)
                 {
                     throw new Exception("Failed to upload to storage.");
diff --git a/Covid19Radar/Covid19Radar/Services/Logs/LogUploadServiceNop.cs b/Covid19Radar/Covid19Radar/Services/Logs/LogUploadServiceNop.cs
new file mode 100644
index 000000000..bcef5ef75
--- /dev/null
+++ b/Covid19Radar/Covid19Radar/Services/Logs/LogUploadServiceNop.cs
@@ -0,0 +1,21 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+using System.Threading.Tasks;
+
+namespace Covid19Radar.Services.Logs
+{
+    public class LogUploadServiceNop : ILogUploadService
+    {
+        public LogUploadServiceNop()
+        {
+        }
+
+        public Task<bool> UploadAsync(string zipFilePath)
+        {
+            // do nothing
+            return Task.FromResult(true);
+        }
+    }
+}
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HelpPage/InqueryPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HelpPage/InqueryPageViewModel.cs
index 9019e4fa9..0fce5f7dc 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HelpPage/InqueryPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HelpPage/InqueryPageViewModel.cs
@@ -4,7 +4,9 @@
 
 using System;
 using System.Threading.Tasks;
+using Acr.UserDialogs;
 using Covid19Radar.Resources;
+using Covid19Radar.Services;
 using Covid19Radar.Services.Logs;
 using Covid19Radar.Views;
 using Prism.Navigation;
@@ -16,16 +18,55 @@ namespace Covid19Radar.ViewModels
     public class InqueryPageViewModel : ViewModelBase
     {
         private readonly ILoggerService loggerService;
+        private readonly ILogFileService logFileService;
+        private readonly ILogPathService logPathService;
+
+        private readonly IEssentialsService essentialService;
 
         public Func<string, BrowserLaunchMode, Task> BrowserOpenAsync = Browser.OpenAsync;
         public Func<string, string, string[], Task> ComposeEmailAsync { get; set; } = Email.ComposeAsync;
 
-        public InqueryPageViewModel(INavigationService navigationService, ILoggerService loggerService) : base(navigationService)
+        public InqueryPageViewModel(
+            INavigationService navigationService,
+            ILoggerService loggerService,
+            ILogFileService logFileService,
+            ILogPathService logPathService,
+            IEssentialsService eseentialService
+            ) : base(navigationService)
         {
             Title = AppResources.InqueryPageTitle;
             this.loggerService = loggerService;
+            this.logFileService = logFileService;
+            this.logPathService = logPathService;
+            this.essentialService = eseentialService;
+        }
+
+        public override void Destroy()
+        {
+            base.Destroy();
+            loggerService.StartMethod();
+
+            logFileService.DeleteAllLogUploadingFiles();
+
+            loggerService.EndMethod();
         }
 
+        public Command OpenGitHub => new Command(async () =>
+        {
+            var url = AppResources.UrlGitHubRepository;
+            await BrowserOpenAsync(url, BrowserLaunchMode.External);
+        });
+
+        public Command OnClickUseStable => new Command(async () =>
+        {
+            loggerService.StartMethod();
+
+            var url = essentialService.StoreUrl;
+            await BrowserOpenAsync(url, BrowserLaunchMode.External);
+
+            loggerService.EndMethod();
+        });
+
         public Command OnClickQuestionCommand => new Command(async () =>
         {
             loggerService.StartMethod();
@@ -40,9 +81,79 @@ public InqueryPageViewModel(INavigationService navigationService, ILoggerService
         {
             loggerService.StartMethod();
 
-            _ = await NavigationService.NavigateAsync(nameof(SendLogConfirmationPage));
+            try
+            {
+                UserDialogs.Instance.ShowLoading(AppResources.Processing);
 
-            loggerService.EndMethod();
+                var (logId, zipFilePath) = CreateZipFile();
+
+                UserDialogs.Instance.HideLoading();
+
+                if (zipFilePath is null)
+                {
+                    // Failed to create ZIP file
+                    await UserDialogs.Instance.AlertAsync(
+                        AppResources.FailedMessageToGetOperatingInformation,
+                        AppResources.Error,
+                        AppResources.ButtonOk);
+                    return;
+                }
+
+                loggerService.Info($"zipFilePath: {zipFilePath}");
+
+                INavigationParameters navigationParameters
+                    = SendLogConfirmationPage.BuildNavigationParams(logId, zipFilePath);
+
+                _ = await NavigationService.NavigateAsync(nameof(SendLogConfirmationPage), navigationParameters);
+            }
+            finally
+            {
+                loggerService.EndMethod();
+            }
+        });
+
+        public Command OnClickShareLogCommand => new Command(async () =>
+        {
+            loggerService.StartMethod();
+
+            try
+            {
+                UserDialogs.Instance.ShowLoading(AppResources.Processing);
+
+                var (logId, zipFilePath) = CreateZipFile();
+
+                UserDialogs.Instance.HideLoading();
+
+                if (zipFilePath is null)
+                {
+                    // Failed to create ZIP file
+                    await UserDialogs.Instance.AlertAsync(
+                        AppResources.FailedMessageToGetOperatingInformation,
+                        AppResources.Error,
+                        AppResources.ButtonOk);
+                    return;
+                }
+
+                loggerService.Info($"zipFilePath: {zipFilePath}");
+
+                string sharePath = logFileService.CopyLogUploadingFileToPublicPath(zipFilePath);
+
+                try
+                {
+                    await Share.RequestAsync(new ShareFileRequest
+                    {
+                        File = new ShareFile(sharePath)
+                    });
+                }
+                catch (NotImplementedInReferenceAssemblyException exception)
+                {
+                    loggerService.Exception("NotImplementedInReferenceAssemblyException", exception);
+                }
+            }
+            finally
+            {
+                loggerService.EndMethod();
+            }
         });
 
         public Command OnClickEmailCommand => new Command(async () =>
@@ -73,5 +184,17 @@ await ComposeEmailAsync(
 
             loggerService.EndMethod();
         });
+
+        private (string, string) CreateZipFile()
+        {
+            string logId = logFileService.CreateLogId();
+            string zipFileName = logFileService.CreateZipFileName(logId);
+
+            logFileService.Rotate();
+
+            var zipFilePath = logFileService.CreateZipFile(zipFileName);
+
+            return (logId, zipFilePath);
+        }
     }
 }
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HelpPage/SendLogConfirmationPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HelpPage/SendLogConfirmationPageViewModel.cs
index 5e5cf72d2..1171ac488 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HelpPage/SendLogConfirmationPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HelpPage/SendLogConfirmationPageViewModel.cs
@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-using System;
-using System.IO;
-using System.Threading.Tasks;
 using Acr.UserDialogs;
 using Covid19Radar.Resources;
 using Covid19Radar.Services.Logs;
@@ -22,32 +19,48 @@ public class SendLogConfirmationPageViewModel : ViewModelBase
         private readonly ILoggerService loggerService;
         private readonly ILogFileService logFileService;
         private readonly ILogUploadService logUploadService;
-        private readonly ILogPathService logPathService;
-
-        public Action<Action> BeginInvokeOnMainThread { get; set; } = MainThread.BeginInvokeOnMainThread;
-        public Func<Action, Task> TaskRun { get; set; } = Task.Run;
 
         private string LogId { get; set; }
-        private string ZipFileName { get; set; }
+        private string ZipFilePath { get; set; }
 
         public SendLogConfirmationPageViewModel(
             INavigationService navigationService,
-            ILogFileService logFileService,
             ILoggerService loggerService,
-            ILogUploadService logUploadService,
-            ILogPathService logPathService) : base(navigationService)
+            ILogFileService logFileService,
+            ILogUploadService logUploadService
+            ) : base(navigationService)
         {
             this.loggerService = loggerService;
             this.logFileService = logFileService;
             this.logUploadService = logUploadService;
-            this.logPathService = logPathService;
         }
 
-        public Command OnClickConfirmLogCommand => new Command(() =>
+        public Command OnClickConfirmLogCommand => new Command(async () =>
         {
             loggerService.StartMethod();
 
-            CopyZipFileToPublicPath();
+            string sharePath = logFileService.CopyLogUploadingFileToPublicPath(ZipFilePath);
+
+            if (sharePath is null)
+            {
+                await UserDialogs.Instance.AlertAsync(
+                    AppResources.FailedMessageToSaveOperatingInformation,
+                    AppResources.Error,
+                    AppResources.ButtonOk);
+                return;
+            }
+
+            try
+            {
+                await Share.RequestAsync(new ShareFileRequest
+                {
+                    File = new ShareFile(sharePath)
+                });
+            }
+            catch (NotImplementedInReferenceAssemblyException exception)
+            {
+                loggerService.Exception("NotImplementedInReferenceAssemblyException", exception);
+            }
 
             loggerService.EndMethod();
         });
@@ -58,9 +71,9 @@ public SendLogConfirmationPageViewModel(
             try
             {
                 // Upload log file.
-                UserDialogs.Instance.ShowLoading(Resources.AppResources.Sending);
+                UserDialogs.Instance.ShowLoading(AppResources.Sending);
 
-                var uploadResult = await logUploadService.UploadAsync(ZipFileName);
+                var uploadResult = await logUploadService.UploadAsync(ZipFilePath);
 
                 UserDialogs.Instance.HideLoading();
 
@@ -68,9 +81,9 @@ public SendLogConfirmationPageViewModel(
                 {
                     // Failed to create ZIP file
                     await UserDialogs.Instance.AlertAsync(
-                        Resources.AppResources.FailedMessageToSendOperatingInformation,
-                        Resources.AppResources.SendingError,
-                        Resources.AppResources.ButtonOk);
+                        AppResources.FailedMessageToSendOperatingInformation,
+                        AppResources.SendingError,
+                        AppResources.ButtonOk);
                     return;
                 }
 
@@ -99,7 +112,11 @@ public override void Initialize(INavigationParameters parameters)
             loggerService.StartMethod();
 
             base.Initialize(parameters);
-            CreateZipFile();
+
+            LogId = parameters.GetValue<string>(SendLogConfirmationPage.LogIdKey);
+            ZipFilePath = parameters.GetValue<string>(SendLogConfirmationPage.ZipFilePathKey);
+
+            loggerService.Info($"ZipFilePath: {ZipFilePath}");
 
             loggerService.EndMethod();
         }
@@ -111,75 +128,5 @@ public override void Destroy()
             logFileService.DeleteAllLogUploadingFiles();
             loggerService.EndMethod();
         }
-
-        private void CreateZipFile()
-        {
-            LogId = logFileService.CreateLogId();
-            ZipFileName = logFileService.LogUploadingFileName(LogId);
-
-            UserDialogs.Instance.ShowLoading(Resources.AppResources.Processing);
-
-            _ = TaskRun(() =>
-            {
-                logFileService.Rotate();
-
-                var result = logFileService.CreateLogUploadingFileToTmpPath(ZipFileName);
-
-                BeginInvokeOnMainThread(async () =>
-                {
-                    UserDialogs.Instance.HideLoading();
-
-                    if (!result)
-                    {
-                        // Failed to create ZIP file
-                        await UserDialogs.Instance.AlertAsync(
-                            Resources.AppResources.FailedMessageToGetOperatingInformation,
-                            Resources.AppResources.Error,
-                            Resources.AppResources.ButtonOk);
-
-                        _ = await NavigationService.GoBackAsync();
-                    }
-                });
-            });
-        }
-
-        private void CopyZipFileToPublicPath()
-        {
-
-            _ = TaskRun(() =>
-            {
-                var result = logFileService.CopyLogUploadingFileToPublicPath(ZipFileName);
-
-                BeginInvokeOnMainThread(async () =>
-                {
-
-                    if (!result)
-                    {
-                        await UserDialogs.Instance.AlertAsync(
-                            Resources.AppResources.FailedMessageToSaveOperatingInformation,
-                            Resources.AppResources.Error,
-                            Resources.AppResources.ButtonOk);
-                    }
-                    else
-                    {
-                        var publicPath = logPathService.LogUploadingPublicPath;
-                        var logUploadingFileName = logFileService.LogUploadingFileName(LogId);
-                        var path = Path.Combine(publicPath, logUploadingFileName);
-
-                        try
-                        {
-                            await Share.RequestAsync(new ShareFileRequest
-                            {
-                                File = new ShareFile(path)
-                            });
-                        }
-                        catch (NotImplementedInReferenceAssemblyException exception)
-                        {
-                            loggerService.Exception("NotImplementedInReferenceAssemblyException", exception);
-                        }
-                    }
-                });
-            });
-        }
     }
 }
diff --git a/Covid19Radar/Covid19Radar/ViewModels/ExposureCheck/ExposureCheckPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposureCheckPageViewModel.cs
similarity index 60%
rename from Covid19Radar/Covid19Radar/ViewModels/ExposureCheck/ExposureCheckPageViewModel.cs
rename to Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposureCheckPageViewModel.cs
index 0753bf369..30b1fdc85 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/ExposureCheck/ExposureCheckPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposureCheckPageViewModel.cs
@@ -19,7 +19,6 @@
 using Threshold = Covid19Radar.Model.V1ExposureRiskCalculationConfiguration.Threshold;
 using Covid19Radar.Services;
 using System.Threading.Tasks;
-using System.Globalization;
 
 namespace Covid19Radar.ViewModels
 {
@@ -27,22 +26,18 @@ public class ExposureCheckPageViewModel : ViewModelBase
     {
         private readonly ILoggerService _loggerService;
         private readonly IExposureDataRepository _exposureDataRepository;
+        private readonly IExposureRiskCalculationConfigurationRepository _exposureRiskCalculationConfigurationRepository;
         private readonly IExposureRiskCalculationService _exposureRiskCalculationService;
+        private readonly IUserDataRepository _userDataRepository;
+        private readonly IDateTimeUtility _dateTimeUtility;
 
         public ObservableCollection<ExposureCheckScoreModel> ExposureCheckScores { get; set; }
 
-        private bool _isVisibleNoRiskContact;
-        public bool IsVisibleNoRiskContact
+        private bool _isExposureDetected = false;
+        public bool IsExposureDetected
         {
-            get { return _isVisibleNoRiskContact; }
-            set { SetProperty(ref _isVisibleNoRiskContact, value); }
-        }
-
-        private bool _isVisibleLowRiskContact;
-        public bool IsVisibleLowRiskContact
-        {
-            get { return _isVisibleLowRiskContact; }
-            set { SetProperty(ref _isVisibleLowRiskContact, value); }
+            get { return _isExposureDetected; }
+            set { SetProperty(ref _isExposureDetected, value); }
         }
 
         private string _lowRiskContactPageHeaderTextSuffix;
@@ -65,12 +60,18 @@ public ExposureCheckPageViewModel(
             INavigationService navigationService,
             ILoggerService loggerService,
             IExposureDataRepository exposureDataRepository,
-            IExposureRiskCalculationService exposureRiskCalculationService
+            IExposureRiskCalculationService exposureRiskCalculationService,
+            IUserDataRepository userDataRepository,
+            IExposureRiskCalculationConfigurationRepository exposureRiskCalculationConfigurationRepository,
+            IDateTimeUtility dateTimeUtility
             ) : base(navigationService)
         {
             _loggerService = loggerService;
             _exposureDataRepository = exposureDataRepository;
             _exposureRiskCalculationService = exposureRiskCalculationService;
+            _userDataRepository = userDataRepository;
+            _exposureRiskCalculationConfigurationRepository = exposureRiskCalculationConfigurationRepository;
+            _dateTimeUtility = dateTimeUtility;
 
             ExposureCheckScores = new ObservableCollection<ExposureCheckScoreModel>();
         }
@@ -84,24 +85,19 @@ public override async void Initialize(INavigationParameters parameters)
             _exposureRiskCalculationConfiguration
                 = parameters.GetValue<V1ExposureRiskCalculationConfiguration>(ExposureCheckPage.ExposureRiskCalculationConfigurationKey);
 
+            if (_exposureRiskCalculationConfiguration is null)
+            {
+                _exposureRiskCalculationConfiguration
+                    = await _exposureRiskCalculationConfigurationRepository.GetExposureRiskCalculationConfigurationAsync(preferCache: true);
+            }
+
+            _loggerService.Info(_exposureRiskCalculationConfiguration.ToString());
+
             ShowExposureRiskCalculationConfiguration();
 
             try
             {
-                var summaries = await _exposureDataRepository
-                    .GetDailySummariesAsync(AppConstants.DaysOfExposureInformationToDisplay);
-                if (0 < summaries.Count())
-                {
-                    IsVisibleLowRiskContact = true;
-                    IsVisibleNoRiskContact = false;
-
-                    _ = SetupExposureCheckScoresAsync(summaries);
-                }
-                else
-                {
-                    IsVisibleLowRiskContact = false;
-                    IsVisibleNoRiskContact = true;
-                }
+                _ = Setup();
             }
             catch (Exception exception)
             {
@@ -144,40 +140,91 @@ private static string OperatorToString(string op)
             };
         }
 
-        private async Task SetupExposureCheckScoresAsync(List<DailySummary> summaries)
+        private int GetLastOffsetDay(List<DailySummary> dailySummaryList)
         {
-            var dailySummaryList
-                = await _exposureDataRepository.GetDailySummariesAsync(AppConstants.DaysOfExposureInformationToDisplay);
+            var dayOfUse = _userDataRepository.GetDaysOfUse();
+
+            var oldestExposureDateMillisSinceEpoch = dailySummaryList.Min(x => x.DateMillisSinceEpoch);
+            var oldestExposureDate = DateTimeOffset.UnixEpoch.AddMilliseconds(oldestExposureDateMillisSinceEpoch).UtcDateTime;
+            var oldestExposureDateOffset = (DateTime.UtcNow.Date - oldestExposureDate).Days;
+
+            var daysOffset = Math.Max(
+                dayOfUse,
+                oldestExposureDateOffset
+                );
+
+            daysOffset = Math.Min(
+                daysOffset,
+                14 // 2 weeks
+                );
+
+            _loggerService.Debug($"daysOffset: {daysOffset}");
+
+            return daysOffset;
+        }
+
+        public async Task Setup()
+        {
+            _loggerService.StartMethod();
+
+            List<DailySummary> dailySummaryList = await _exposureDataRepository
+                .GetDailySummariesAsync(AppConstants.DaysOfExposureInformationToDisplay);
 
             if (dailySummaryList.Count() == 0)
             {
+                _loggerService.EndMethod();
                 return;
             }
 
-            _loggerService.Info(_exposureRiskCalculationConfiguration.ToString());
+            var dailySummaryMap = dailySummaryList.ToDictionary(ds => ds.DateMillisSinceEpoch);
 
-            var dailySummaryMap = dailySummaryList.ToDictionary(ds => ds.GetDateTime());
+            _loggerService.Debug($"dailySummaryMap {dailySummaryMap.Count}");
 
             var exposureWindowList
                 = await _exposureDataRepository.GetExposureWindowsAsync(AppConstants.DaysOfExposureInformationToDisplay);
-            exposureWindowList.Sort((a, b) => b.DateMillisSinceEpoch.CompareTo(a.DateMillisSinceEpoch));
 
-            var userExposureInformationList
-                = _exposureDataRepository.GetExposureInformationList(AppConstants.DaysOfExposureInformationToDisplay);
+            _loggerService.Debug($"exposureWindowList {exposureWindowList.Count}");
+
+            var daysOffset = GetLastOffsetDay(dailySummaryList);
+
+            var dates = Enumerable.Range(-daysOffset, daysOffset)
+                .Select(offset => _dateTimeUtility.UtcNow.Date.AddDays(offset).ToUnixEpochMillis())
+                .ToList();
+            dates.Sort((a, b) => b.CompareTo(a));
 
-            foreach (var ew in exposureWindowList.GroupBy(exposureWindow => exposureWindow.GetDateTime()))
+            foreach (var dateMillisSinceEpoch in dates)
             {
-                if (!dailySummaryMap.ContainsKey(ew.Key))
+                _loggerService.Debug($"dateMillisSinceEpoch {dateMillisSinceEpoch}");
+
+                var ewList = exposureWindowList.Where(ew => ew.DateMillisSinceEpoch == dateMillisSinceEpoch).ToList();
+
+                bool IsBlank = false;
+
+                if (!dailySummaryMap.ContainsKey(dateMillisSinceEpoch))
+                {
+                    _loggerService.Warning($"DailySummary: {dateMillisSinceEpoch} not found.");
+                    IsBlank = true;
+                }
+                else if (ewList.Count == 0)
+                {
+                    _loggerService.Warning($"DailySummary: {dateMillisSinceEpoch} found, but that is not contained the list of ExposureWindow.");
+                    IsBlank = true;
+                }
+
+                if (IsBlank)
                 {
-                    _loggerService.Warning($"ExposureWindow: {ew.Key} found, but that is not contained the list of dailySummary.");
+                    ExposureCheckScoreModel blank = CreateBlankModel(dateMillisSinceEpoch);
+                    ExposureCheckScores.Add(blank);
                     continue;
                 }
 
-                var dailySummary = dailySummaryMap[ew.Key];
+                IsExposureDetected = true;
+
+                var dailySummary = dailySummaryMap[dateMillisSinceEpoch];
 
                 RiskLevel riskLevel = _exposureRiskCalculationService.CalcRiskLevel(
                     dailySummary,
-                    ew.ToList(),
+                    ewList,
                     _exposureRiskCalculationConfiguration
                     );
                 if (riskLevel > RiskLevel.Low)
@@ -185,9 +232,23 @@ var userExposureInformationList
                     continue;
                 }
 
-                ExposureCheckScoreModel exposureCheckModel = CreateExposureCheckScoreModel(dailySummary, ew.ToList());
+                ExposureCheckScoreModel exposureCheckModel = CreateExposureCheckScoreModel(dailySummary, ewList);
                 ExposureCheckScores.Add(exposureCheckModel);
             }
+
+            _loggerService.EndMethod();
+        }
+
+        private ExposureCheckScoreModel CreateBlankModel(long dateMillisSinceEpoch)
+        {
+            return new ExposureCheckScoreModel()
+            {
+                DateMillisSinceEpoch = dateMillisSinceEpoch,
+                IsDurationTimeVisible = false,
+                IsScoreVisible = false,
+                IsReceived = false,
+                Description = "受信した信号はありません"
+            };
         }
 
         private ExposureCheckScoreModel CreateExposureCheckScoreModel(DailySummary dailySummary, List<ExposureWindow> exposureWindowList)
@@ -195,36 +256,44 @@ private ExposureCheckScoreModel CreateExposureCheckScoreModel(DailySummary daily
             var exposureCheckModel = new ExposureCheckScoreModel()
             {
                 DateMillisSinceEpoch = dailySummary.DateMillisSinceEpoch,
+                IsReceived = true,
             };
 
             var descriptionList = new List<string>();
 
-            if (!_exposureRiskCalculationConfiguration.DailySummary_DaySummary_ScoreSum.Cond(dailySummary.DaySummary.ScoreSum))
+            var scoreSumValue = _exposureRiskCalculationConfiguration.DailySummary_DaySummary_ScoreSum.Value;
+            if (scoreSumValue <= 0)
             {
-                exposureCheckModel.IsScoreVisible = true;
+                scoreSumValue = ExposureRiskCalculationConfigurationRepository.CreateDefaultConfiguration().DailySummary_DaySummary_ScoreSum.Value;
+                _loggerService.Error($"ExposureRiskCalculationConfiguration.DailySummary_DaySummary_ScoreSum.Value is invalid 0. Use default value {scoreSumValue}.");
+            }
 
-                var description =  string.Format(
-                    AppResources.LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Unsatisfied,
-                    dailySummary.DaySummary.ScoreSum
+            var ratio = dailySummary.DaySummary.ScoreSum / scoreSumValue;
+
+            if (1 > ratio)
+            {
+                var description = string.Format(
+                    AppResources.LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Satisfied,
+                    Math.Ceiling(ratio * 100)
                     );
                 descriptionList.Add(description);
             }
             else
             {
+                exposureCheckModel.IsDurationTimeVisible = true;
+
                 var description = string.Format(
-                    AppResources.LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Satisfied,
-                    dailySummary.DaySummary.ScoreSum
+                    AppResources.LowRiskContactPage_DailySummary_ScoreSum_Descritpion_Unsatisfied,
+                    Math.Ceiling(ratio * 100)
                     );
                 descriptionList.Add(description);
             }
 
             var exposureDurationInSec = exposureWindowList.Sum(e => e.ScanInstances.Sum(s => s.SecondsSinceLastScan));
 
-            if (!exposureCheckModel.IsScoreVisible
+            if (exposureCheckModel.IsDurationTimeVisible
                 && !_exposureRiskCalculationConfiguration.ExposureWindow_ScanInstance_SecondsSinceLastScanSum.Cond(exposureDurationInSec))
             {
-                exposureCheckModel.IsDurationTimeVisible = true;
-
                 var exposureDurationTimeSpan = TimeSpan.FromSeconds(exposureDurationInSec);
                 var exposureDurationInMinute = Math.Ceiling(exposureDurationTimeSpan.TotalMinutes);
 
@@ -259,14 +328,16 @@ public class ExposureCheckScoreModel
     {
         public long DateMillisSinceEpoch { get; set; }
 
-        public string DateTimeString => DateTimeOffset.UnixEpoch
-                .AddMilliseconds(DateMillisSinceEpoch).UtcDateTime
-                .ToLocalTime().ToString("D", CultureInfo.CurrentCulture);
+        public string DateTimeString => IExposureDataRepository.ConvertToTerm(
+            DateTimeOffset.UnixEpoch.AddMilliseconds(DateMillisSinceEpoch).UtcDateTime
+            );
 
         public bool IsScoreVisible { get; set; }
 
         public bool IsDurationTimeVisible { get; set; }
 
+        public bool IsReceived { get; set; }
+
         public string Description { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs
index d1b9e70c8..a97f87a62 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ExposuresPageViewModel.cs
@@ -11,7 +11,6 @@
 using Prism.Navigation;
 using System;
 using System.Collections.ObjectModel;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -93,7 +92,7 @@ var userExposureInformationList
                     var ens = new ExposureSummary()
                     {
                         Timestamp = ew.Key,
-                        ExposureDate = dailySummary.GetDateTime().ToLocalTime().ToString("D", CultureInfo.CurrentCulture),
+                        ExposureDate = IExposureDataRepository.ConvertToTerm(dailySummary.GetDateTime()),
                     };
                     var exposureDurationInSec = ew.Sum(e => e.ScanInstances.Sum(s => s.SecondsSinceLastScan));
                     ens.SetExposureTime(exposureDurationInSec);
@@ -109,7 +108,7 @@ var userExposureInformationList
                     var ens = new ExposureSummary()
                     {
                         Timestamp = ei.Key,
-                        ExposureDate = ei.Key.ToLocalTime().ToString("D", CultureInfo.CurrentCulture),
+                        ExposureDate = IExposureDataRepository.ConvertToTerm(ei.Key),
                     };
                     ens.SetExposureCount(ei.Count());
                     exposures.Add(ens);
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
index 1893b236c..e63075ced 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
@@ -15,7 +15,6 @@
 using Covid19Radar.Views;
 using Prism.Navigation;
 using Xamarin.Forms;
-using Covid19Radar.Model;
 
 namespace Covid19Radar.ViewModels
 {
@@ -30,6 +29,7 @@ public class HomePageViewModel : ViewModelBase, IExposureNotificationEventCallba
         private readonly AbsExposureNotificationApiService exposureNotificationApiService;
         private readonly ILocalNotificationService localNotificationService;
         private readonly AbsExposureDetectionBackgroundService exposureDetectionBackgroundService;
+        private readonly ICheckVersionService checkVersionService;
         private readonly IDialogService dialogService;
         private readonly IExternalNavigationService externalNavigationService;
 
@@ -82,6 +82,7 @@ public HomePageViewModel(
             AbsExposureDetectionBackgroundService exposureDetectionBackgroundService,
             IExposureConfigurationRepository exposureConfigurationRepository,
             IExposureRiskCalculationConfigurationRepository exposureRiskCalculationConfigurationRepository,
+            ICheckVersionService checkVersionService,
             IDialogService dialogService,
             IExternalNavigationService externalNavigationService
             ) : base(navigationService)
@@ -97,6 +98,7 @@ IExternalNavigationService externalNavigationService
             this.exposureDetectionBackgroundService = exposureDetectionBackgroundService;
             this.exposureConfigurationRepository = exposureConfigurationRepository;
             this.exposureRiskCalculationConfigurationRepository = exposureRiskCalculationConfigurationRepository;
+            this.checkVersionService = checkVersionService;
             this.dialogService = dialogService;
             this.externalNavigationService = externalNavigationService;
         }
@@ -116,7 +118,7 @@ public override async void Initialize(INavigationParameters parameters)
             });
 
             // Check Version
-            AppUtils.CheckVersion(loggerService);
+            _ = checkVersionService.CheckVersionAsync();
 
             // Load necessary files asynchronous
             _ = exposureConfigurationRepository.GetExposureConfigurationAsync();
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs
index 04135f4cd..ad37acd12 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/NotifyOtherPageViewModel.cs
@@ -17,6 +17,7 @@
 using Chino;
 using System.Net;
 using System.Linq;
+using Xamarin.Essentials;
 
 namespace Covid19Radar.ViewModels
 {
@@ -81,6 +82,13 @@ public bool IsInqueryTelephoneNumberVisible
             set => SetProperty(ref _isInqueryTelephoneNumberVisible, value);
         }
 
+        private bool _isInqueryVisible;
+        public bool IsInqueryVisible
+        {
+            get => _isInqueryVisible;
+            set => SetProperty(ref _isInqueryVisible, value);
+        }
+
         private bool _isNextButtonEnabled;
         public bool IsNextButtonEnabled
         {
@@ -123,6 +131,8 @@ public DateTime DiagnosisDate
         // TODO: Save and use for revoke operation.
         private string idempotencyKey = Guid.NewGuid().ToString();
 
+        public Func<string, BrowserLaunchMode, Task> BrowserOpenAsync = Browser.OpenAsync;
+
         public NotifyOtherPageViewModel(
             INavigationService navigationService,
             ILoggerService loggerService,
@@ -155,7 +165,8 @@ public override void Initialize(INavigationParameters parameters)
                 IsHowToObtainProcessingNumberVisible = false;
                 IsProcessingNumberReadOnly = true;
                 IsConsentLinkVisible = true;
-                IsInqueryTelephoneNumberVisible = true;
+                IsInqueryTelephoneNumberVisible = false; // for Beta
+                IsInqueryVisible = true;
             }
         }
 
@@ -176,6 +187,16 @@ public override void Initialize(INavigationParameters parameters)
             loggerService.EndMethod();
         });
 
+        public Command OnClickUseStable => new Command(async () =>
+        {
+            loggerService.StartMethod();
+
+            var url = _essentialsService.StoreUrl;
+            await BrowserOpenAsync(url, BrowserLaunchMode.External);
+
+            loggerService.EndMethod();
+        });
+
         public Command OnShowConsentPageClicked => new Command(async () =>
         {
             loggerService.StartMethod();
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/SplashPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/SplashPageViewModel.cs
index cbc5ea5c6..43b561478 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/SplashPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/HomePage/SplashPageViewModel.cs
@@ -2,13 +2,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+using System;
+using System.Threading.Tasks;
 using Covid19Radar.Model;
 using Covid19Radar.Repository;
+using Covid19Radar.Resources;
 using Covid19Radar.Services;
 using Covid19Radar.Services.Logs;
 using Covid19Radar.Services.Migration;
 using Covid19Radar.Views;
 using Prism.Navigation;
+using Xamarin.Essentials;
+using Xamarin.Forms;
 
 namespace Covid19Radar.ViewModels
 {
@@ -18,15 +23,30 @@ public class SplashPageViewModel : ViewModelBase
         private readonly ILoggerService _loggerService;
         private readonly IUserDataService _userDataService;
         private readonly IMigrationService _migrationService;
+        private readonly IEssentialsService _essentialsService;
         private readonly IUserDataRepository _userDataRepository;
 
+        private bool _enableContinue = false;
+        public bool EnableContinue
+        {
+            get { return _enableContinue; }
+            set
+            {
+                SetProperty(ref _enableContinue, value);
+            }
+        }
+
+        private INavigationParameters _navigationParameters;
+        private TermsUpdateInfoModel _termsUpdateInfo;
+
         public SplashPageViewModel(
             INavigationService navigationService,
             ITermsUpdateService termsUpdateService,
             ILoggerService loggerService,
             IUserDataRepository userDataRepository,
             IUserDataService userDataService,
-            IMigrationService migrationService
+            IMigrationService migrationService,
+            IEssentialsService essentialsService
             ) : base(navigationService)
         {
             _termsUpdateService = termsUpdateService;
@@ -34,9 +54,54 @@ IMigrationService migrationService
             _userDataRepository = userDataRepository;
             _userDataService = userDataService;
             _migrationService = migrationService;
+            _essentialsService = essentialsService;
+        }
+
+        public override void Initialize(INavigationParameters parameters)
+        {
+            base.Initialize(parameters);
+
+            _loggerService.StartMethod();
+
+            _navigationParameters = parameters;
+
+            _ = Task.Run(async () => {
+                _termsUpdateInfo = await _termsUpdateService.GetTermsUpdateInfo();
+                EnableContinue = true;
+            });
+
+            _loggerService.EndMethod();
+
         }
 
-        public override async void OnNavigatedTo(INavigationParameters parameters)
+        public Func<string, BrowserLaunchMode, Task> BrowserOpenAsync = Browser.OpenAsync;
+
+        public Command OpenGitHub => new Command(async () =>
+        {
+            var url = AppResources.UrlGitHubRepository;
+            await BrowserOpenAsync(url, BrowserLaunchMode.External);
+        });
+
+        public Command OnClickContinue => new Command(() =>
+        {
+            _loggerService.StartMethod();
+
+            NavigateToNextPage(_navigationParameters);
+
+            _loggerService.EndMethod();
+        });
+
+        public Command OnClickUseStable => new Command(async () =>
+        {
+            _loggerService.StartMethod();
+
+            var url = _essentialsService.StoreUrl;
+            await BrowserOpenAsync(url, BrowserLaunchMode.External);
+
+            _loggerService.EndMethod();
+        });
+
+        private async void NavigateToNextPage(INavigationParameters parameters)
         {
             _loggerService.StartMethod();
 
@@ -55,20 +120,18 @@ public override async void OnNavigatedTo(INavigationParameters parameters)
             {
                 _loggerService.Info("User data exists");
 
-                var termsUpdateInfo = await _termsUpdateService.GetTermsUpdateInfo();
-
-                if (_termsUpdateService.IsUpdated(TermsType.TermsOfService, termsUpdateInfo))
+                if (_termsUpdateService.IsUpdated(TermsType.TermsOfService, _termsUpdateInfo))
                 {
                     _loggerService.Info($"Transition to ReAgreeTermsOfServicePage");
 
-                    var navigationParams = ReAgreeTermsOfServicePage.BuildNavigationParams(termsUpdateInfo, destination, parameters);
+                    var navigationParams = ReAgreeTermsOfServicePage.BuildNavigationParams(_termsUpdateInfo, destination, parameters);
                     _ = await NavigationService.NavigateAsync("/" + nameof(ReAgreeTermsOfServicePage), navigationParams);
                 }
-                else if (_termsUpdateService.IsUpdated(TermsType.PrivacyPolicy, termsUpdateInfo))
+                else if (_termsUpdateService.IsUpdated(TermsType.PrivacyPolicy, _termsUpdateInfo))
                 {
                     _loggerService.Info($"Transition to ReAgreePrivacyPolicyPage");
 
-                    var navigationParams = ReAgreePrivacyPolicyPage.BuildNavigationParams(termsUpdateInfo.PrivacyPolicy, destination, parameters);
+                    var navigationParams = ReAgreePrivacyPolicyPage.BuildNavigationParams(_termsUpdateInfo.PrivacyPolicy, destination, parameters);
                     _ = await NavigationService.NavigateAsync("/" + nameof(ReAgreePrivacyPolicyPage), navigationParams);
                 }
                 else
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ThankYouNotifyOtherPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/ThankYouNotifyOtherPageViewModel.cs
deleted file mode 100644
index e1ebd84d6..000000000
--- a/Covid19Radar/Covid19Radar/ViewModels/HomePage/ThankYouNotifyOtherPageViewModel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-using Covid19Radar.Common;
-using Covid19Radar.Services;
-using Covid19Radar.Services.Logs;
-using Prism.Navigation;
-using Xamarin.Forms;
-
-namespace Covid19Radar.ViewModels
-{
-    public class ThankYouNotifyOtherPageViewModel : ViewModelBase
-    {
-        private readonly ILoggerService loggerService;
-
-        public ThankYouNotifyOtherPageViewModel(INavigationService navigationService, ILoggerService loggerService) : base(navigationService)
-        {
-            Title = Resources.AppResources.TitileUserStatusSettings;
-            this.loggerService = loggerService;
-        }
-        public Command OnClickShareApp => new Command(() =>
-        {
-            loggerService.StartMethod();
-
-            AppUtils.PopUpShare();
-
-            loggerService.EndMethod();
-        });
-
-    }
-}
diff --git a/Covid19Radar/Covid19Radar/ViewModels/Settings/SettingsPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/Settings/SettingsPageViewModel.cs
index 08be8ec64..f4d16b69f 100644
--- a/Covid19Radar/Covid19Radar/ViewModels/Settings/SettingsPageViewModel.cs
+++ b/Covid19Radar/Covid19Radar/ViewModels/Settings/SettingsPageViewModel.cs
@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+using System;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Acr.UserDialogs;
@@ -18,6 +19,8 @@ namespace Covid19Radar.ViewModels
 {
     public class SettingsPageViewModel : ViewModelBase
     {
+        private const string VERSION_SUFFIX = "-beta04";
+
         private readonly ILoggerService loggerService;
         private string _AppVersion;
 
@@ -42,11 +45,11 @@ public SettingsPageViewModel(
             IExposureConfigurationRepository exposureConfigurationRepository,
             ILogFileService logFileService,
             AbsExposureNotificationApiService exposureNotificationApiService,
-            ICloseApplicationService closeApplicationService
+            ICloseApplicationService closeApplicationService,
+            IEssentialsService essentialsService
             ) : base(navigationService)
         {
             Title = AppResources.SettingsPageTitle;
-            AppVer = AppInfo.VersionString;
             this.loggerService = loggerService;
             this.userDataRepository = userDataRepository;
             this.exposureDataRepository = exposureDataRepository;
@@ -54,8 +57,18 @@ ICloseApplicationService closeApplicationService
             this.logFileService = logFileService;
             this.exposureNotificationApiService = exposureNotificationApiService;
             this.closeApplicationService = closeApplicationService;
+
+            AppVer = essentialsService.AppVersion + VERSION_SUFFIX;
         }
 
+        public Func<string, BrowserLaunchMode, Task> BrowserOpenAsync = Browser.OpenAsync;
+
+        public ICommand OpenGitHub => new Command(async () =>
+        {
+            var url = AppResources.UrlGitHubRepository;
+            await BrowserOpenAsync(url, BrowserLaunchMode.External);
+        });
+
         public ICommand OnChangeResetData => new Command(async () =>
         {
             loggerService.StartMethod();
diff --git a/Covid19Radar/Covid19Radar/Views/ExposureCheck/ExposureCheckPage.xaml b/Covid19Radar/Covid19Radar/Views/ExposureCheck/ExposureCheckPage.xaml
deleted file mode 100644
index 4d1b0be53..000000000
--- a/Covid19Radar/Covid19Radar/Views/ExposureCheck/ExposureCheckPage.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<ContentPage
-    x:Class="Covid19Radar.Views.ExposureCheckPage"
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
-    xmlns:prism="http://prismlibrary.com"
-    xmlns:resources="clr-namespace:Covid19Radar.Resources"
-    xmlns:views="clr-namespace:Covid19Radar.Views"
-    Title="{x:Static resources:AppResources.ExposureCheckTitle}"
-    ios:Page.UseSafeArea="true"
-    prism:ViewModelLocator.AutowireViewModel="True"
-    Style="{StaticResource DefaultPageStyle}"
-    Visual="Material">
-        <StackLayout Style="{StaticResource DefaultStackLayout}">
-            <views:NoRiskContactLayout
-                IsVisible="{Binding IsVisibleNoRiskContact}" />
-            <views:LowRiskContactLayout
-                IsVisible="{Binding IsVisibleLowRiskContact}" />
-        </StackLayout>
-
-</ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/ExposureCheck/LowRiskContactLayout.xaml b/Covid19Radar/Covid19Radar/Views/ExposureCheck/LowRiskContactLayout.xaml
deleted file mode 100644
index 503824893..000000000
--- a/Covid19Radar/Covid19Radar/Views/ExposureCheck/LowRiskContactLayout.xaml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<StackLayout
-    x:Class="Covid19Radar.Views.LowRiskContactLayout"
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
-    xmlns:resources="clr-namespace:Covid19Radar.Resources"
-    xmlns:ffimageloading="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
-    ios:Page.UseSafeArea="true"
-    Style="{StaticResource DefaultStackLayout}"
-    Visual="Material"
-    BackgroundColor="#FFFFFF"
-    Spacing="10">
-    <CollectionView
-        VerticalOptions="FillAndExpand"
-        BackgroundColor="#FFFFFF"
-        ItemsSource="{Binding ExposureCheckScores}">
-        <CollectionView.Header>
-            <StackLayout
-                Padding="20, 20, 20, 10">
-                <Frame
-                    Padding="20"
-                    CornerRadius="10">
-        
-                    <StackLayout>
-                        <Label
-                            AutomationProperties.IsInAccessibleTree="True"
-                            TabIndex="1"
-                            Margin="0,0,0,10"
-                            HorizontalOptions="Center"
-                            Style="{StaticResource DefaultTitleLabel}">
-                            <Label.FormattedText>
-                                <FormattedString>
-                                    <Span Text="{x:Static resources:AppResources.LowRiskContactPageLabel}" />
-                                </FormattedString>
-                            </Label.FormattedText>
-                        </Label>
-                        <Label
-                            AutomationProperties.IsInAccessibleTree="True"
-                            TabIndex="2"
-                            HorizontalOptions="Center"
-                            Style="{StaticResource PrimaryText}">
-                                <Label.FormattedText>
-                                    <FormattedString>
-                                        <Span Text="{x:Static resources:AppResources.LowRiskContactPageDescription}" />
-                                    </FormattedString>
-                                </Label.FormattedText>
-                        </Label>
-                    </StackLayout>
-                </Frame>
-                <StackLayout
-                    Orientation="Horizontal"
-                    HorizontalOptions="StartAndExpand"
-                    Padding="0, 20, 0, 0"
-                    >
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        VerticalOptions="Center"
-                        Style="{StaticResource DefaultLabel}"
-                        Text="{x:Static resources:AppResources.LowRiskContactPageHeaderTextPrefix}"></Label>
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        VerticalOptions="Center"
-                        Style="{StaticResource DefaultLabelCaption}"
-                        Text="{Binding LowRiskContactPageHeaderTextSuffix}"
-                        ></Label>
-                </StackLayout>
-            </StackLayout>
-        </CollectionView.Header>
-        <CollectionView.ItemsLayout>
-            <LinearItemsLayout Orientation="Vertical" />
-        </CollectionView.ItemsLayout>
-        <CollectionView.ItemTemplate>
-            <DataTemplate>
-                <StackLayout
-                    Padding="20, 0, 20, 0"
-                    HorizontalOptions="FillAndExpand">
-                    <Frame Style="{StaticResource FrameCardViewStyle}">
-                        <StackLayout Style="{StaticResource DetailsStackLayout}">
-                            <Label
-                                Style="{StaticResource CardLabel}"
-                                Text="{Binding DateTimeString}"
-                                Margin="0, 0, 0, 10"
-                                />
-                            <Label
-                                Style="{StaticResource CardLabelSmall}"
-                                >
-                                <Label.FormattedText>
-                                    <FormattedString>
-                                        <Span Text="{Binding Description}" />
-                                    </FormattedString>
-                                </Label.FormattedText>
-                            </Label>
-                        </StackLayout>
-                    </Frame>
-                </StackLayout>
-            </DataTemplate>
-        </CollectionView.ItemTemplate>
-        <CollectionView.Footer>
-            <StackLayout
-                Padding="20">
-                <Label
-                    Style="{StaticResource DefaultLabelCaptionStartAlignment}"
-                    Text="{Binding LowRiskContactPageAnnotationDecription}" />
-            </StackLayout>
-        </CollectionView.Footer>
-    </CollectionView>
-</StackLayout>
diff --git a/Covid19Radar/Covid19Radar/Views/ExposureCheck/LowRiskContactLayout.xaml.cs b/Covid19Radar/Covid19Radar/Views/ExposureCheck/LowRiskContactLayout.xaml.cs
deleted file mode 100644
index 4222879ce..000000000
--- a/Covid19Radar/Covid19Radar/Views/ExposureCheck/LowRiskContactLayout.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace Covid19Radar.Views
-{
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class LowRiskContactLayout : StackLayout
-    {
-        public LowRiskContactLayout()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Covid19Radar/Covid19Radar/Views/ExposureCheck/NoRiskContactLayout.xaml b/Covid19Radar/Covid19Radar/Views/ExposureCheck/NoRiskContactLayout.xaml
deleted file mode 100644
index 5c51692c4..000000000
--- a/Covid19Radar/Covid19Radar/Views/ExposureCheck/NoRiskContactLayout.xaml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<StackLayout
-    x:Class="Covid19Radar.Views.NoRiskContactLayout"
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:ffimageloading="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
-    xmlns:resources="clr-namespace:Covid19Radar.Resources;assembly=Covid19Radar"
-    Style="{StaticResource DefaultPageStyle}"
-    Visual="Material">
-    <Grid Style="{StaticResource DefaultGridLayout}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <StackLayout Grid.Row="0">
-            <Label
-                AutomationProperties.IsInAccessibleTree="True"
-                TabIndex="1"
-                HorizontalOptions="Center"
-                Style="{StaticResource DefaultTitleLabel}">
-                <Label.FormattedText>
-                    <FormattedString>
-                        <Span Text="{x:Static resources:AppResources.NoRiskContactPageLabel}" />
-                    </FormattedString>
-                </Label.FormattedText>
-            </Label>
-            <Label
-                AutomationProperties.IsInAccessibleTree="True"
-                TabIndex="2"
-                Margin="0,10,0,0"
-                HorizontalOptions="Center"
-                Style="{StaticResource DefaultLabel}">
-                <Label.FormattedText>
-                    <FormattedString>
-                        <Span Text="{x:Static resources:AppResources.NoRiskContactPageDescription}" />
-                    </FormattedString>
-                </Label.FormattedText>
-            </Label>
-        </StackLayout>
-        <Grid Grid.Row="1">
-            <Button
-                AutomationProperties.IsInAccessibleTree="True"
-                TabIndex="3"
-                Command="{Binding Path=OnClickShareApp}"
-                Style="{StaticResource DefaultButton}"
-                Text="{x:Static resources:AppResources.NoRiskContactPageButtonText}" />
-        </Grid>
-    </Grid>
-</StackLayout>
diff --git a/Covid19Radar/Covid19Radar/Views/ExposureCheck/NoRiskContactLayout.xaml.cs b/Covid19Radar/Covid19Radar/Views/ExposureCheck/NoRiskContactLayout.xaml.cs
deleted file mode 100644
index ec6bbfe1e..000000000
--- a/Covid19Radar/Covid19Radar/Views/ExposureCheck/NoRiskContactLayout.xaml.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace Covid19Radar.Views
-{
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class NoRiskContactLayout : StackLayout
-    {
-        public NoRiskContactLayout()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/InqueryPage.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/InqueryPage.xaml
index 506de2159..1889a7207 100644
--- a/Covid19Radar/Covid19Radar/Views/HelpPage/InqueryPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HelpPage/InqueryPage.xaml
@@ -22,84 +22,100 @@
     <ContentView>
     <ScrollView>
         <StackLayout
-            Padding="10"
             BackgroundColor="{StaticResource Background}"
             Spacing="0">
-            <Frame Padding="10" HasShadow="False">
-                <Button
-                    AutomationProperties.IsInAccessibleTree="True"
-                    TabIndex="1"
-                    Command="{Binding Path=OnClickQuestionCommand}"
-                    Style="{StaticResource DefaultButton}"
-                    Text="{x:Static resources:AppResources.InqueryPageButton1}" />
-            </Frame>
-            <BoxView Style="{StaticResource DefaultLineStyle}" />
-            <Frame Padding="10" HasShadow="False">
-                <StackLayout Spacing="10">
-                    <Button
-                        AutomationProperties.IsInAccessibleTree="True"
-                        TabIndex="2"
-                        Command="{Binding Path=OnClickEmailCommand}"
-                        Style="{StaticResource DefaultButton}"
-                        Text="{x:Static resources:AppResources.InqueryPageButton2}" />
-                </StackLayout>
-            </Frame>
+
             <BoxView Style="{StaticResource DefaultLineStyle}" />
-            <Frame Padding="10" HasShadow="False">
-                <StackLayout Spacing="10">
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        TabIndex="3"
-                        Style="{StaticResource DefaultLabelSmall}">
-                        <Label.FormattedText>
-                            <FormattedString>
-                                <Span
-                                    FontAttributes="Bold"
-                                    FontSize="Small"
-                                    Text="{x:Static resources:AppResources.InqueryPageDescription1}" />
-                                <Span Text="{x:Static x:Environment.NewLine}" />
-                                <Span Text="{x:Static resources:AppResources.InqueryPageDescription2}" />
-                            </FormattedString>
-                        </Label.FormattedText>
-                    </Label>
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        TabIndex="4"
-                        Style="{StaticResource AnnotationLabel}">
-                        <Label.FormattedText>
-                            <FormattedString>
-                                <Span Text="{x:Static resources:AppResources.AnnotationSymbol}"/>
-                                <Span Text="{x:Static resources:AppResources.CocoaAnnotationText}"/>
-                            </FormattedString>
-                        </Label.FormattedText>
-                    </Label>
-                    <Button
-                        AutomationProperties.IsInAccessibleTree="True"
-                        TabIndex="5"
-                        Command="{Binding Path=OnClickSendLogCommand}"
-                        Style="{StaticResource DefaultButton}"
-                        Text="{x:Static resources:AppResources.InqueryPageButton3}" />
-                </StackLayout>
-            </Frame>
+
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="1"
+                Margin="15, 20, 15, 15"
+                Style="{StaticResource DefaultLabel}"
+                Text="{x:Static resources:AppResources.InqueryBeta}" />
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="2"
+                Margin="15, 5"
+                Style="{StaticResource DefaultLabelSmall}"
+                TextColor="{StaticResource SecondaryText}"
+                Text="{x:Static resources:AppResources.InqueryBeta_Description1}" />
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="3"
+                Margin="15, 5"
+                Style="{StaticResource DefaultLabelSmall}"
+                TextColor="{StaticResource SecondaryText}"
+                Text="{x:Static resources:AppResources.InqueryBeta_Description2}" />
+            <Button
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="4"
+                Margin="20, 15, 20, 20"
+                Command="{Binding OnClickUseStable}"
+                Style="{StaticResource DefaultButton}"
+                Text="{x:Static resources:AppResources.InqueryBeta_InstallStable}" />
+
             <BoxView Style="{StaticResource DefaultLineStyle}" />
-            <Frame Padding="10" HasShadow="False">
-                <Frame.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding Path=OnClickAboutAppCommand}" />
-                </Frame.GestureRecognizers>
-                <StackLayout Spacing="0">
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        TabIndex="6"
-                        Style="{StaticResource DefaultLabelSmall}"
-                        Text="{x:Static resources:AppResources.InqueryPageDescription3}" />
-                    <Label
-                        AutomationProperties.IsInAccessibleTree="True"
-                        TabIndex="7"
-                        Style="{StaticResource LinkLabelStyleSmall}"
-                        Text="https://www.mhlw.go.jp/stf/seisakunitsuite/bunya/cocoa_00138.html" />
-                </StackLayout>
-            </Frame>
+
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="5"
+                Margin="15, 20, 15, 15"
+                Style="{StaticResource DefaultLabel}"
+                Text="{x:Static resources:AppResources.InqueryBeta_DeveloperCommunity}" />
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="6"
+                Margin="15, 5"
+                Style="{StaticResource DefaultLabelSmall}"
+                TextColor="{StaticResource SecondaryText}"
+                Text="{x:Static resources:AppResources.InqueryBeta_Community_Description1}" />
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="7"
+                Margin="15, 5"
+                Style="{StaticResource DefaultLabelSmall}"
+                TextColor="{StaticResource SecondaryText}"
+                Text="{x:Static resources:AppResources.InqueryBeta_Community_Description2}" />
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="8"
+                Margin="15, 5"
+                Style="{StaticResource DefaultLabelSmall}"
+                Text="{x:Static resources:AppResources.UrlGitHubRepository}" />
+
+            <Button
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="9"
+                Margin="20, 15, 20, 20"
+                Command="{Binding OpenGitHub}"
+                Style="{StaticResource DefaultButton}"
+                Text="{x:Static resources:AppResources.InqueryBetaViaGitHub}" />
+
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="10"
+                Margin="15, 15"
+                Style="{StaticResource DefaultLabelSmall}"
+                Text="{x:Static resources:AppResources.InqueryBeta_Community_Description3}" />
+
+            <Button
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="11"
+                Margin="20, 15, 20, 20"
+                Command="{Binding OnClickShareLogCommand}"
+                Style="{StaticResource DefaultButton}"
+                Text="{x:Static resources:AppResources.InqueryBetaShareLog}" />
+
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="12"
+                Margin="15, 15"
+                Style="{StaticResource DefaultLabelSmall}"
+                Text="{x:Static resources:AppResources.InqueryBeta_Community_Description4}" />
+
             <BoxView Style="{StaticResource DefaultLineStyle}" />
+
         </StackLayout>
     </ScrollView>
     </ContentView>
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogConfirmationPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogConfirmationPage.xaml.cs
index bbc95ad71..db838b812 100644
--- a/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogConfirmationPage.xaml.cs
+++ b/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogConfirmationPage.xaml.cs
@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+using Prism.Navigation;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 
@@ -10,9 +11,28 @@ namespace Covid19Radar.Views
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class SendLogConfirmationPage : ContentPage
     {
+        public const string LogIdKey = "logIdKey";
+        public const string ZipFilePathKey = "zipFilePathKey";
+
         public SendLogConfirmationPage()
         {
             InitializeComponent();
         }
+
+        public static INavigationParameters BuildNavigationParams(
+            string logId,
+            string zipFilePath,
+            INavigationParameters? baseParam = null
+            )
+        {
+            var param = new NavigationParameters();
+            param.CopyFrom(baseParam);
+
+            param.Add(LogIdKey, logId);
+            param.Add(ZipFilePathKey, zipFilePath);
+
+            return param;
+        }
+
     }
 }
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
index 34fb26df9..664c55692 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
@@ -31,17 +31,14 @@
                 BackgroundColor="#FFF3DD"
                 CornerRadius="10">
                 <StackLayout>
-                    <ffimageloading:CachedImage
-                        AutomationProperties.IsInAccessibleTree="False"
-                        Margin="0,0,0,10"
-                        Aspect="AspectFit"
-                        Source="InfoMark.png" />
                     <Label
                         AutomationProperties.IsInAccessibleTree="True"
                         TabIndex="1"
-                        Margin="0,0,0,5"
+                        Margin="0,10,0,5"
                         Style="{StaticResource DefaultTitleLabel}"
-                        Text="{x:Static resources:AppResources.ContactedNotifyPageMainText}" />
+                        Text="{x:Static resources:AppResources.ContactedNotifyPageMainText}"
+                        >
+                    </Label>
                     <Label
                         AutomationProperties.IsInAccessibleTree="True"
                         TabIndex="2"
@@ -57,7 +54,7 @@
                     </Label>
                     <Label
                         AutomationProperties.IsInAccessibleTree="True"
-                        TabIndex="2"
+                        TabIndex="3"
                         Margin="0,0,0,5"
                         FontSize="Large"
                         HorizontalTextAlignment="Center"
@@ -68,41 +65,82 @@
                             </FormattedString>
                         </Label.FormattedText>
                     </Label>
+
                     <Button
                         AutomationProperties.IsInAccessibleTree="True"
-                        TabIndex="3"
+                        TabIndex="4"
                         Margin="0,0,0,20"
-                        Command="{Binding Path=OnClickByForm}"
+                        Command="{prism:NavigateTo 'ExposuresPage'}"
                         Style="{StaticResource DefaultButton}"
-                        Text="{x:Static resources:AppResources.ContactedNotifyPageButton2}" />
+                        Text="{x:Static resources:AppResources.ContactedNotifyPageButton1}" />
+
                     <Label
                         AutomationProperties.IsInAccessibleTree="True"
-                        TabIndex="4"
-                        Margin="0"
+                        TabIndex="5"
+                        Margin="0, 15, 0, 5"
+                        HorizontalTextAlignment="Start"
+                        Style="{StaticResource DefaultLabelSmall}"
+                        Text="{x:Static resources:AppResources.ContactedNotifyPageDescription2}" />
+
+                    <Label
+                        AutomationProperties.IsInAccessibleTree="True"
+                        TabIndex="6"
+                        Margin="5, 5, 0, 0"
+                        HorizontalTextAlignment="Start"
+                        Style="{StaticResource DefaultLabelSmall}"
+                        Text="{x:Static resources:AppResources.ContactedNotifyPageDescription3}" />
+
+                    <Label
+                        AutomationProperties.IsInAccessibleTree="True"
+                        TabIndex="7"
+                        Margin="5, 5, 0, 0"
+                        HorizontalTextAlignment="Start"
+                        Style="{StaticResource DefaultLabelSmall}"
+                        Text="{x:Static resources:AppResources.ContactedNotifyPageDescription4}" />
+
+                     <Label
+                        AutomationProperties.IsInAccessibleTree="True"
+                        TabIndex="8"
+                        Margin="5, 5, 0, 0"
+                        HorizontalTextAlignment="Start"
+                        Style="{StaticResource DefaultLabelSmall}"
+                        Text="{x:Static resources:AppResources.ContactedNotifyPageDescription5}" />
+
+                    <Label
+                        AutomationProperties.IsInAccessibleTree="True"
+                        TabIndex="9"
+                        Margin="0, 25, 0, 10"
                         HorizontalTextAlignment="Start"
                         Style="{StaticResource DefaultSubTitleLabel}"
                         Text="{x:Static resources:AppResources.ContactedNotifyPageDescription1}" />
+
                     <Label
                         AutomationProperties.IsInAccessibleTree="True"
-                        TabIndex="5"
-                        Margin="0, 10, 0, 0"
-                        Style="{StaticResource AnnotationLabel}"
-                        TextColor="{StaticResource PrimaryText}">
+                        TabIndex="10"
+                        Margin="0, 20, 0, 10"
+                        HorizontalTextAlignment="Start"
+                        Style="{StaticResource DefaultSubTitleLabel}"
+                        >
                         <Label.FormattedText>
                             <FormattedString>
                                 <Span Text="{x:Static resources:AppResources.AnnotationSymbol}"/>
-                                <Span Text="{x:Static resources:AppResources.ScreenshotAnnotationText}"/>
+                                <Span Text="{x:Static resources:AppResources.NotMedicalExpenses}"/>
                             </FormattedString>
                         </Label.FormattedText>
                     </Label>
+
+                    <Button
+                        AutomationProperties.IsInAccessibleTree="True"
+                        TabIndex="11"
+                        Margin="0,20,0,20"
+                        Command="{Binding Path=OnClickByForm}"
+                        Style="{StaticResource DefaultButton}"
+                        Text="{x:Static resources:AppResources.ContactedNotifyPageButton2}"
+                        IsVisible="false"
+                        />
+
                 </StackLayout>
             </Frame>
-            <Button
-                AutomationProperties.IsInAccessibleTree="True"
-                TabIndex="6"
-                Command="{prism:NavigateTo 'ExposuresPage'}"
-                Style="{StaticResource DefaultButton}"
-                Text="{x:Static resources:AppResources.ContactedNotifyPageButton1}" />
         </StackLayout>
     </ScrollView>
     </ContentView>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml
new file mode 100644
index 000000000..79a1d9bb7
--- /dev/null
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<ContentPage
+    x:Class="Covid19Radar.Views.ExposureCheckPage"
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
+    xmlns:prism="http://prismlibrary.com"
+    xmlns:resources="clr-namespace:Covid19Radar.Resources"
+    xmlns:ffimageloading="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
+    Title="{x:Static resources:AppResources.ExposureCheckTitle}"
+    ios:Page.UseSafeArea="true"
+    prism:ViewModelLocator.AutowireViewModel="True"
+    Style="{StaticResource DefaultPageStyle}"
+    Visual="Material">
+    <StackLayout Style="{StaticResource DefaultStackLayout}">
+        <CollectionView
+            VerticalOptions="FillAndExpand"
+            BackgroundColor="#EEEEEE"
+            ItemsSource="{Binding ExposureCheckScores}">
+            <CollectionView.Header>
+                <StackLayout>
+                    <ffimageloading:CachedImage
+                        AutomationProperties.IsInAccessibleTree="False"
+                        Margin="0,0,0,15"
+                        Aspect="AspectFill"
+                        Source="exposure_check_page_head.png" />
+                    <StackLayout
+                        Margin="20,20,20,10">
+                        <Label
+                            AutomationProperties.IsInAccessibleTree="True"
+                            TabIndex="1"
+                            Margin="0,0,0,20"
+                            HorizontalOptions="Center"
+                            Style="{StaticResource DefaultSubTitleLabel}"
+                            FontAttributes="Bold"
+                            >
+                            <Label.Triggers>
+                                <DataTrigger TargetType="Label" Binding="{Binding IsExposureDetected}" Value="False">
+                                    <Setter Property="Text" Value="{x:Static resources:AppResources.NoRiskContactPageLabel}" />
+                                </DataTrigger>
+                                <DataTrigger TargetType="Label" Binding="{Binding IsExposureDetected}" Value="True">
+                                    <Setter Property="Text" Value="{x:Static resources:AppResources.LowRiskContactPageLabel}" />
+                                </DataTrigger>
+                            </Label.Triggers>
+                        </Label>
+                        <Label
+                            AutomationProperties.IsInAccessibleTree="True"
+                            TabIndex="2"
+                            HorizontalOptions="Center"
+                            Style="{StaticResource PrimaryText}">
+                            <Label.Triggers>
+                                <DataTrigger TargetType="Label" Binding="{Binding IsExposureDetected}" Value="False">
+                                    <Setter Property="Text" Value="{x:Static resources:AppResources.NoRiskContactPageDescription}" />
+                                </DataTrigger>
+                                <DataTrigger TargetType="Label" Binding="{Binding IsExposureDetected}" Value="True">
+                                    <Setter Property="Text" Value="{x:Static resources:AppResources.LowRiskContactPageDescription}" />
+                                </DataTrigger>
+                            </Label.Triggers>
+                        </Label>
+                    </StackLayout>
+                    <StackLayout
+                        Orientation="Horizontal"
+                        HorizontalOptions="StartAndExpand"
+                        Padding="20, 10, 0, 10"
+                        IsVisible="{Binding IsExposureDetected}"
+                        >
+                        <Label
+                            AutomationProperties.IsInAccessibleTree="True"
+                            VerticalOptions="Center"
+                            Style="{StaticResource DefaultLabel}"
+                            FontAttributes="Bold"
+                            Text="{x:Static resources:AppResources.LowRiskContactPageHeaderTextPrefix}">
+                        </Label>
+                        <Label
+                            AutomationProperties.IsInAccessibleTree="True"
+                            VerticalOptions="Center"
+                            Style="{StaticResource DefaultLabelCaption}"
+                            Text="{Binding LowRiskContactPageHeaderTextSuffix}"
+                            >
+                        </Label>
+                    </StackLayout>
+                </StackLayout>
+            </CollectionView.Header>
+            <CollectionView.ItemsLayout>
+                <LinearItemsLayout Orientation="Vertical" />
+            </CollectionView.ItemsLayout>
+            <CollectionView.ItemTemplate>
+                <DataTemplate>
+                    <StackLayout
+                        Padding="20, 0, 20, 0"
+                        HorizontalOptions="FillAndExpand">
+                        <Frame Style="{StaticResource FrameCardViewStyle}">
+                            <StackLayout Style="{StaticResource DetailsStackLayout}">
+                                <Label
+                                    Style="{StaticResource CardLabel}"
+                                    Text="{Binding DateTimeString}"
+                                    Margin="0, 0, 0, 10"
+                                    />
+                                <Label
+                                    Style="{StaticResource CardLabelSmall}"
+                                    >
+                                    <Label.FormattedText>
+                                        <FormattedString>
+                                            <Span Text="{Binding Description}" />
+                                        </FormattedString>
+                                    </Label.FormattedText>
+                                </Label>
+                            </StackLayout>
+                            <Frame.Triggers>
+                                <DataTrigger TargetType="Frame" Binding="{Binding IsReceived}" Value="False">
+                                    <Setter Property="Style" Value="{StaticResource FrameCardViewStyle_Diabled}" />
+                                </DataTrigger>
+                                <DataTrigger TargetType="Frame" Binding="{Binding IsReceived}" Value="True">
+                                    <Setter Property="Style" Value="{StaticResource FrameCardViewStyle}" />
+                                </DataTrigger>
+                            </Frame.Triggers>
+                        </Frame>
+                    </StackLayout>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+            <CollectionView.Footer>
+                <StackLayout
+                    Padding="20"
+                    IsVisible="{Binding IsExposureDetected}"
+                    >
+                    <Label
+                        Style="{StaticResource AnnotationLabel}"
+                        TextColor="{StaticResource PrimaryText}">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="{x:Static resources:AppResources.AnnotationSymbol}"/>
+                                <Span Text="{Binding LowRiskContactPageAnnotationDecription}"/>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+
+                    <Label
+                        Margin="0, 10, 0, 0"
+                        Style="{StaticResource AnnotationLabel}"
+                        TextColor="{StaticResource PrimaryText}">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="{x:Static resources:AppResources.AnnotationSymbol}"/>
+                                <Span Text="{x:Static resources:AppResources.LowRiskContactPageAnnotationDecription2}"/>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                </StackLayout>
+            </CollectionView.Footer>
+        </CollectionView>
+    </StackLayout>
+</ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/ExposureCheck/ExposureCheckPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml.cs
similarity index 100%
rename from Covid19Radar/Covid19Radar/Views/ExposureCheck/ExposureCheckPage.xaml.cs
rename to Covid19Radar/Covid19Radar/Views/HomePage/ExposureCheckPage.xaml.cs
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml
index 0a37aa513..89590d2a8 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ExposuresPage.xaml
@@ -15,48 +15,74 @@
     prism:ViewModelLocator.AutowireViewModel="True"
     Style="{StaticResource DefaultPageStyle}"
     Visual="Material">
-    <StackLayout BackgroundColor="#FFFFFF" Style="{StaticResource DefaultStackLayout}">
-        <Label
-            Style="{StaticResource DefaultLabel}"
-            Text="{x:Static resources:AppResources.ExposuresPageLabel1}" />
-        <BoxView Style="{StaticResource DefaultLineStyle}" />
-        <CollectionView
-            BackgroundColor="#FFFFFF"
-            ItemsSource="{Binding Exposures}">
-            <CollectionView.ItemsLayout>
-                <LinearItemsLayout Orientation="Vertical" />
-            </CollectionView.ItemsLayout>
-            <CollectionView.ItemTemplate>
-                <DataTemplate>
-                    <StackLayout HorizontalOptions="FillAndExpand">
-                        <Frame Style="{StaticResource FrameCardViewStyle}">
-                            <StackLayout Style="{StaticResource DetailsStackLayout}">
-                                <Label
-                                    Style="{StaticResource CardLabelSmall}"
-                                    Text="{Binding ExposureDate}" />
-                                <Label
-                                    Style="{StaticResource CardLabelSmall}">
-                                    <Label.FormattedText>
-                                        <FormattedString>
-                                            <Span Text="{Binding Description}" />
-                                        </FormattedString>
-                                    </Label.FormattedText>
-                                </Label>
-                            </StackLayout>
-                        </Frame>
-                    </StackLayout>
-                </DataTemplate>
-            </CollectionView.ItemTemplate>
-            <CollectionView.EmptyView>
-                <StackLayout Orientation="Vertical">
-                    <Label
-                        Style="{DynamicResource DefaultSubSubTitleLabel}"
-                        Text="{x:Static resources:AppResources.ExposuresPageNoExposures}" />
-                    <Label
-                        Style="{DynamicResource DefaultLabelLittle}"
-                        Text="{x:Static resources:AppResources.ExposuresPageNoExposuresInfo}" />
+    <CollectionView
+        BackgroundColor="#FFFFFF"
+        ItemsSource="{Binding Exposures}"
+        >
+        <CollectionView.Header>
+            <StackLayout
+                Padding="20, 20, 20, 10"
+                >
+                <Label
+                    Style="{StaticResource DefaultLabel}"
+                    Text="{x:Static resources:AppResources.ExposuresPageLabel1}" />
+            </StackLayout>
+        </CollectionView.Header>
+
+        <CollectionView.ItemsLayout>
+            <LinearItemsLayout Orientation="Vertical" />
+        </CollectionView.ItemsLayout>
+        <CollectionView.ItemTemplate>
+            <DataTemplate>
+                <StackLayout
+                    HorizontalOptions="FillAndExpand"
+                    Padding="20, 0, 20, 0"
+                    >
+                    <Frame Style="{StaticResource FrameCardViewStyle}">
+                        <StackLayout Style="{StaticResource DetailsStackLayout}">
+                            <Label
+                                Style="{StaticResource CardLabelSmall}"
+                                Text="{Binding ExposureDate}"
+                                />
+                            <Label
+                                Style="{StaticResource CardLabelSmall}">
+                                <Label.FormattedText>
+                                    <FormattedString>
+                                        <Span Text="{Binding Description}" />
+                                    </FormattedString>
+                                </Label.FormattedText>
+                            </Label>
+                        </StackLayout>
+                    </Frame>
                 </StackLayout>
-            </CollectionView.EmptyView>
-        </CollectionView>
-    </StackLayout>
+            </DataTemplate>
+        </CollectionView.ItemTemplate>
+        <CollectionView.EmptyView>
+            <StackLayout Orientation="Vertical">
+                <Label
+                    Style="{DynamicResource DefaultSubSubTitleLabel}"
+                    Text="{x:Static resources:AppResources.ExposuresPageNoExposures}" />
+                <Label
+                    Style="{DynamicResource DefaultLabelLittle}"
+                    Text="{x:Static resources:AppResources.ExposuresPageNoExposuresInfo}" />
+            </StackLayout>
+        </CollectionView.EmptyView>
+        <CollectionView.Footer>
+            <StackLayout
+                Padding="20, 20, 20, 10"
+                >
+                <Label
+                    Margin="0, 10, 0, 0"
+                    Style="{StaticResource AnnotationLabel}"
+                    TextColor="{StaticResource PrimaryText}">
+                    <Label.FormattedText>
+                        <FormattedString>
+                            <Span Text="{x:Static resources:AppResources.AnnotationSymbol}"/>
+                            <Span Text="{x:Static resources:AppResources.ExposuresPageToUtcDescription}"/>
+                        </FormattedString>
+                    </Label.FormattedText>
+                </Label>
+            </StackLayout>
+        </CollectionView.Footer>
+    </CollectionView>
 </ContentPage>
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml
index 1f9c658d1..c0cf67192 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml
@@ -262,6 +262,42 @@
                 </Button.Triggers>
             </Button>
 
+            <!-- Copy from HelpPage/InqueryPage -->
+            <StackLayout
+                Margin="0, 20, 0, 0"
+                IsVisible="{Binding IsInqueryVisible}"
+                >
+                <BoxView Style="{StaticResource DefaultLineStyle}" />
+
+                <Label
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="18"
+                    Margin="15, 20, 15, 15"
+                    Style="{StaticResource DefaultLabel}"
+                    Text="{x:Static resources:AppResources.InqueryBeta}" />
+                <Label
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="19"
+                    Margin="15, 5"
+                    Style="{StaticResource DefaultLabelSmall}"
+                    TextColor="{StaticResource SecondaryText}"
+                    Text="{x:Static resources:AppResources.InqueryBeta_Description1}" />
+                <Label
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="20"
+                    Margin="15, 5"
+                    Style="{StaticResource DefaultLabelSmall}"
+                    TextColor="{StaticResource SecondaryText}"
+                    Text="{x:Static resources:AppResources.InqueryBeta_Description2}" />
+                <Button
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="21"
+                    Margin="20, 15, 20, 20"
+                    Command="{Binding OnClickUseStable}"
+                    Style="{StaticResource DefaultButton}"
+                    Text="{x:Static resources:AppResources.InqueryBeta_InstallStable}" />
+            </StackLayout>
+
             <Frame
                 Margin="0,25,0,15"
                 Padding="10"
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/SplashPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/SplashPage.xaml
index 48b9a0d2d..37123ab39 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/SplashPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/SplashPage.xaml
@@ -7,11 +7,116 @@
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Covid19Radar.Views.SplashPage"
-    BackgroundColor="White">
-    <ContentPage.Content>
-        <Image
-            AutomationProperties.IsInAccessibleTree="False"
-            Source="SplashImg.png"
-            VerticalOptions="CenterAndExpand" />
-    </ContentPage.Content>
-</ContentPage>
+    xmlns:ffimageloading="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
+    xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
+    xmlns:prism="http://prismlibrary.com"
+    xmlns:resources="clr-namespace:Covid19Radar.Resources;assembly=Covid19Radar"
+    Title="{x:Static resources:AppResources.AppName}"
+    ios:Page.UseSafeArea="true"
+    prism:ViewModelLocator.AutowireViewModel="True"
+    Style="{StaticResource DefaultPageStyle}"
+    Visual="Material">
+    <!--
+        Workaround for fixing ScrollView truncates items issue.
+        https://github.com/xamarin/Xamarin.Forms/issues/13597
+    -->
+    <ContentView>
+    <ScrollView>
+        <Grid Margin="20" Style="{StaticResource DefaultGridLayout}">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <StackLayout
+                Grid.Row="0"
+                Margin="0,0,0,10"
+                >
+                <Label
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="1"
+                    Margin="0,20,0,20"
+                    Style="{StaticResource DefaultTitleLabel}"
+                    Text="{x:Static resources:AppResources.Beta_Splash_WelcomeBeta}"
+                    />
+
+                <ffimageloading:CachedImage
+                    Margin="0,0,0,20"
+                    Aspect="AspectFit"
+                    Scale="0.9"
+                    Source="SplashImg.png"
+                    />
+
+                <Label
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="2"
+                    Style="{StaticResource DefaultLabel}"
+                    Margin="0,0,0,10"
+                    Text="{x:Static resources:AppResources.Beta_Splash_Description1}"
+                    />
+                <Label
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="3"
+                    Style="{StaticResource DefaultLabel}"
+                    Margin="0,0,0,10"
+                    Text="{x:Static resources:AppResources.Beta_Splash_Description2}"
+                    />
+
+                <Label
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="4"
+                    Style="{StaticResource DefaultLabel}"
+                    Margin="0,5,0,15"
+                    Text="{x:Static resources:AppResources.NotMedicalExpenses}"
+                    />
+
+                <Label
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="5"
+                    Style="{StaticResource DefaultLabel}"
+                    Margin="0,0,0,10"
+                    Text="{x:Static resources:AppResources.Beta_Splash_Description3}"
+                    />
+
+                <Label
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="6"
+                    Style="{StaticResource LinkLabelStyleMedium}"
+                    Margin="0,5,0,5"
+                    Text="{x:Static resources:AppResources.Beta_Splash_GitHub}">
+                    <Label.GestureRecognizers>
+                        <TapGestureRecognizer Command="{Binding OpenGitHub}" />
+                    </Label.GestureRecognizers>
+                </Label>
+                <Label
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="7"
+                    Margin="0,0,0,5"
+                    Style="{StaticResource DefaultLabelSmall}"
+                    Text="{x:Static resources:AppResources.Beta_Splash_GitHubAccountRequired}" />
+
+            </StackLayout>
+            <StackLayout
+                Grid.Row="1"
+                Margin="0,0,0,20"
+                >
+                <Button
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="8"
+                    Command="{Binding OnClickContinue}"
+                    Style="{StaticResource DefaultButton}"
+                    Text="{x:Static resources:AppResources.Beta_Splash_Acknowledge}"
+                    IsEnabled="{Binding EnableContinue}"
+                    />
+                <Button
+                    AutomationProperties.IsInAccessibleTree="True"
+                    TabIndex="9"
+                    Margin="0,10,0,0"
+                    Command="{Binding Path=OnClickUseStable}"
+                    Style="{StaticResource DefaultButton}"
+                    Text="{x:Static resources:AppResources.Beta_Splash_InstallStable}"
+                    />
+            </StackLayout>
+        </Grid>
+    </ScrollView>
+    </ContentView>
+</ContentPage>
\ No newline at end of file
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml
deleted file mode 100644
index 491393c64..000000000
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<ContentPage
-    x:Class="Covid19Radar.Views.ThankYouNotifyOtherPage"
-    xmlns="http://xamarin.com/schemas/2014/forms"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:ffimageloading="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
-    xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
-    xmlns:prism="http://prismlibrary.com"
-    xmlns:resources="clr-namespace:Covid19Radar.Resources;assembly=Covid19Radar"
-    NavigationPage.TitleIconImageSource="HeaderLogo.png"
-    ios:Page.UseSafeArea="true"
-    prism:ViewModelLocator.AutowireViewModel="True"
-    Style="{StaticResource DefaultPageStyle}"
-    Visual="Material">
-    <!--
-        Workaround for fixing ScrollView truncates items issue.
-        https://github.com/xamarin/Xamarin.Forms/issues/13597
-    -->
-    <ContentView>
-    <ScrollView>
-        <Grid Style="{StaticResource DefaultGridLayout}">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <StackLayout Grid.Row="0">
-                <ffimageloading:CachedImage Aspect="AspectFit" Source="TutorialPage60.png" />
-                <Label
-                    HorizontalOptions="Center"
-                    Style="{StaticResource DefaultTitleLabel}"
-                    Text="{x:Static resources:AppResources.AppName}" />
-                <Label
-                    HorizontalOptions="Center"
-                    Style="{StaticResource DefaultTitleLabel}"
-                    Text="{x:Static resources:AppResources.ThankYouNotifyOtherPageLabel1}" />
-
-                <Frame
-                    Padding="10"
-                    BackgroundColor="#FFF3DD"
-                    CornerRadius="10">
-                    <StackLayout Spacing="0">
-                        <Label Style="{StaticResource DefaultLabel}" Text="{x:Static resources:AppResources.ThankYouNotifyOtherPageDescription1}" />
-                    </StackLayout>
-                </Frame>
-            </StackLayout>
-            <Grid Grid.Row="1">
-                <Button
-                    AutomationId="OnClickShareApp"
-                    Command="{Binding Path=OnClickShareApp}"
-                    Style="{StaticResource DefaultButton}"
-                    Text="{x:Static resources:AppResources.NotContactPageButtonText}" />
-            </Grid>
-        </Grid>
-    </ScrollView>
-    </ContentView>
-</ContentPage>
\ No newline at end of file
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml.cs b/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml.cs
deleted file mode 100644
index b16023fae..000000000
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
-using Covid19Radar.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xamarin.Essentials;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace Covid19Radar.Views
-{
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ThankYouNotifyOtherPage : ContentPage
-    {
-        public ThankYouNotifyOtherPage()
-        {
-            InitializeComponent();
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/Covid19Radar/Covid19Radar/Views/Settings/DebugPage.xaml b/Covid19Radar/Covid19Radar/Views/Settings/DebugPage.xaml
index a063c4a36..0533f6fe7 100644
--- a/Covid19Radar/Covid19Radar/Views/Settings/DebugPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/Settings/DebugPage.xaml
@@ -200,10 +200,6 @@
                     Command="{prism:NavigateTo 'TermsofservicePage'}"
                     Style="{StaticResource DefaultButton}"
                     Text="TermsofservicePage" />
-                <Button
-                    Command="{prism:NavigateTo 'ThankYouNotifyOtherPage'}"
-                    Style="{StaticResource DefaultButton}"
-                    Text="ThankYouNotifyOtherPage" />
                 <Button
                     Command="{prism:NavigateTo 'NotifyOtherPage'}"
                     Style="{StaticResource DefaultButton}"
diff --git a/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml b/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml
index 9f2916c50..1e1b2cbfa 100644
--- a/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml
@@ -26,7 +26,9 @@
             Padding="0"
             BackgroundColor="{StaticResource Background}"
             Spacing="0">
+
             <BoxView Style="{StaticResource DefaultLineStyle}" />
+
             <Frame Padding="15" Margin="0, 10" HasShadow="False">
                 <Grid HorizontalOptions="FillAndExpand" RowSpacing="10">
                     <Grid.ColumnDefinitions>
@@ -54,36 +56,77 @@
                         Text="{Binding AppVer}" />
                 </Grid>
             </Frame>
+
             <BoxView Style="{StaticResource DefaultLineStyle}" />
-            <Button
-                AutomationProperties.IsInAccessibleTree="True"
-                TabIndex="3"
-                Margin="20"
-                Command="{prism:NavigateTo 'LicenseAgreementPage'}"
-                Style="{StaticResource DefaultButton}"
-                Text="{x:Static resources:AppResources.SettingsPageLicenseButton}" />
-            <BoxView Style="{StaticResource DefaultLineStyle}" />
+
             <Label
                 AutomationProperties.IsInAccessibleTree="True"
-                TabIndex="4"
+                TabIndex="3"
                 Margin="15, 20, 15, 15"
                 Style="{StaticResource DefaultLabel}"
                 Text="{x:Static resources:AppResources.SettingsPageReinitializeLabel}" />
             <Label
                 AutomationProperties.IsInAccessibleTree="True"
-                TabIndex="5"
+                TabIndex="4"
                 Margin="15, 0"
                 Style="{StaticResource DefaultLabelSmall}"
                 TextColor="{StaticResource SecondaryText}"
                 Text="{x:Static resources:AppResources.SettingsPageReinitializeDescription}" />
             <Button
                 AutomationProperties.IsInAccessibleTree="True"
-                TabIndex="6"
+                TabIndex="5"
                 Margin="20"
                 Command="{Binding OnChangeResetData}"
                 Style="{StaticResource DefaultButton}"
                 Text="{x:Static resources:AppResources.ButtonReset}" />
+
             <BoxView Style="{StaticResource DefaultLineStyle}" />
+
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="6"
+                Margin="15, 20, 15, 15"
+                Style="{StaticResource DefaultLabel}"
+                Text="{x:Static resources:AppResources.OpenSourceLicense}" />
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="7"
+                Margin="15, 0"
+                Style="{StaticResource DefaultLabelSmall}"
+                TextColor="{StaticResource SecondaryText}"
+                Text="{x:Static resources:AppResources.OpenSourceLicense_Description1}" />
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="8"
+                Margin="15, 0"
+                Style="{StaticResource DefaultLabelSmall}"
+                TextColor="{StaticResource SecondaryText}"
+                Text="{x:Static resources:AppResources.OpenSourceLicense_Description2}" />
+            <Label
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="9"
+                Margin="15, 5"
+                Style="{StaticResource DefaultLabelSmall}"
+                Text="{x:Static resources:AppResources.UrlGitHubRepository}" />
+
+            <Button
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="10"
+                Margin="20, 20, 20, 10"
+                Command="{Binding OpenGitHub}"
+                Style="{StaticResource DefaultButton}"
+                Text="{x:Static resources:AppResources.OpenSourceLicense_GetSourceCode}" />
+
+            <Button
+                AutomationProperties.IsInAccessibleTree="True"
+                TabIndex="11"
+                Margin="20, 10"
+                Command="{prism:NavigateTo 'LicenseAgreementPage'}"
+                Style="{StaticResource DefaultButton}"
+                Text="{x:Static resources:AppResources.SettingsPageLicenseButton}" />
+
+            <BoxView Style="{StaticResource DefaultLineStyle}" />
+
         </StackLayout>
     </ScrollView>
     </ContentView>
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/Logs/LogFileServiceTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/Logs/LogFileServiceTests.cs
index 36a0b2473..fd3428d4f 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/Logs/LogFileServiceTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/Logs/LogFileServiceTests.cs
@@ -35,7 +35,7 @@ public void LogUploadingFileName_Success()
             var logFileService = CreateDefaultLogFileService(mockILogPathService);
 
             var logId = logFileService.CreateLogId();
-            var fileName = logFileService.LogUploadingFileName(logId);
+            var fileName = logFileService.CreateZipFileName(logId);
             Assert.Equal(fileName, "cocoa_log_" + logId + ".zip");
         }
 
@@ -50,9 +50,9 @@ public void CreateLogUploadingFileToTmpPath_Success()
             RecreateDir(tmpDirPath);
 
             var logId = logFileService.CreateLogId();
-            var fileName = logFileService.LogUploadingFileName(logId);
-            var result = logFileService.CreateLogUploadingFileToTmpPath(fileName);
-            Assert.True(result);
+            var fileName = logFileService.CreateZipFileName(logId);
+            var result = logFileService.CreateZipFile(fileName);
+            Assert.Equal(Path.Combine(tmpDirPath, fileName), result);
 
             var uploadingFilePath = tmpDirPath + fileName;
             Assert.True(File.Exists(uploadingFilePath));
@@ -68,9 +68,9 @@ public void CreateLogUploadingFileToTmpPath_Log_Not_Exists()
             RecreateDir(tmpDirPath);
 
             var logId = logFileService.CreateLogId();
-            var fileName = logFileService.LogUploadingFileName(logId);
-            var result = logFileService.CreateLogUploadingFileToTmpPath(fileName);
-            Assert.False(result);
+            var fileName = logFileService.CreateZipFileName(logId);
+            var result = logFileService.CreateZipFile(fileName);
+            Assert.Null(result);
 
             var uploadingFilePath = tmpDirPath + fileName;
             Assert.False(File.Exists(uploadingFilePath));
@@ -86,9 +86,9 @@ public void CreateLogUploadingFileToTmpPath_LogDir_Not_Exists()
             RecreateDir(tmpDirPath);
 
             var logId = logFileService.CreateLogId();
-            var fileName = logFileService.LogUploadingFileName(logId);
-            var result = logFileService.CreateLogUploadingFileToTmpPath(fileName);
-            Assert.False(result);
+            var fileName = logFileService.CreateZipFileName(logId);
+            var result = logFileService.CreateZipFile(fileName);
+            Assert.Null(result);
 
             var uploadingFilePath = tmpDirPath + fileName;
             Assert.False(File.Exists(uploadingFilePath));
@@ -106,11 +106,12 @@ public void CopyLogUploadingFileToPublicPath_Success()
             RecreateDir(tmpDirPath);
 
             var logId = logFileService.CreateLogId();
-            var fileName = logFileService.LogUploadingFileName(logId);
-            var result = logFileService.CreateLogUploadingFileToTmpPath(fileName);
-            Assert.True(result);
-            result = logFileService.CopyLogUploadingFileToPublicPath(fileName);
-            Assert.True(result);
+            var fileName = logFileService.CreateZipFileName(logId);
+            var result = logFileService.CreateZipFile(fileName);
+            Assert.Equal(Path.Combine(tmpDirPath, fileName), result);
+
+            result = logFileService.CopyLogUploadingFileToPublicPath(Path.Combine(tmpDirPath, fileName));
+            Assert.Equal(Path.Combine(publicDirPath, fileName), result);
 
             var uploadingFilePath = publicDirPath + fileName;
             Assert.True(File.Exists(uploadingFilePath));
@@ -128,11 +129,12 @@ public void CopyLogUploadingFileToPublicPath_PublicDir_Not_Exists()
             RecreateDir(tmpDirPath);
 
             var logId = logFileService.CreateLogId();
-            var fileName = logFileService.LogUploadingFileName(logId);
-            var result = logFileService.CreateLogUploadingFileToTmpPath(fileName);
-            Assert.True(result);
-            result = logFileService.CopyLogUploadingFileToPublicPath(fileName);
-            Assert.False(result);
+            var fileName = logFileService.CreateZipFileName(logId);
+            var result = logFileService.CreateZipFile(fileName);
+            Assert.Equal(result, Path.Combine(tmpDirPath, fileName));
+
+            result = logFileService.CopyLogUploadingFileToPublicPath(Path.Combine(tmpDirPath, fileName));
+            Assert.Null(result);
 
             var uploadingFilePath = publicDirPath + fileName;
             Assert.False(File.Exists(uploadingFilePath));
@@ -145,9 +147,9 @@ public void CopyLogUploadingFileToPublicPath_TmpPath_Empty()
             var logFileService = CreateDefaultLogFileService(mockILogPathService);
 
             var logId = logFileService.CreateLogId();
-            var fileName = logFileService.LogUploadingFileName(logId);
+            var fileName = logFileService.CreateZipFileName(logId);
             var result = logFileService.CopyLogUploadingFileToPublicPath(fileName);
-            Assert.False(result);
+            Assert.Null(result);
 
             var uploadingFilePath = publicDirPath + fileName;
             Assert.False(File.Exists(uploadingFilePath));
@@ -160,9 +162,9 @@ public void CopyLogUploadingFileToPublicPath_PublicPath_Empty()
             var logFileService = CreateDefaultLogFileService(mockILogPathService);
 
             var logId = logFileService.CreateLogId();
-            var fileName = logFileService.LogUploadingFileName(logId);
+            var fileName = logFileService.CreateZipFileName(logId);
             var result = logFileService.CopyLogUploadingFileToPublicPath(fileName);
-            Assert.False(result);
+            Assert.Null(result);
 
             var uploadingFilePath = publicDirPath + fileName;
             Assert.False(File.Exists(uploadingFilePath));
@@ -179,12 +181,12 @@ public void DeleteAllLogUploadingFiles_Success()
             RecreateDir(tmpDirPath);
 
             var logId = logFileService.CreateLogId();
-            var fileName = logFileService.LogUploadingFileName(logId);
-            var result = logFileService.CreateLogUploadingFileToTmpPath(fileName);
-            Assert.True(result);
+            var fileName = logFileService.CreateZipFileName(logId);
+            var result = logFileService.CreateZipFile(fileName);
+            Assert.Equal(Path.Combine(tmpDirPath, fileName), result);
 
-            result = logFileService.DeleteAllLogUploadingFiles();
-            Assert.True(result);
+            bool deleteResult = logFileService.DeleteAllLogUploadingFiles();
+            Assert.True(deleteResult);
 
             var uploadingFilePath = tmpDirPath + fileName;
             Assert.False(File.Exists(uploadingFilePath));
@@ -211,14 +213,14 @@ public void DeleteAllLogUploadingFiles_TmpDir_Not_Exists()
             RecreateDir(tmpDirPath);
 
             var logId = logFileService.CreateLogId();
-            var fileName = logFileService.LogUploadingFileName(logId);
-            var result = logFileService.CreateLogUploadingFileToTmpPath(fileName);
-            Assert.True(result);
+            var fileName = logFileService.CreateZipFileName(logId);
+            var result = logFileService.CreateZipFile(fileName);
+            Assert.Equal(Path.Combine(tmpDirPath, fileName), result);
 
             DeleteDirIfExists(tmpDirPath);
 
-            result = logFileService.DeleteAllLogUploadingFiles();
-            Assert.False(result);
+            bool deleteResult = logFileService.DeleteAllLogUploadingFiles();
+            Assert.False(deleteResult);
         }
 
         [Fact]
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/Logs/LogUploadServiceTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/Logs/LogUploadServiceTests.cs
index 590525b2d..f396ff885 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/Logs/LogUploadServiceTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/Logs/LogUploadServiceTests.cs
@@ -46,17 +46,18 @@ public async void UploadAsyncTests_Success()
             var testZipFileName = "zip-file.zip";
             var testTmpPath = Path.Combine("log", "tmp", "path");
             var testSasToken = "test-sas-token";
+            var testZipFilePath = Path.Combine(testTmpPath, testZipFileName);
 
             mockHttpDataService.Setup(x => x.GetLogStorageSas()).ReturnsAsync(new ApiResponse<LogStorageSas>(200, new LogStorageSas { SasToken = testSasToken }));
 
             mockLogPathService.Setup(x => x.LogUploadingTmpPath).Returns(testTmpPath);
-            mockStorageService.Setup(x => x.UploadAsync("https://LOG_STORAGE_URL_BASE/", "LOG_STORAGE_CONTAINER_NAME", "LOG_STORAGE_ACCOUNT_NAME", testSasToken, Path.Combine(testTmpPath, testZipFileName))).ReturnsAsync(true);
+            mockStorageService.Setup(x => x.UploadAsync("https://LOG_STORAGE_URL_BASE/", "LOG_STORAGE_CONTAINER_NAME", "LOG_STORAGE_ACCOUNT_NAME", testSasToken, testZipFilePath)).ReturnsAsync(true);
 
-            var result = await unitUnderTest.UploadAsync(testZipFileName);
+            var result = await unitUnderTest.UploadAsync(testZipFilePath);
 
             Assert.True(result);
             mockHttpDataService.Verify(x => x.GetLogStorageSas(), Times.Once());
-            mockStorageService.Verify(x => x.UploadAsync("https://LOG_STORAGE_URL_BASE/", "LOG_STORAGE_CONTAINER_NAME", "LOG_STORAGE_ACCOUNT_NAME", testSasToken, Path.Combine(testTmpPath, testZipFileName)), Times.Once());
+            mockStorageService.Verify(x => x.UploadAsync("https://LOG_STORAGE_URL_BASE/", "LOG_STORAGE_CONTAINER_NAME", "LOG_STORAGE_ACCOUNT_NAME", testSasToken, testZipFilePath), Times.Once());
         }
 
         [Theory]
@@ -86,13 +87,14 @@ public async void UploadAsyncTests_UploadAsyncFailure()
             var testZipFileName = "zip-file.zip";
             var testTmpPath = Path.Combine("log", "tmp", "path");
             var testSasToken = "test-sas-token";
+            var testZipFilePath = Path.Combine(testTmpPath, testZipFileName);
 
             mockHttpDataService.Setup(x => x.GetLogStorageSas()).ReturnsAsync(new ApiResponse<LogStorageSas>(200, new LogStorageSas { SasToken = testSasToken }));
 
             mockLogPathService.Setup(x => x.LogUploadingTmpPath).Returns(testTmpPath);
             mockStorageService.Setup(x => x.UploadAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).ReturnsAsync(false);
 
-            var result = await unitUnderTest.UploadAsync(testZipFileName);
+            var result = await unitUnderTest.UploadAsync(testZipFilePath);
 
             Assert.False(result);
             mockHttpDataService.Verify(x => x.GetLogStorageSas(), Times.Once());
@@ -107,11 +109,12 @@ public async void UploadAsyncTests_UnexpectedError()
             var testZipFileName = "zip-file.zip";
             var testTmpPath = Path.Combine("log", "tmp", "path");
             var testSasToken = "test-sas-token";
+            var testZipFilePath = Path.Combine(testTmpPath, testZipFileName);
 
             mockHttpDataService.Setup(x => x.GetLogStorageSas()).ReturnsAsync(new ApiResponse<LogStorageSas>(200, new LogStorageSas { SasToken = testSasToken }));
-            mockStorageService.Setup(x => x.UploadAsync("https://LOG_STORAGE_URL_BASE/", "LOG_STORAGE_CONTAINER_NAME", "LOG_STORAGE_ACCOUNT_NAME", testSasToken, Path.Combine(testTmpPath, testZipFileName))).ReturnsAsync(false);
+            mockStorageService.Setup(x => x.UploadAsync("https://LOG_STORAGE_URL_BASE/", "LOG_STORAGE_CONTAINER_NAME", "LOG_STORAGE_ACCOUNT_NAME", testSasToken, testZipFilePath)).ReturnsAsync(false);
 
-            var result = await unitUnderTest.UploadAsync(testZipFileName);
+            var result = await unitUnderTest.UploadAsync(testZipFilePath);
 
             Assert.False(result);
         }
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/InqueryPageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/InqueryPageViewModelTests.cs
index b95cf2ebe..19db38a35 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/InqueryPageViewModelTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/InqueryPageViewModelTests.cs
@@ -4,6 +4,8 @@
 
 using System;
 using System.Threading.Tasks;
+using Acr.UserDialogs;
+using Covid19Radar.Services;
 using Covid19Radar.Services.Logs;
 using Covid19Radar.ViewModels;
 using Moq;
@@ -18,20 +20,34 @@ public class InqueryPageViewModelTests
         private readonly MockRepository mockRepository;
         private readonly Mock<INavigationService> mockNavigationService;
         private readonly Mock<ILoggerService> mockLoggerService;
+        private readonly Mock<ILogFileService> mockLogFileService;
+        private readonly Mock<ILogPathService> mockLogPathService;
+        private readonly Mock<IEssentialsService> mockEssentialService;
 
+        private readonly Mock<IUserDialogs> mockUserDialogs;
 
         public InqueryPageViewModelTests()
         {
             mockRepository = new MockRepository(MockBehavior.Default);
             mockNavigationService = mockRepository.Create<INavigationService>();
             mockLoggerService = mockRepository.Create<ILoggerService>();
+            mockLogFileService = mockRepository.Create<ILogFileService>();
+            mockLogPathService = mockRepository.Create<ILogPathService>();
+            mockEssentialService = mockRepository.Create<IEssentialsService>();
+
+            mockUserDialogs = mockRepository.Create<IUserDialogs>();
+            UserDialogs.Instance = mockUserDialogs.Object;
         }
 
         private InqueryPageViewModel CreateViewModel()
         {
             var vm = new InqueryPageViewModel(
                 mockNavigationService.Object,
-                mockLoggerService.Object);
+                mockLoggerService.Object,
+                mockLogFileService.Object,
+                mockLogPathService.Object,
+                mockEssentialService.Object
+                );
             return vm;
         }
 
@@ -62,12 +78,66 @@ public void OnClickQuestionCommandTests()
         [Fact]
         public void OnClickSendLogCommandTests()
         {
+            mockLogFileService.Setup(x => x.CreateZipFile(It.IsAny<string>()))
+                .Returns("dummyFile");
+
+            var unitUnderTest = CreateViewModel();
+            unitUnderTest.Initialize(new NavigationParameters());
+
+            unitUnderTest.OnClickSendLogCommand.Execute(null);
+
+            mockNavigationService.Verify(x => x.NavigateAsync("SendLogConfirmationPage", It.IsAny<INavigationParameters>()), Times.Once());
+        }
+
+        [Fact]
+        public void OnClickSendLogCommand_CreateZipSuccess()
+        {
+            var testLogId = "test-log-id";
+            mockLogFileService.Setup(x => x.CreateLogId()).Returns(testLogId);
+
+            var testZipFileName = "test-zip-file-name";
+            mockLogFileService.Setup(x => x.CreateZipFileName(testLogId)).Returns(testZipFileName);
+            var testPublicZipFileName = "test-public-zip-file-name";
+            mockLogFileService.Setup(x => x.CreateZipFile(testZipFileName)).Returns(testPublicZipFileName);
+
             var unitUnderTest = CreateViewModel();
             unitUnderTest.Initialize(new NavigationParameters());
 
             unitUnderTest.OnClickSendLogCommand.Execute(null);
 
-            mockNavigationService.Verify(x => x.NavigateAsync("SendLogConfirmationPage"), Times.Once());
+            mockLogFileService.Verify(x => x.CreateLogId(), Times.Once());
+            mockLogFileService.Verify(x => x.CreateZipFileName(testLogId), Times.Once());
+            mockLogFileService.Verify(x => x.CreateZipFile(testZipFileName), Times.Once());
+
+            mockUserDialogs.Verify(x => x.ShowLoading(It.IsAny<string>(), null), Times.Once());
+            mockUserDialogs.Verify(x => x.HideLoading(), Times.Once());
+            mockUserDialogs.Verify(x => x.AlertAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), null), Times.Never());
+
+            mockNavigationService.Verify(x => x.NavigateAsync(It.IsAny<string>()), Times.Never());
+        }
+
+        [Fact]
+        public void OnClickSendLogCommand_CreateZipFailure()
+        {
+            var testLogId = "test-log-id";
+            mockLogFileService.Setup(x => x.CreateLogId()).Returns(testLogId);
+
+            var testZipFileName = "test-zip-file-name";
+            mockLogFileService.Setup(x => x.CreateZipFileName(testLogId)).Returns(testZipFileName);
+            mockLogFileService.Setup(x => x.CreateZipFile(testZipFileName)).Returns<string>(null);
+
+            var unitUnderTest = CreateViewModel();
+            unitUnderTest.Initialize(new NavigationParameters());
+
+            unitUnderTest.OnClickSendLogCommand.Execute(null);
+
+            mockLogFileService.Verify(x => x.CreateLogId(), Times.Once());
+            mockLogFileService.Verify(x => x.CreateZipFileName(testLogId), Times.Once());
+            mockLogFileService.Verify(x => x.CreateZipFile(testZipFileName), Times.Once());
+
+            mockUserDialogs.Verify(x => x.ShowLoading(It.IsAny<string>(), null), Times.Once());
+            mockUserDialogs.Verify(x => x.HideLoading(), Times.Once());
+            mockUserDialogs.Verify(x => x.AlertAsync(It.IsAny<string>(), It.IsAny<string>(), "OK", null), Times.Once());
         }
 
         [Fact]
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/SendLogConfirmationPageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/SendLogConfirmationPageViewModelTests.cs
index c2312ce74..f06cb0973 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/SendLogConfirmationPageViewModelTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/SendLogConfirmationPageViewModelTests.cs
@@ -2,12 +2,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-using System;
-using System.IO;
-using System.Threading.Tasks;
 using Acr.UserDialogs;
 using Covid19Radar.Services.Logs;
 using Covid19Radar.ViewModels;
+using Covid19Radar.Views;
 using Moq;
 using Prism.Navigation;
 using Xamarin.Forms;
@@ -23,7 +21,6 @@ public class SendLogConfirmationPageViewModelTests
         private readonly Mock<ILogFileService> mockLogFileService;
         private readonly Mock<ILoggerService> mockLoggerService;
         private readonly Mock<ILogUploadService> mockLogUploadService;
-        private readonly Mock<ILogPathService> mockLogPathService;
 
         public SendLogConfirmationPageViewModelTests()
         {
@@ -36,70 +33,18 @@ public SendLogConfirmationPageViewModelTests()
             mockLogFileService = mockRepository.Create<ILogFileService>();
             mockLoggerService = mockRepository.Create<ILoggerService>();
             mockLogUploadService = mockRepository.Create<ILogUploadService>();
-            mockLogPathService = mockRepository.Create<ILogPathService>();
         }
 
         private SendLogConfirmationPageViewModel CreateViewModel()
         {
             var vm = new SendLogConfirmationPageViewModel(
                 mockNavigationService.Object,
-                mockLogFileService.Object,
                 mockLoggerService.Object,
-                mockLogUploadService.Object,
-                mockLogPathService.Object)
-            {
-                BeginInvokeOnMainThread = new Action<Action>((a) => { a.Invoke(); }),
-                TaskRun = new Func<Action, Task>((a) => { a.Invoke(); return Task.CompletedTask; })
-            };
-            return vm;
-        }
-
-        [Fact]
-        public void InitializeTests_CreateZipSuccess()
-        {
-            var testLogId = "test-log-id";
-            mockLogFileService.Setup(x => x.CreateLogId()).Returns(testLogId);
-
-            var testZipFileName = "test-zip-file-name";
-            mockLogFileService.Setup(x => x.LogUploadingFileName(testLogId)).Returns(testZipFileName);
-            mockLogFileService.Setup(x => x.CreateLogUploadingFileToTmpPath(testZipFileName)).Returns(true);
-
-            var unitUnderTest = CreateViewModel();
-            unitUnderTest.Initialize(new NavigationParameters());
-
-            mockLogFileService.Verify(x => x.CreateLogId(), Times.Once());
-            mockLogFileService.Verify(x => x.LogUploadingFileName(testLogId), Times.Once());
-            mockLogFileService.Verify(x => x.CreateLogUploadingFileToTmpPath(testZipFileName), Times.Once());
-
-            mockUserDialogs.Verify(x => x.ShowLoading(It.IsAny<string>(), null), Times.Once());
-            mockUserDialogs.Verify(x => x.HideLoading(), Times.Once());
-            mockUserDialogs.Verify(x => x.AlertAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), null), Times.Never());
-
-            mockNavigationService.Verify(x => x.NavigateAsync(It.IsAny<string>()), Times.Never());
-        }
-
-        [Fact]
-        public void InitializeTests_CreateZipFailure()
-        {
-            var testLogId = "test-log-id";
-            mockLogFileService.Setup(x => x.CreateLogId()).Returns(testLogId);
-
-            var testZipFileName = "test-zip-file-name";
-            mockLogFileService.Setup(x => x.LogUploadingFileName(testLogId)).Returns(testZipFileName);
-            mockLogFileService.Setup(x => x.CreateLogUploadingFileToTmpPath(testZipFileName)).Returns(false);
-
-            var unitUnderTest = CreateViewModel();
-            unitUnderTest.Initialize(new NavigationParameters());
-
-            mockLogFileService.Verify(x => x.CreateLogId(), Times.Once());
-            mockLogFileService.Verify(x => x.LogUploadingFileName(testLogId), Times.Once());
-            mockLogFileService.Verify(x => x.CreateLogUploadingFileToTmpPath(testZipFileName), Times.Once());
-
-            mockUserDialogs.Verify(x => x.ShowLoading(It.IsAny<string>(), null), Times.Once());
-            mockUserDialogs.Verify(x => x.HideLoading(), Times.Once());
-            mockUserDialogs.Verify(x => x.AlertAsync(It.IsAny<string>(), It.IsAny<string>(), "OK", null), Times.Once());
+                mockLogFileService.Object,
+                mockLogUploadService.Object
+                );
 
-            mockNavigationService.Verify(x => x.GoBackAsync(), Times.Once());
+            return vm;
         }
 
         [Fact]
@@ -109,14 +54,14 @@ public void OnClickConfirmLogCommandTests_Success()
             mockLogFileService.Setup(x => x.CreateLogId()).Returns(testLogId);
 
             var testZipFileName = "test-zip-file-name";
-            mockLogFileService.Setup(x => x.LogUploadingFileName(testLogId)).Returns(testZipFileName);
-            mockLogFileService.Setup(x => x.CreateLogUploadingFileToTmpPath(testZipFileName)).Returns(true);
-            mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(true);
-
-            mockLogPathService.Setup(x => x.LogUploadingPublicPath).Returns("dummy_log_uploading_public_path");
+            mockLogFileService.Setup(x => x.CreateZipFileName(testLogId)).Returns(testZipFileName);
+            var testPublicZipFileName = "test-public-zip-file-name";
+            mockLogFileService.Setup(x => x.CreateZipFile(testZipFileName)).Returns(testPublicZipFileName);
+            var testPublicZipFilePath = "test-public-zip-file-path";
+            mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(testPublicZipFilePath);
 
             var unitUnderTest = CreateViewModel();
-            unitUnderTest.Initialize(new NavigationParameters());
+            unitUnderTest.Initialize(SendLogConfirmationPage.BuildNavigationParams(testLogId, testPublicZipFilePath));
 
             mockUserDialogs.Invocations.Clear();
             mockLogFileService.Invocations.Clear();
@@ -132,9 +77,11 @@ public void OnClickConfirmLogCommandTests_Failure()
             mockLogFileService.Setup(x => x.CreateLogId()).Returns(testLogId);
 
             var testZipFileName = "test-zip-file-name";
-            mockLogFileService.Setup(x => x.LogUploadingFileName(testLogId)).Returns(testZipFileName);
-            mockLogFileService.Setup(x => x.CreateLogUploadingFileToTmpPath(testZipFileName)).Returns(true);
-            mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(false);
+            mockLogFileService.Setup(x => x.CreateZipFileName(testLogId)).Returns(testZipFileName);
+            var testPublicZipFileName = "test-public-zip-file-name";
+            mockLogFileService.Setup(x => x.CreateZipFile(testZipFileName)).Returns(testPublicZipFileName);
+            var testPublicZipFilePath = "test-public-zip-file-path";
+            mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(testPublicZipFilePath);
 
             var unitUnderTest = CreateViewModel();
             unitUnderTest.Initialize(new NavigationParameters());
@@ -154,25 +101,27 @@ public void OnClickSendLogCommandTests_Success()
             mockLogFileService.Setup(x => x.CreateLogId()).Returns(testLogId);
 
             var testZipFileName = "test-zip-file-name";
-            mockLogFileService.Setup(x => x.LogUploadingFileName(testLogId)).Returns(testZipFileName);
-            mockLogFileService.Setup(x => x.CreateLogUploadingFileToTmpPath(testZipFileName)).Returns(true);
-            mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(true);
+            mockLogFileService.Setup(x => x.CreateZipFileName(testLogId)).Returns(testZipFileName);
+            var testPublicZipFileName = "test-public-zip-file-name";
+            mockLogFileService.Setup(x => x.CreateZipFile(testZipFileName)).Returns(testPublicZipFileName);
+            var testPublicZipFilePath = "test-public-zip-file-path";
+            mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(testPublicZipFilePath);
             mockLogFileService.Setup(x => x.DeleteAllLogUploadingFiles()).Returns(true);
 
             var unitUnderTest = CreateViewModel();
-            unitUnderTest.Initialize(new NavigationParameters());
+            unitUnderTest.Initialize(SendLogConfirmationPage.BuildNavigationParams(testLogId, testPublicZipFilePath));
 
             mockUserDialogs.Invocations.Clear();
             mockLogFileService.Invocations.Clear();
 
-            mockLogUploadService.Setup(x => x.UploadAsync(testZipFileName)).ReturnsAsync(true);
+            mockLogUploadService.Setup(x => x.UploadAsync(testPublicZipFilePath)).ReturnsAsync(true);
 
             unitUnderTest.OnClickSendLogCommand.Execute(null);
 
             mockUserDialogs.Verify(x => x.ShowLoading(It.IsAny<string>(), null), Times.Once());
             mockUserDialogs.Verify(x => x.HideLoading(), Times.Once());
             mockUserDialogs.Verify(x => x.AlertAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), null), Times.Never());
-            mockLogUploadService.Verify(x => x.UploadAsync(testZipFileName), Times.Once());
+            mockLogUploadService.Verify(x => x.UploadAsync(testPublicZipFilePath), Times.Once());
             mockLogFileService.Verify(x => x.DeleteAllLogUploadingFiles(), Times.Once());
             var expectedParameters = new NavigationParameters { { "logId", testLogId } };
             mockNavigationService.Verify(x => x.NavigateAsync("SendLogCompletePage?useModalNavigation=true/", expectedParameters), Times.Once());
@@ -185,24 +134,26 @@ public void OnClickSendLogCommandTests_Failure()
             mockLogFileService.Setup(x => x.CreateLogId()).Returns(testLogId);
 
             var testZipFileName = "test-zip-file-name";
-            mockLogFileService.Setup(x => x.LogUploadingFileName(testLogId)).Returns(testZipFileName);
-            mockLogFileService.Setup(x => x.CreateLogUploadingFileToTmpPath(testZipFileName)).Returns(true);
-            mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(true);
+            mockLogFileService.Setup(x => x.CreateZipFileName(testLogId)).Returns(testZipFileName);
+            var testPublicZipFileName = "test-public-zip-file-name";
+            mockLogFileService.Setup(x => x.CreateZipFile(testZipFileName)).Returns(testPublicZipFileName);
+            var testPublicZipFilePath = "test-public-zip-file-path";
+            mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(testPublicZipFilePath);
 
             var unitUnderTest = CreateViewModel();
-            unitUnderTest.Initialize(new NavigationParameters());
+            unitUnderTest.Initialize(SendLogConfirmationPage.BuildNavigationParams(testLogId, testPublicZipFileName));
 
             mockUserDialogs.Invocations.Clear();
             mockLogFileService.Invocations.Clear();
 
-            mockLogUploadService.Setup(x => x.UploadAsync(testZipFileName)).ReturnsAsync(false);
+            mockLogUploadService.Setup(x => x.UploadAsync(testPublicZipFileName)).ReturnsAsync(false);
 
             unitUnderTest.OnClickSendLogCommand.Execute(null);
 
             mockUserDialogs.Verify(x => x.ShowLoading(It.IsAny<string>(), null), Times.Once());
             mockUserDialogs.Verify(x => x.HideLoading(), Times.Once());
             mockUserDialogs.Verify(x => x.AlertAsync(It.IsAny<string>(), It.IsAny<string>(), "OK", null), Times.Once());
-            mockLogUploadService.Verify(x => x.UploadAsync(testZipFileName), Times.Once());
+            mockLogUploadService.Verify(x => x.UploadAsync(testPublicZipFileName), Times.Once());
             mockLogFileService.Verify(x => x.DeleteAllLogUploadingFiles(), Times.Never());
             mockNavigationService.Verify(x => x.NavigateAsync(It.IsAny<string>(), It.IsAny<NavigationParameters>()), Times.Never());
         }
@@ -214,25 +165,29 @@ public void OnClickSendLogCommandTests_DeleteLogFalure()
             mockLogFileService.Setup(x => x.CreateLogId()).Returns(testLogId);
 
             var testZipFileName = "test-zip-file-name";
-            mockLogFileService.Setup(x => x.LogUploadingFileName(testLogId)).Returns(testZipFileName);
-            mockLogFileService.Setup(x => x.CreateLogUploadingFileToTmpPath(testZipFileName)).Returns(true);
-            mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(true);
+            mockLogFileService.Setup(x => x.CreateZipFileName(testLogId)).Returns(testZipFileName);
+            var testPublicZipFileName = "test-public-zip-file-name";
+            mockLogFileService.Setup(x => x.CreateZipFile(testZipFileName)).Returns(testPublicZipFileName);
+            var testPublicZipFilePath = "test-public-zip-file-path";
+            mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(testPublicZipFilePath);
             mockLogFileService.Setup(x => x.DeleteAllLogUploadingFiles()).Returns(false);
 
             var unitUnderTest = CreateViewModel();
-            unitUnderTest.Initialize(new NavigationParameters());
+            unitUnderTest.Initialize(
+                SendLogConfirmationPage.BuildNavigationParams(testLogId, testPublicZipFilePath)
+                );
 
             mockUserDialogs.Invocations.Clear();
             mockLogFileService.Invocations.Clear();
 
-            mockLogUploadService.Setup(x => x.UploadAsync(testZipFileName)).ReturnsAsync(true);
+            mockLogUploadService.Setup(x => x.UploadAsync(testPublicZipFilePath)).ReturnsAsync(true);
 
             unitUnderTest.OnClickSendLogCommand.Execute(null);
 
             mockUserDialogs.Verify(x => x.ShowLoading(It.IsAny<string>(), null), Times.Once());
             mockUserDialogs.Verify(x => x.HideLoading(), Times.Once());
             mockUserDialogs.Verify(x => x.AlertAsync(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), null), Times.Never());
-            mockLogUploadService.Verify(x => x.UploadAsync(testZipFileName), Times.Once());
+            mockLogUploadService.Verify(x => x.UploadAsync(testPublicZipFilePath), Times.Once());
             mockLogFileService.Verify(x => x.DeleteAllLogUploadingFiles(), Times.Once());
             var expectedParameters = new NavigationParameters { { "logId", testLogId } };
             mockNavigationService.Verify(x => x.NavigateAsync("SendLogCompletePage?useModalNavigation=true/", expectedParameters), Times.Once());
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposureCheckPageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposureCheckPageViewModelTests.cs
index 469a8d3e3..386539121 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposureCheckPageViewModelTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/ExposureCheckPageViewModelTests.cs
@@ -17,6 +17,7 @@
 using Covid19Radar.Services;
 
 using Threshold = Covid19Radar.Model.V1ExposureRiskCalculationConfiguration.Threshold;
+using System;
 
 namespace Covid19Radar.UnitTests.ViewModels.HomePage
 {
@@ -27,6 +28,9 @@ public class ExposureCheckPageViewModelTests
         private readonly Mock<ILoggerService> mockLoggerService;
         private readonly Mock<IExposureDataRepository> mockExposureDataRepository;
         private readonly Mock<IExposureRiskCalculationService> mockExposureRiskCalculationService;
+        private readonly Mock<IUserDataRepository> mockUserDataRepository;
+        private readonly Mock<IExposureRiskCalculationConfigurationRepository> mockExposureRiskCalculationConfigurationRepository;
+        private readonly Mock<IDateTimeUtility> mockDateTimeUtility;
 
         public ExposureCheckPageViewModelTests()
         {
@@ -35,29 +39,34 @@ public ExposureCheckPageViewModelTests()
             mockLoggerService = mockRepository.Create<ILoggerService>();
             mockExposureDataRepository = mockRepository.Create<IExposureDataRepository>();
             mockExposureRiskCalculationService = mockRepository.Create<IExposureRiskCalculationService>();
+            mockUserDataRepository = mockRepository.Create<IUserDataRepository>();
+            mockExposureRiskCalculationConfigurationRepository = mockRepository.Create<IExposureRiskCalculationConfigurationRepository>();
+            mockDateTimeUtility = mockRepository.Create<IDateTimeUtility>();
         }
 
 
         private ExposureCheckPageViewModel CreateViewModel()
         {
+
             return new ExposureCheckPageViewModel(
                 mockNavigationService.Object,
                 mockLoggerService.Object,
                 mockExposureDataRepository.Object,
-                mockExposureRiskCalculationService.Object
+                mockExposureRiskCalculationService.Object,
+                mockUserDataRepository.Object,
+                mockExposureRiskCalculationConfigurationRepository.Object,
+                mockDateTimeUtility.Object
                 );
         }
 
         [Fact]
         public void LowRiskPage_Initialize_Display()
         {
-            mockExposureDataRepository
-                .Setup(x => x.GetDailySummariesAsync(AppConstants.DaysOfExposureInformationToDisplay))
-                .ReturnsAsync(new List<DailySummary>()
+            var dummyDailySummaries = new List<DailySummary>()
                 {
                     new DailySummary()
                     {
-                        DateMillisSinceEpoch = (1000 * 60 * 60 * 24),
+                        DateMillisSinceEpoch = (new DateTime().AddDays(0).Date).ToUnixEpochMillis(),
                         DaySummary = new ExposureSummaryData()
                         {
                             ScoreSum = 1700
@@ -65,7 +74,7 @@ public void LowRiskPage_Initialize_Display()
                     },
                     new DailySummary()
                     {
-                        DateMillisSinceEpoch = (1000 * 60 * 60 * 24) * 2,
+                        DateMillisSinceEpoch = (new DateTime().AddDays(1).Date).ToUnixEpochMillis(),
                         DaySummary = new ExposureSummaryData()
                         {
                             ScoreSum = 1700
@@ -73,32 +82,29 @@ public void LowRiskPage_Initialize_Display()
                     },
                     new DailySummary()
                     {
-                        DateMillisSinceEpoch = (1000 * 60 * 60 * 24) * 3,
+                        DateMillisSinceEpoch = (new DateTime().AddDays(2).Date).ToUnixEpochMillis(),
                         DaySummary = new ExposureSummaryData()
                         {
                             ScoreSum = 1000
                         },
                     },
-                });
-
-            mockExposureDataRepository
-                .Setup(x => x.GetExposureWindowsAsync(AppConstants.DaysOfExposureInformationToDisplay))
-                .ReturnsAsync(new List<ExposureWindow>()
+                };
+            var dummyExposureWindows = new List<ExposureWindow>()
                 {
                     new ExposureWindow()
                     {
-                        DateMillisSinceEpoch = (1000 * 60 * 60 * 24),
+                        DateMillisSinceEpoch = (new DateTime().AddDays(0).Date).ToUnixEpochMillis(),
                         ScanInstances = new List<ScanInstance>()
                         {
                             new ScanInstance()
                             {
-                                SecondsSinceLastScan = 900,
+                                SecondsSinceLastScan = 840,
                             }
                         },
                     },
                     new ExposureWindow()
                     {
-                        DateMillisSinceEpoch = (1000 * 60 * 60 * 24) * 2,
+                        DateMillisSinceEpoch = (new DateTime().AddDays(1).Date).ToUnixEpochMillis(),
                         ScanInstances = new List<ScanInstance>()
                         {
                             new ScanInstance()
@@ -109,16 +115,32 @@ public void LowRiskPage_Initialize_Display()
                     },
                     new ExposureWindow()
                     {
-                        DateMillisSinceEpoch = (1000 * 60 * 60 * 24) * 3,
+                        DateMillisSinceEpoch = (new DateTime().AddDays(2).Date).ToUnixEpochMillis(),
                         ScanInstances = new List<ScanInstance>()
                         {
                             new ScanInstance()
                             {
-                                SecondsSinceLastScan = 840,
+                                SecondsSinceLastScan = 900,
                             }
                         },
                     },
-                });
+                };
+
+            mockUserDataRepository
+                .Setup(x => x.GetDaysOfUse())
+                .Returns(14);
+
+            mockDateTimeUtility
+                .Setup(x => x.UtcNow)
+                .Returns((new DateTime()).AddDays(14));
+
+            mockExposureDataRepository
+                .Setup(x => x.GetDailySummariesAsync(AppConstants.DaysOfExposureInformationToDisplay))
+                .ReturnsAsync(dummyDailySummaries);
+
+            mockExposureDataRepository
+                .Setup(x => x.GetExposureWindowsAsync(AppConstants.DaysOfExposureInformationToDisplay))
+                .ReturnsAsync(dummyExposureWindows);
 
             var riskConfiguration = new V1ExposureRiskCalculationConfiguration()
             {
@@ -136,31 +158,41 @@ public void LowRiskPage_Initialize_Display()
 
             var exposureCheckPageViewModel = CreateViewModel();
             var parameters = ExposureCheckPage.BuildNavigationParams(riskConfiguration);
-
             exposureCheckPageViewModel.Initialize(parameters);
 
-            Assert.True(exposureCheckPageViewModel.IsVisibleLowRiskContact);
-            Assert.False(exposureCheckPageViewModel.IsVisibleNoRiskContact);
+            Assert.True(exposureCheckPageViewModel.IsExposureDetected);
 
-            Assert.Equal(3, exposureCheckPageViewModel.ExposureCheckScores.Count());
+            Assert.Equal(14, exposureCheckPageViewModel.ExposureCheckScores.Count());
 
-            // Sort DESC
-            Assert.Equal((1000 * 60 * 60 * 24) * 3, exposureCheckPageViewModel.ExposureCheckScores[0].DateMillisSinceEpoch);
-            Assert.Equal((1000 * 60 * 60 * 24) * 2, exposureCheckPageViewModel.ExposureCheckScores[1].DateMillisSinceEpoch);
-            Assert.Equal(1000 * 60 * 60 * 24, exposureCheckPageViewModel.ExposureCheckScores[2].DateMillisSinceEpoch);
-
-            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[0].IsScoreVisible);
-            Assert.False(exposureCheckPageViewModel.ExposureCheckScores[0].IsDurationTimeVisible);
-
-            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[1].IsScoreVisible);
-            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[1].IsDurationTimeVisible);
+            var dates = Enumerable.Range(0, 14)
+                .Select(offset => new DateTime().AddDays(offset).Date.ToUnixEpochMillis())
+                .ToList();
+            dates.Sort((a, b) => b.CompareTo(a));
 
-            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[2].IsScoreVisible);
-            Assert.False(exposureCheckPageViewModel.ExposureCheckScores[2].IsDurationTimeVisible);
+            // Sort DESC
+            for (int i=0; i < 14; i++)
+            {
+                Assert.Equal(dates[i], exposureCheckPageViewModel.ExposureCheckScores[i].DateMillisSinceEpoch);
+            }
+
+            Assert.Equal(dummyDailySummaries[2].DateMillisSinceEpoch, exposureCheckPageViewModel.ExposureCheckScores[11].DateMillisSinceEpoch);
+            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[11].IsScoreVisible);
+            Assert.False(exposureCheckPageViewModel.ExposureCheckScores[11].IsDurationTimeVisible);
+            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[11].IsReceived);
+
+            Assert.Equal(dummyDailySummaries[1].DateMillisSinceEpoch, exposureCheckPageViewModel.ExposureCheckScores[12].DateMillisSinceEpoch);
+            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[12].IsScoreVisible);
+            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[12].IsDurationTimeVisible);
+            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[12].IsReceived);
+
+            Assert.Equal(dummyDailySummaries[0].DateMillisSinceEpoch, exposureCheckPageViewModel.ExposureCheckScores[13].DateMillisSinceEpoch);
+            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[13].IsScoreVisible);
+            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[13].IsDurationTimeVisible);
+            Assert.True(exposureCheckPageViewModel.ExposureCheckScores[13].IsReceived);
         }
 
         [Fact]
-        public void NoRiskPage_Initialize_Display()
+        public async void NoRiskPage_Initialize_Display()
         {
             mockExposureDataRepository
                 .Setup(x => x.GetDailySummariesAsync(AppConstants.DaysOfExposureInformationToDisplay))
@@ -169,8 +201,9 @@ public void NoRiskPage_Initialize_Display()
             var exposureCheckPageViewModel = CreateViewModel();
             var parameters = ExposureCheckPage.BuildNavigationParams(new V1ExposureRiskCalculationConfiguration());
             exposureCheckPageViewModel.Initialize(parameters);
-            Assert.False(exposureCheckPageViewModel.IsVisibleLowRiskContact);
-            Assert.True(exposureCheckPageViewModel.IsVisibleNoRiskContact);
+            await exposureCheckPageViewModel.Setup();
+
+            Assert.False(exposureCheckPageViewModel.IsExposureDetected);
         }
     }
 }
\ No newline at end of file
diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/HomePageViewModelTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/HomePageViewModelTests.cs
index 009ded6ed..bb46d54f0 100644
--- a/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/HomePageViewModelTests.cs
+++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/ViewModels/HomePage/HomePageViewModelTests.cs
@@ -44,6 +44,7 @@ public class HomePageViewModelTests: IDisposable
         private readonly Mock<IDialogService> mockDialogService;
         private readonly Mock<IExternalNavigationService> mockExternalNavigationService;
         private readonly Mock<ILocalPathService> mockLocalPathService;
+        private readonly Mock<ICheckVersionService> mockCheckVersionService;
 
         public HomePageViewModelTests()
         {
@@ -63,6 +64,7 @@ public HomePageViewModelTests()
             mockDialogService = mockRepository.Create<IDialogService>();
             mockExposureRiskCalculationService = mockRepository.Create<IExposureRiskCalculationService>();
             mockExternalNavigationService = mockRepository.Create<IExternalNavigationService>();
+            mockCheckVersionService = mockRepository.Create<ICheckVersionService>();
 
             userDataRepository = new UserDataRepository(
                     mockPreferenceService.Object,
@@ -108,6 +110,7 @@ private HomePageViewModel CreateViewModel()
                 mockExposureDetectionBackgroundService.Object,
                 mockExposureConfigurationRepository.Object,
                 mockExposureRiskCalculationConfigurationRepository.Object,
+                mockCheckVersionService.Object,
                 mockDialogService.Object,
                 mockExternalNavigationService.Object
                 );