diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage1.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage1.xaml
index f9417a08f..04ecb4433 100644
--- a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage1.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage1.xaml
@@ -17,6 +17,11 @@
NavigationPage.HasNavigationBar="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
@@ -67,4 +72,5 @@
+
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage2.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage2.xaml
index 72cf27a0a..dac4ed4b9 100644
--- a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage2.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage2.xaml
@@ -16,6 +16,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
@@ -81,4 +86,5 @@
+
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage3.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage3.xaml
index b0a0f9822..9cf34f1fb 100644
--- a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage3.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage3.xaml
@@ -16,6 +16,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
@@ -148,4 +153,5 @@
+
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage4.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage4.xaml
index 8ce1f1af2..537f8b802 100644
--- a/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage4.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HelpPage/HelpPage4.xaml
@@ -15,6 +15,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
@@ -38,4 +43,5 @@
+
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/InqueryPage.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/InqueryPage.xaml
index 0661b5e67..3380cd719 100644
--- a/Covid19Radar/Covid19Radar/Views/HelpPage/InqueryPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HelpPage/InqueryPage.xaml
@@ -15,6 +15,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
+
diff --git a/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogConfirmationPage.xaml b/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogConfirmationPage.xaml
index 56c552fdd..b9ba8c0c1 100644
--- a/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogConfirmationPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HelpPage/SendLogConfirmationPage.xaml
@@ -13,7 +13,7 @@
Style="{StaticResource DefaultPageStyle}"
Title="{x:Static resources:AppResources.SendLogConfirmationPageTitle}"
Visual="Material">
-
+
@@ -69,5 +69,5 @@
Text="{x:Static resources:AppResources.SendLogConfirmationPageButton1}" />
-
+
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
index 987528d9a..cb2062f26 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ContactedNotifyPage.xaml
@@ -16,6 +16,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
+
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml
index 3cc0e62b6..bd9e234ea 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml
@@ -25,6 +25,11 @@
Text="{x:Static resources:AppResources.MainTutorial}" />
+
+
+
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/HowToReceiveProcessingNumberPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/HowToReceiveProcessingNumberPage.xaml
index a6513d9be..bf5c05d6b 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/HowToReceiveProcessingNumberPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/HowToReceiveProcessingNumberPage.xaml
@@ -16,6 +16,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
+
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/NotContactPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/NotContactPage.xaml
index 3daa0a272..c9d293e9b 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/NotContactPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/NotContactPage.xaml
@@ -16,6 +16,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
@@ -61,4 +66,5 @@
+
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml
index 1fcb4a4e7..a1e0c2059 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml
@@ -17,6 +17,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
@@ -51,13 +56,12 @@
-
+ HorizontalOptions="FillAndExpand"
+ Margin="0, 5, 0, 10">
-
-
+ HorizontalOptions="FillAndExpand"
+ Margin="0, 5, 0, 10">
-
+
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/SubmitConsentPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/SubmitConsentPage.xaml
index 18831d819..9a00dfa14 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/SubmitConsentPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/SubmitConsentPage.xaml
@@ -24,6 +24,11 @@
+
+
@@ -130,4 +135,5 @@
+
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml
index 32d3618e3..491393c64 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/ThankYouNotifyOtherPage.xaml
@@ -16,6 +16,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
@@ -51,4 +56,5 @@
+
\ No newline at end of file
diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/TroubleshootingPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/TroubleshootingPage.xaml
index d4b16a8bd..c12f1985d 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/TroubleshootingPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/TroubleshootingPage.xaml
@@ -16,6 +16,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
+
diff --git a/Covid19Radar/Covid19Radar/Views/Settings/DebugPage.xaml b/Covid19Radar/Covid19Radar/Views/Settings/DebugPage.xaml
index e124cf55a..4f6b896f4 100644
--- a/Covid19Radar/Covid19Radar/Views/Settings/DebugPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/Settings/DebugPage.xaml
@@ -15,6 +15,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
+
diff --git a/Covid19Radar/Covid19Radar/Views/Settings/EditServerConfigurationPage.xaml b/Covid19Radar/Covid19Radar/Views/Settings/EditServerConfigurationPage.xaml
index 540c40e9d..942272ca6 100644
--- a/Covid19Radar/Covid19Radar/Views/Settings/EditServerConfigurationPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/Settings/EditServerConfigurationPage.xaml
@@ -16,6 +16,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
+
diff --git a/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml b/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml
index 9249d7fbb..38f539967 100644
--- a/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/Settings/SettingsPage.xaml
@@ -16,6 +16,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
+
diff --git a/Covid19Radar/Covid19Radar/Views/Tutorial/TutorialPage6.xaml b/Covid19Radar/Covid19Radar/Views/Tutorial/TutorialPage6.xaml
index ec58e33d9..c31c1b02d 100644
--- a/Covid19Radar/Covid19Radar/Views/Tutorial/TutorialPage6.xaml
+++ b/Covid19Radar/Covid19Radar/Views/Tutorial/TutorialPage6.xaml
@@ -16,6 +16,11 @@
prism:ViewModelLocator.AutowireViewModel="True"
Style="{StaticResource DefaultPageStyle}"
Visual="Material">
+
+
@@ -69,4 +74,5 @@
+