diff --git a/RightToAskClient/RightToAskClient.Maui/AppShell.xaml b/RightToAskClient/RightToAskClient.Maui/AppShell.xaml
index 0018b61e..f0a9ea5d 100644
--- a/RightToAskClient/RightToAskClient.Maui/AppShell.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/AppShell.xaml
@@ -1,14 +1,154 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<Shell
-    x:Class="RightToAskClient.Maui.AppShell"
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:RightToAskClient.Maui"
-    Shell.FlyoutBehavior="Disabled">
-
-    <ShellContent
-        Title="Home"
-        ContentTemplate="{DataTemplate local:MainPage}"
-        Route="MainPage" />
-
-</Shell>
+<?xml version="1.0" encoding="UTF-8"?>
+<Shell xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
+       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+       xmlns:rta="clr-namespace:RightToAskClient.Maui"
+       xmlns:local="clr-namespace:RightToAskClient.Maui.Views"
+       xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
+       xmlns:extensions="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+       x:Class="RightToAskClient.Maui.Views.AppShell"
+
+       FlyoutBackgroundColor="{AppThemeBinding Light={StaticResource WindowBackgroundColor}, Dark={StaticResource WindowBackgroundColorDark}}">
+
+    <!--
+        The overall app visual hierarchy is defined here, along with navigation.
+    
+        https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/shell/
+    -->
+
+    <Shell.Resources>
+        <ResourceDictionary>
+            <Style x:Key="BaseStyle" TargetType="Element">
+                <Setter Property="Shell.BackgroundColor" Value="{StaticResource Primary}" />
+                <Setter Property="Shell.ForegroundColor" Value="White" />
+                <Setter Property="Shell.TitleColor" Value="White" />
+                <Setter Property="Shell.DisabledColor" Value="#B4FFFFFF" />
+                <Setter Property="Shell.UnselectedColor" Value="#95FFFFFF" />
+                <Setter Property="Shell.TabBarBackgroundColor" Value="{StaticResource Primary}" />
+                <Setter Property="Shell.TabBarForegroundColor" Value="White"/>
+                <Setter Property="Shell.TabBarUnselectedColor" Value="#95FFFFFF"/>
+                <Setter Property="Shell.TabBarTitleColor" Value="White"/>
+            </Style>
+            <Style TargetType="TabBar" BasedOn="{StaticResource BaseStyle}" />
+            <Style TargetType="FlyoutItem" BasedOn="{StaticResource BaseStyle}" />
+
+            <!--
+            Default Styles for all Flyout Items
+            https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/shell/flyout#flyoutitem-and-menuitem-style-classes
+            -->
+            <Style Class="FlyoutItemLabelStyle" TargetType="Label">
+                <Setter Property="TextColor" Value="White" />
+            </Style>
+            <Style Class="FlyoutItemLayoutStyle" TargetType="Layout" ApplyToDerivedTypes="True">
+                <Setter Property="VisualStateManager.VisualStateGroups">
+                    <VisualStateGroupList>
+                        <VisualStateGroup x:Name="CommonStates">
+                            <VisualState x:Name="Normal">
+                                <VisualState.Setters>
+                                    <Setter Property="BackgroundColor" Value="{x:OnPlatform WinUI=Transparent, iOS=White}" />
+                                    <Setter TargetName="FlyoutItemLabel" Property="Label.TextColor" Value="{StaticResource Primary}" />
+                                </VisualState.Setters>
+                            </VisualState>
+                            <VisualState x:Name="Selected">
+                                <VisualState.Setters>
+                                    <Setter Property="BackgroundColor" Value="{StaticResource Primary}" />
+                                </VisualState.Setters>
+                            </VisualState>
+                        </VisualStateGroup>
+                    </VisualStateGroupList>
+                </Setter>
+            </Style>
+
+            <!--
+            Custom Style you can apply to any Flyout Item
+            -->
+            <Style Class="MenuItemLayoutStyle" TargetType="Layout" ApplyToDerivedTypes="True">
+                <Setter Property="VisualStateManager.VisualStateGroups">
+                    <VisualStateGroupList>
+                        <VisualStateGroup x:Name="CommonStates">
+                            <VisualState x:Name="Normal">
+                                <VisualState.Setters>
+                                    <Setter TargetName="FlyoutItemLabel" Property="Label.TextColor" Value="{StaticResource Primary}" />
+                                </VisualState.Setters>
+                            </VisualState>
+                        </VisualStateGroup>
+                    </VisualStateGroupList>
+                </Setter>
+            </Style>
+        </ResourceDictionary>
+    </Shell.Resources>
+
+    <!-- 
+        When the Flyout is visible this defines the content to display in the flyout.
+        FlyoutDisplayOptions="AsMultipleItems" will create a separate flyout item for each child element    
+        https://docs.microsoft.com/dotnet/api/xamarin.forms.shellgroupitem.flyoutdisplayoptions?view=xamarin-forms
+    -->
+
+    <FlyoutItem Title="Home" FlyoutIcon="home4.png">
+        <ShellContent Route="ReadingPage" ContentTemplate="{DataTemplate local:ReadingPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="My questions" FlyoutIcon="emu_75.png">
+        <ShellContent Route="ReadingPageByQuestionWriter" ContentTemplate="{DataTemplate local:ReadingPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="Account" FlyoutIcon="info_48.png">
+        <ShellContent Route="Account" ContentTemplate="{DataTemplate local:AccountPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="How To">
+        <ShellContent Route="HowToPublishPage" ContentTemplate="{DataTemplate local:HowToPublishPage}" />
+    </FlyoutItem>
+    <FlyoutItem Title="About" FlyoutIcon="emu_75.png">
+        <ShellContent Route="AboutPage" ContentTemplate="{DataTemplate local:AboutPage}" />
+    </FlyoutItem>
+
+    <!-- When the Flyout is visible this will be a menu item you can tie a click behavior to  -->
+    <!--<MenuItem Text="Logout" StyleClass="MenuItemLayoutStyle" Clicked="OnMenuItemClicked">
+    </MenuItem>-->
+
+    <!--
+        TabBar lets you define content that won't show up in a flyout menu. When this content is active
+        the flyout menu won't be available. This is useful for creating areas of the application where 
+        you don't want users to be able to navigate away from. If you would like to navigate to this 
+        content you can do so by calling 
+        await Shell.Current.GoToAsync("//LoginPage");
+    -->
+    <!-- 
+    <TabBar>
+        <ShellContent Route="ReadingPage" ContentTemplate="{DataTemplate local:MainPage}" />
+    </TabBar>
+    <TabBar>
+        <ShellContent Route="MainPage" ContentTemplate="{DataTemplate local:MainPage}" />
+    </TabBar>  -->
+
+    <!-- Optional Templates 
+    // These may be provided inline as below or as separate classes.
+
+    // This header appears at the top of the Flyout.
+    // https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/shell/flyout#flyout-header
+    <Shell.FlyoutHeaderTemplate>
+        <DataTemplate>
+            <Grid>ContentHere</Grid>
+        </DataTemplate>
+    </Shell.FlyoutHeaderTemplate>
+
+    // ItemTemplate is for ShellItems as displayed in a Flyout
+    // https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/shell/flyout#define-flyoutitem-appearance
+    <Shell.ItemTemplate>
+        <DataTemplate>
+            <ContentView>
+                Bindable Properties: Title, Icon
+            </ContentView>
+        </DataTemplate>
+    </Shell.ItemTemplate>
+
+    // MenuItemTemplate is for MenuItems as displayed in a Flyout
+    // https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/shell/flyout#define-menuitem-appearance
+    <Shell.MenuItemTemplate>
+        <DataTemplate>
+            <ContentView>
+                Bindable Properties: Text, Icon
+            </ContentView>
+        </DataTemplate>
+    </Shell.MenuItemTemplate>
+
+    -->
+
+</Shell>
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/AppShell.xaml.cs b/RightToAskClient/RightToAskClient.Maui/AppShell.xaml.cs
index c0f939fb..05ee6c40 100644
--- a/RightToAskClient/RightToAskClient.Maui/AppShell.xaml.cs
+++ b/RightToAskClient/RightToAskClient.Maui/AppShell.xaml.cs
@@ -1,10 +1,45 @@
-namespace RightToAskClient.Maui
+using System;
+using System.Diagnostics;
+using RightToAskClient.Maui.Models;
+using RightToAskClient.Maui.ViewModels;
+using Microsoft.Maui.Controls;
+using Microsoft.Maui;
+
+namespace RightToAskClient.Maui.Views
 {
-    public partial class AppShell : Shell
+    public partial class AppShell : Microsoft.Maui.Controls.Shell
     {
         public AppShell()
         {
             InitializeComponent();
+            Routing.RegisterRoute(nameof(QuestionAskerPage), typeof(QuestionAskerPage));
+            Routing.RegisterRoute(nameof(QuestionDetailPage), typeof(QuestionDetailPage));
+            Routing.RegisterRoute(nameof(RegisterAccountPage), typeof(RegisterAccountPage));
+            Routing.RegisterRoute(nameof(FindMPsPage), typeof(FindMPsPage));
+            Routing.RegisterRoute(nameof(OtherUserProfilePage), typeof(OtherUserProfilePage));
+            Routing.RegisterRoute(nameof(QuestionAnswererPage), typeof(QuestionAnswererPage));
+            Routing.RegisterRoute(nameof(AdvancedSearchFiltersPage), typeof(AdvancedSearchFiltersPage));
+            Routing.RegisterRoute(nameof(MPRegistrationVerificationPage), typeof(MPRegistrationVerificationPage));
+            Routing.RegisterRoute(nameof(HowAnsweredOptionPage), typeof(HowAnsweredOptionPage));
+            Routing.RegisterRoute(nameof(QuestionBackgroundPage), typeof(QuestionBackgroundPage));
+            Routing.RegisterRoute(nameof(SelectableListPage), typeof(SelectableListPage));
+            Routing.RegisterRoute(nameof(ReportQuestionPage), typeof(ReportQuestionPage));
+            Routing.RegisterRoute(nameof(CodeOfConductPage), typeof(CodeOfConductPage));
+            // Routing.RegisterRoute(nameof(FindMPsPage), typeof(FindMPsPage));
+        }
+
+        protected override void OnNavigating(ShellNavigatingEventArgs args)
+        {
+            base.OnNavigating(args);
+            if (args.Target.Location.OriginalString.ToLower().Contains("account"))
+            {
+                AccountPageExchanger.Registration = IndividualParticipant.getInstance().ProfileData.RegistrationInfo;
+            }
+
+            if (args.Target.Location.OriginalString.ToLower().Contains("readingpagebyquestionwriter"))
+            {
+               ReadingPageExchanger.ByQuestionWriter = true;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Helpers/HyperLinkSpan.cs b/RightToAskClient/RightToAskClient.Maui/Helpers/HyperLinkSpan.cs
new file mode 100644
index 00000000..c88a335f
--- /dev/null
+++ b/RightToAskClient/RightToAskClient.Maui/Helpers/HyperLinkSpan.cs
@@ -0,0 +1,40 @@
+using Android.Content.Res;
+using RightToAskClient.Maui.Resx;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RightToAskClient.Maui.Helpers
+{
+    //https://learn.microsoft.com/en-us/dotnet/maui/user-interface/controls/label?view=net-maui-8.0#create-a-hyperlink
+    public class HyperlinkSpan : Span
+    {
+        public static readonly BindableProperty UrlProperty =
+            BindableProperty.Create(nameof(Url), typeof(string), typeof(HyperlinkSpan), null);
+
+        public string Url
+        {
+            get { return (string)GetValue(UrlProperty); }
+            set { SetValue(UrlProperty, value); }
+        }
+
+        public HyperlinkSpan()
+        {
+            TextDecorations = TextDecorations.Underline;
+            TextColor = (Color)Application.Current.Resources["UrlTextColorLightMode"];
+            GestureRecognizers.Add(new TapGestureRecognizer
+            {
+                // Launcher.OpenAsync is provided by Essentials.
+                Command = new Command(async () => await OpenUrl(Url))
+            });
+        }
+
+        //TODO: test on real device
+        public async Task OpenUrl(string url)
+        {
+            await Launcher.OpenAsync(url);
+        }
+    }
+}
diff --git a/RightToAskClient/RightToAskClient.Maui/Helpers/NavigationUtils.cs b/RightToAskClient/RightToAskClient.Maui/Helpers/NavigationUtils.cs
index 5c4240e3..c3c04b30 100644
--- a/RightToAskClient/RightToAskClient.Maui/Helpers/NavigationUtils.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Helpers/NavigationUtils.cs
@@ -7,6 +7,7 @@
 using CommunityToolkit.Maui.Extensions;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui;
+using CommunityToolkit.Maui.Views;
 
 /* This class contains some utilities for popping up and using pages, which may be accessed
  * at any time by the app, for example the pages for finding your MP, which needs to be
@@ -94,14 +95,14 @@ public static async Task DoRegistrationCheck(Registration registration, string c
                 AppResources.OKText, 
                 false);
             //TODO:
-            //var popupResult = await App.Current.MainPage.Navigation.ShowPopupAsync(popup);
-            //if (popup.HasApproved(popupResult))
-            //{
-            //    var registerAccountFlow = new CodeOfConductPage(registration);
-            //    await Application.Current.MainPage.Navigation.PushAsync(registerAccountFlow);
-            //    // var registerAccountPage = new RegisterAccountPage(registration);
-            //    // await Application.Current.MainPage.Navigation.PushAsync(registerAccountPage);
-            //}
+            var popupResult = await App.Current.MainPage.ShowPopupAsync(popup);
+            if (popup.HasApproved(popupResult))
+            {
+                var registerAccountFlow = new CodeOfConductPage(registration);
+                await Application.Current.MainPage.Navigation.PushAsync(registerAccountFlow);
+                // var registerAccountPage = new RegisterAccountPage(registration);
+                // await Application.Current.MainPage.Navigation.PushAsync(registerAccountPage);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/MainPage.xaml b/RightToAskClient/RightToAskClient.Maui/MainPage.xaml
index 5c179bdb..02f5df05 100644
--- a/RightToAskClient/RightToAskClient.Maui/MainPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/MainPage.xaml
@@ -6,27 +6,28 @@
              xmlns:local="clr-namespace:RightToAskClient.Maui"
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
              x:Class="RightToAskClient.Maui.MainPage"
-             Title="{StaticResource ApplicationTitle}"
+             xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
+             Title="{x:Static strings:AppResources.ApplicationTitle}"
              Shell.FlyoutBehavior="Flyout"
              x:DataType="vm:MainPageViewModel">
     <ContentPage.BindingContext>
         <vm:MainPageViewModel />
     </ContentPage.BindingContext>
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{StaticResource InfoPopupButtonText}" Command="{Binding InfoPopupCommand}"
+        <ToolbarItem Text="{x:Static strings:AppResources.InfoPopupButtonText}" Command="{Binding InfoPopupCommand}"
                      x:DataType="vm:BaseViewModel"
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.help_75.png}" Priority="0" />
+                     IconImageSource="help_75.png" Priority="0" />
     </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <StackLayout VerticalOptions="FillAndExpand" Margin="10">
-            <Label Text="{StaticResource MainPageHeadingText}" Style="{StaticResource Header1}"
+            <Label Text="{x:Static strings:AppResources.MainPageHeadingText}" Style="{StaticResource Header1}"
                    HorizontalTextAlignment="Center" />
             <BoxView />
             <!--Heading Text-->
             <StackLayout Margin="0" Padding="0,0,0,20" Spacing="0">
-                <Label Text="{StaticResource MainPageSubheader1Text}" Style="{StaticResource CenterSmall}" />
-                <Label Text="{StaticResource MainPageSubheader2Text}" Style="{StaticResource CenterSmall}" />
-                <Label Text="{StaticResource MainPageSubheader3Text}" Style="{StaticResource CenterSmall}" />
+                <Label Text="{x:Static strings:AppResources.MainPageSubheader1Text}" Style="{StaticResource CenterSmall}" />
+                <Label Text="{x:Static strings:AppResources.MainPageSubheader2Text}" Style="{StaticResource CenterSmall}" />
+                <Label Text="{x:Static strings:AppResources.MainPageSubheader3Text}" Style="{StaticResource CenterSmall}" />
             </StackLayout>
             <!-- Main buttons Layout-->
             <Grid ColumnDefinitions="*,2*,*" RowDefinitions="*,*,*,*" HorizontalOptions="FillAndExpand" Padding="0"
@@ -38,20 +39,20 @@
                     <Frame WidthRequest="{Binding Path=Width, Source={x:Reference SearchFrame}}"
                            Style="{StaticResource SubtleFrame}" HorizontalOptions="FillAndExpand" Margin="0,0,0,0">
                         <Grid RowDefinitions="*,*,*">
-                            <Label Grid.Row="0" Text="{DynamicResource TrendingButtonText}"
+                            <Label Grid.Row="0" Text="{x:Static strings:AppResources.TrendingButtonText}"
                                    Style="{StaticResource Header1}"
                                    VerticalOptions="Center" HorizontalTextAlignment="Center" Margin="0,10,0,0"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                   AutomationProperties.Name="{StaticResource MainPageTrendingNowAccessibilityLabelName}"
-                                   AutomationProperties.HelpText="{StaticResource MainPageTrendingNowAccessibilityLabelHelpText}" />
+                                   AutomationProperties.Name="{x:Static strings:AppResources.MainPageTrendingNowAccessibilityLabelName}"
+                                   AutomationProperties.HelpText="{x:Static strings:AppResources.MainPageTrendingNowAccessibilityLabelHelpText}" />
                             <Image x:Name="trendingImage1" Grid.Row="1"
-                                   Source="{helpers:ImageResource RightToAskClient.Images.trending_up_48.png}"
+                                   Source="trending_up_48.png"
                                    WidthRequest="50"
                                    HorizontalOptions="Center"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                   AutomationProperties.Name="{StaticResource ReadAndUpvoteImageAccessibilityNameText}"
-                                   AutomationProperties.HelpText="{StaticResource ReadAndUpvoteImageAccessibilityHelpText}" />
-                            <Label Grid.Row="2" Text="{StaticResource ReadAndUpvoteFrameSubtext}"
+                                   AutomationProperties.Name="{x:Static strings:AppResources.ReadAndUpvoteImageAccessibilityNameText}"
+                                   AutomationProperties.HelpText="{x:Static strings:AppResources.ReadAndUpvoteImageAccessibilityHelpText}" />
+                            <Label Grid.Row="2" Text="{x:Static strings:AppResources.ReadAndUpvoteFrameSubtext}"
                                    Style="{StaticResource StagnantColor}"
                                    HorizontalOptions="Center" HorizontalTextAlignment="Center" />
                             <Button Grid.Row="0" Grid.RowSpan="3" Style="{StaticResource TransparentSquareButton}"
@@ -65,19 +66,19 @@
                            Style="{StaticResource SubtleFrame}" HorizontalOptions="FillAndExpand" Margin="0,0,10,0">
                         <Grid RowDefinitions="Auto,Auto,Auto">
                             <Label Grid.Row="0" Style="{StaticResource Header1}"
-                                   Text="{StaticResource InMyElectorateText}" LineBreakMode="WordWrap"
+                                   Text="{x:Static strings:AppResources.InMyElectorateText}" LineBreakMode="WordWrap"
                                    VerticalOptions="Center" HorizontalTextAlignment="Center" Margin="0,10,0,0"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                   AutomationProperties.Name="{StaticResource MainPageTrendingNowInMyElectorateAccessibilityLabelName}"
-                                   AutomationProperties.HelpText="{StaticResource MainPageInMyElectorateAccessibilityLabelHelpText}" />
+                                   AutomationProperties.Name="{x:Static strings:AppResources.MainPageTrendingNowInMyElectorateAccessibilityLabelName}"
+                                   AutomationProperties.HelpText="{x:Static strings:AppResources.MainPageInMyElectorateAccessibilityLabelHelpText}" />
                             <Image x:Name="trendingImage2" Grid.Row="1"
-                                   Source="{helpers:ImageResource RightToAskClient.Images.trending_up_48.png}"
+                                   Source="trending_up_48.png"
                                     WidthRequest="50"
                                    HorizontalOptions="Center"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                   AutomationProperties.Name="{StaticResource ReadAndUpvoteImageAccessibilityNameText}"
-                                   AutomationProperties.HelpText="{StaticResource ReadAndUpvoteImageAccessibilityHelpText}" />
-                            <Label Grid.Row="2" Text="{StaticResource ReadAndUpvoteFrameSubtext}"
+                                   AutomationProperties.Name="{x:Static strings:AppResources.ReadAndUpvoteImageAccessibilityNameText}"
+                                   AutomationProperties.HelpText="{x:Static strings:AppResources.ReadAndUpvoteImageAccessibilityHelpText}" />
+                            <Label Grid.Row="2" Text="{x:Static strings:AppResources.ReadAndUpvoteFrameSubtext}"
                                    Style="{StaticResource StagnantColor}"
                                    HorizontalOptions="Center" HorizontalTextAlignment="Center" />
                             <Button Grid.Row="0" Grid.RowSpan="3" Style="{StaticResource TransparentSquareButton}"
@@ -91,15 +92,15 @@
                 <Frame Grid.Column="1" Grid.Row="1" x:Name="SearchFrame" HorizontalOptions="FillAndExpand"
                        Style="{StaticResource SubtleFrame}">
                     <Grid RowDefinitions="*,2*">
-                        <Label Grid.Row="0" Text="{StaticResource SearchBarTitle}" Style="{StaticResource Header1}"
+                        <Label Grid.Row="0" Text="{x:Static strings:AppResources.SearchBarTitle}" Style="{StaticResource Header1}"
                                Margin="0,10,0,0" />
                         <Image x:Name="searchImage" Grid.Row="1" Margin="0" HorizontalOptions="Center"
                                VerticalOptions="Center"
-                               Source="{helpers:ImageResource RightToAskClient.Images.search.png}" WidthRequest="50"
+                               Source="search.png" WidthRequest="50"
                                
                                AutomationProperties.IsInAccessibleTree="True"
-                               AutomationProperties.Name="{StaticResource DraftImageAccessibilityNameText}"
-                               AutomationProperties.HelpText="{StaticResource DraftImageAccessibilityHelpText}" />
+                               AutomationProperties.Name="{x:Static strings:AppResources.DraftImageAccessibilityNameText}"
+                               AutomationProperties.HelpText="{x:Static strings:AppResources.DraftImageAccessibilityHelpText}" />
                         <Button Grid.Row="0" Grid.RowSpan="2" Style="{StaticResource TransparentSquareButton}"
                                 Command="{Binding AdvancedSearchButtonCommand}" BorderColor="{StaticResource Primary}"
                                 AutomationProperties.LabeledBy="{x:Reference searchImage}" />
@@ -112,15 +113,15 @@
                            Style="{StaticResource SubtleFrame}" HorizontalOptions="FillAndExpand" Margin="0,0,0,0">
                         <Grid RowDefinitions="*,*">
                             <StackLayout Grid.Row="0" Grid.RowSpan="2">
-                                <Label Text="{StaticResource MainPageHeader2Text}" Style="{StaticResource Header1}"
+                                <Label Text="{x:Static strings:AppResources.MainPageHeader2Text}" Style="{StaticResource Header1}"
                                        Margin="0,10,0,0" />
                                 <Image x:Name="draftImage1" Margin="0" HorizontalOptions="Center"
                                        VerticalOptions="CenterAndExpand"
-                                       Source="{helpers:ImageResource RightToAskClient.Images.half_roo.png}"
+                                       Source="half_roo.png"
                                        WidthRequest="75"
                                        AutomationProperties.IsInAccessibleTree="True"
-                                       AutomationProperties.Name="{StaticResource DraftImageAccessibilityNameText}"
-                                       AutomationProperties.HelpText="{StaticResource DraftImageAccessibilityHelpText}" />
+                                       AutomationProperties.Name="{x:Static strings:AppResources.DraftImageAccessibilityNameText}"
+                                       AutomationProperties.HelpText="{x:Static strings:AppResources.DraftImageAccessibilityHelpText}" />
                             </StackLayout>
                             <Button Grid.Row="0" Grid.RowSpan="2" Style="{StaticResource TransparentSquareButton}"
                                     Command="{Binding DraftingButtonCommand}" BorderColor="{StaticResource Primary}"
@@ -133,15 +134,15 @@
                            HorizontalOptions="FillAndExpand" Margin="0,0,10,0">
                         <Grid RowDefinitions="*,*">
                             <StackLayout Grid.Row="0" Grid.RowSpan="2">
-                                <Label Text="{StaticResource MyQuestionsTitleText}" Style="{StaticResource Header1}"
+                                <Label Text="{x:Static strings:AppResources.MyQuestionsTitleText}" Style="{StaticResource Header1}"
                                        Margin="0,10,0,0" />
                                 <Image x:Name="draftImage2" Margin="0" HorizontalOptions="Center"
                                        VerticalOptions="CenterAndExpand"
-                                       Source="{helpers:ImageResource RightToAskClient.Images.half_roo.png}"
+                                       Source="half_roo.png"
                                        WidthRequest="75"
                                        AutomationProperties.IsInAccessibleTree="True"
-                                       AutomationProperties.Name="{StaticResource DraftImageAccessibilityNameText}"
-                                       AutomationProperties.HelpText="{StaticResource DraftImageAccessibilityHelpText}" />
+                                       AutomationProperties.Name="{x:Static strings:AppResources.DraftImageAccessibilityNameText}"
+                                       AutomationProperties.HelpText="{x:Static strings:AppResources.DraftImageAccessibilityHelpText}" />
                             </StackLayout>
                             <Button Grid.Row="0" Grid.RowSpan="2" Style="{StaticResource TransparentSquareButton}"
                                     Command="{Binding DraftingButtonCommand}" BorderColor="{StaticResource Primary}"
@@ -155,15 +156,15 @@
                        Style="{StaticResource SubtleFrame}" HorizontalOptions="Center" Margin="0,0,0,0">
                     <Grid RowDefinitions="*,*">
                         <StackLayout Grid.Row="0" Grid.RowSpan="2">
-                            <Label Text="{StaticResource QuestionsForMeTitleText}" Style="{StaticResource Header1}"
+                            <Label Text="{x:Static strings:AppResources.QuestionsForMeTitleText}" Style="{StaticResource Header1}"
                                    Margin="0,10,0,0" />
                             <Image x:Name="questionsForMe" Margin="0" HorizontalOptions="Center"
                                    VerticalOptions="CenterAndExpand"
-                                   Source="{helpers:ImageResource RightToAskClient.Images.half_roo.png}"
+                                   Source="half_roo.png"
                                    WidthRequest="75"
                                    AutomationProperties.IsInAccessibleTree="True"
-                                   AutomationProperties.Name="{StaticResource DraftImageAccessibilityNameText}"
-                                   AutomationProperties.HelpText="{StaticResource DraftImageAccessibilityHelpText}" />
+                                   AutomationProperties.Name="{x:Static strings:AppResources.DraftImageAccessibilityNameText}"
+                                   AutomationProperties.HelpText="{x:Static strings:AppResources.DraftImageAccessibilityHelpText}" />
                         </StackLayout>
                         <Button Grid.Row="0" Grid.RowSpan="2" Style="{StaticResource TransparentSquareButton}"
                                 Command="{Binding DraftingButtonCommand}" BorderColor="{StaticResource Primary}"
diff --git a/RightToAskClient/RightToAskClient.Maui/Platforms/Android/MainActivity.cs b/RightToAskClient/RightToAskClient.Maui/Platforms/Android/MainActivity.cs
index 1b014ee9..a2a96c38 100644
--- a/RightToAskClient/RightToAskClient.Maui/Platforms/Android/MainActivity.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Platforms/Android/MainActivity.cs
@@ -1,12 +1,23 @@
 using Android.App;
 using Android.Content.PM;
 using Android.OS;
+using Android.Views;
 
 namespace RightToAskClient.Maui
 {
-    [Activity(Label = "RightToAskClient", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)]
+    [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
     public class MainActivity : MauiAppCompatActivity
     {
- 
+        protected override void OnCreate(Bundle savedInstanceState)
+        {
+            //this.RequestWindowFeature(Android.Views.WindowFeatures.NoTitle);
+
+            //Window?.AddFlags(WindowManagerFlags.Fullscreen | WindowManagerFlags.LayoutInScreen);
+            //Window?.ClearFlags(WindowManagerFlags.ForceNotFullscreen);
+
+            //var controller = Window?.InsetsController;
+            //controller?.Hide(WindowInsets.Type.SystemBars());
+            base.OnCreate(savedInstanceState);
+        }
     }
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Platforms/Android/Resources/values/styles.xml b/RightToAskClient/RightToAskClient.Maui/Platforms/Android/Resources/values/styles.xml
deleted file mode 100644
index 79de795f..00000000
--- a/RightToAskClient/RightToAskClient.Maui/Platforms/Android/Resources/values/styles.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<resources>
-	<!--<style name="myTheme" parent="android:Theme.Material">
-		<item name="android:buttonStyle">@style/noPaddingButtonStyle</item>
-	</style>-->
-	<style name="noPaddingButtonStyle" parent="@android:style/Widget.Button">
-		<item name="android:padding">0dp</item>
-		<item name="android:textAllCaps">false</item>
-	</style>
-	<style name="editorWithoutUnderline" parent="@android:style/Widget.EditText">
-		<item name="android:background">@android:color/transparent</item>
-		<item name="android:padding">10dp</item>
-	</style>
-	<style name="MainTheme" parent="MainTheme.Base">
-		<!-- As of Xamarin.Forms 4.6 the theme has moved into the Forms binary -->
-		<!-- If you want to override anything you can do that here. -->
-		<!-- Underneath are a couple of entries to get you started. -->		
-		<!-- Set theme colors from https://aka.ms/material-colors -->
-		<!-- colorPrimary is used for the default action bar background -->
-		<!--<item name="colorPrimary">#91CA47</item>-->
-		<!-- colorPrimaryDark is used for the status bar -->
-		<item name="colorPrimaryDark">#91CA47</item>
-		<!-- colorAccent is used as the default value for colorControlActivated
-         which is used to tint widgets -->
-		<!--<item name="colorAccent">#FF4081</item>-->
-		<!-- Top status bar area on Android -->
-		<item name="android:statusBarColor">#6e7c46</item> 
-		<item name="colorAccent">#9a4119</item>
-		<item name="android:buttonStyle">@style/noPaddingButtonStyle</item>
-		<item name="android:editTextStyle">@style/editorWithoutUnderline</item>
-	</style>
-</resources>
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/account_balance_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/account_balance_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/account_balance_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/account_balance_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/account_edit.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/account_edit.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/account_edit.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/account_edit.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/arrow_back_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/arrow_back_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/arrow_back_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/arrow_back_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/arrow_forward.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/arrow_forward.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/arrow_forward.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/arrow_forward.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/arrow_forward_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/arrow_forward_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/arrow_forward_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/arrow_forward_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/assured_workload_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/assured_workload_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/assured_workload_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/assured_workload_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/auto_awesome.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/auto_awesome.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/auto_awesome.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/auto_awesome.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/back.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/back.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/back.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/back.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/book_stack.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/book_stack.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/book_stack.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/book_stack.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/calendar_check_simple.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/calendar_check_simple.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/calendar_check_simple.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/calendar_check_simple.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/calendar_checkmark.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/calendar_checkmark.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/calendar_checkmark.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/calendar_checkmark.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/cancel_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/cancel_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/cancel_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/cancel_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/check_box_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/check_box_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/check_box_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/check_box_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/checkmark_box.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/checkmark_box.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/checkmark_box.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/checkmark_box.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/clipboard.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/clipboard.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/clipboard.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/clipboard.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/close.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/close.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/close.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/close.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/close_button.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/close_button.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/close_button.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/close_button.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/close_button_dark_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/close_button_dark_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/close_button_dark_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/close_button_dark_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/closed_book.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/closed_book.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/closed_book.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/closed_book.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/collapse.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/collapse.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/collapse.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/collapse.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/collapse_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/collapse_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/collapse_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/collapse_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/collapse_96.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/collapse_96.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/collapse_96.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/collapse_96.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/contact_mail_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/contact_mail_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/contact_mail_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/contact_mail_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/contact_support_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/contact_support_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/contact_support_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/contact_support_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/cup_of_supplies.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/cup_of_supplies.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/cup_of_supplies.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/cup_of_supplies.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/edit.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/edit.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/edit.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/edit.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/edit_note_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/edit_note_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/edit_note_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/edit_note_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/emu_75.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/emu_75.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/emu_75.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/emu_75.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/emu-pinkCircle.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/emu_pinkcircle.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/emu-pinkCircle.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/emu_pinkcircle.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/emu_tall.PNG b/RightToAskClient/RightToAskClient.Maui/Resources/Images/emu_tall.PNG
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/emu_tall.PNG
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/emu_tall.PNG
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/error.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/error.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/error.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/error.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/error_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/error_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/error_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/error_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/expand.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/expand.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/expand.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/expand.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/expand_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/expand_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/expand_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/expand_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/expand_96.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/expand_96.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/expand_96.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/expand_96.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/expand_circle_down_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/expand_circle_down_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/expand_circle_down_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/expand_circle_down_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/expand_circle_up_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/expand_circle_up_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/expand_circle_up_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/expand_circle_up_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/filter_sliders_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/filter_sliders_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/filter_sliders_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/filter_sliders_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/flag_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/flag_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/flag_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/flag_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/flags_dark.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/flags_dark.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/flags_dark.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/flags_dark.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/flags_filled_dark.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/flags_filled_dark.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/flags_filled_dark.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/flags_filled_dark.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/flags_filled_light.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/flags_filled_light.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/flags_filled_light.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/flags_filled_light.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/flags_light.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/flags_light.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/flags_light.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/flags_light.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/glasses.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/glasses.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/glasses.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/glasses.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/half_roo.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/half_roo.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/half_roo.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/half_roo.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/help_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/help_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/help_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/help_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/help_75.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/help_75.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/help_75.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/help_75.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/home1.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/home1.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/home1.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/home1.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/home2.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/home2.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/home2.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/home2.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/home3.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/home3.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/home3.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/home3.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/home4.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/home4.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/home4.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/home4.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/info_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/info_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/info_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/info_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/location_pin.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/location_pin.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/location_pin.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/location_pin.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/map.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/map.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/map.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/map.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/message_bubble.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/message_bubble.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/message_bubble.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/message_bubble.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/open_book.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/open_book.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/open_book.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/open_book.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/outline_arrow_circle_up_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/outline_arrow_circle_up_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/outline_arrow_circle_up_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/outline_arrow_circle_up_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/outline_question_answer_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/outline_question_answer_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/outline_question_answer_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/outline_question_answer_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/pen.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/pen.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/pen.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/pen.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/pending_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/pending_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/pending_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/pending_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/pin.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/pin.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/pin.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/pin.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/question_draft.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/question_draft.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/question_draft.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/question_draft.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/question_draft_resized.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/question_draft_resized.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/question_draft_resized.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/question_draft_resized.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/read_and_upvote.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/read_and_upvote.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/read_and_upvote.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/read_and_upvote.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/school_house.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/school_house.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/school_house.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/school_house.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/search.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/search.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/search.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/search.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/search_75.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/search_75.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/search_75.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/search_75.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/Search_Gray.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/search_gray.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/Search_Gray.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/search_gray.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/sentiment_very_dissatisfied.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/sentiment_very_dissatisfied.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/sentiment_very_dissatisfied.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/sentiment_very_dissatisfied.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/settings_gear.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/settings_gear.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/settings_gear.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/settings_gear.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/share_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/share_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/share_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/share_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/success_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/success_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/success_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/success_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/swipe_left_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/swipe_left_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/swipe_left_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/swipe_left_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/thumb_down_dark.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_down_dark.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/thumb_down_dark.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_down_dark.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/thumb_down_filled.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_down_filled.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/thumb_down_filled.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_down_filled.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/thumb_down_light.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_down_light.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/thumb_down_light.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_down_light.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/thumb_up_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_up_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/thumb_up_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_up_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/thumb_up_dark.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_up_dark.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/thumb_up_dark.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_up_dark.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/thumb_up_filled.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_up_filled.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/thumb_up_filled.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_up_filled.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/thumb_up_light.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_up_light.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/thumb_up_light.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/thumb_up_light.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/toolbox_bag.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/toolbox_bag.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/toolbox_bag.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/toolbox_bag.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/trash_delete_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/trash_delete_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/trash_delete_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/trash_delete_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/trending_up_48.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/trending_up_48.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/trending_up_48.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/trending_up_48.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/visibility_off.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/visibility_off.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/visibility_off.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/visibility_off.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/wireframe_roo_small.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/wireframe_roo_small.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/wireframe_roo_small.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/wireframe_roo_small.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/wireframe_roo_smaller.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/wireframe_roo_smaller.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/wireframe_roo_smaller.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/wireframe_roo_smaller.png
diff --git a/RightToAskClient/RightToAskClient.Maui/Images/write_draft.png b/RightToAskClient/RightToAskClient.Maui/Resources/Images/write_draft.png
similarity index 100%
rename from RightToAskClient/RightToAskClient.Maui/Images/write_draft.png
rename to RightToAskClient/RightToAskClient.Maui/Resources/Images/write_draft.png
diff --git a/RightToAskClient/RightToAskClient.Maui/RightToAskClient.Maui.csproj b/RightToAskClient/RightToAskClient.Maui/RightToAskClient.Maui.csproj
index 1b6c8d31..1de2a838 100644
--- a/RightToAskClient/RightToAskClient.Maui/RightToAskClient.Maui.csproj
+++ b/RightToAskClient/RightToAskClient.Maui/RightToAskClient.Maui.csproj
@@ -100,7 +100,7 @@
 	  <None Remove="Images\cup_of_supplies.png" />
 	  <None Remove="Images\edit.png" />
 	  <None Remove="Images\edit_note_48.png" />
-	  <None Remove="Images\emu-pinkCircle.png" />
+	  <None Remove="Images\emu-pinkcircle.png" />
 	  <None Remove="Images\emu_75.png" />
 	  <None Remove="Images\emu_tall.PNG" />
 	  <None Remove="Images\error.png" />
@@ -162,95 +162,6 @@
 	  <None Remove="Images\write_draft.png" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <EmbeddedResource Include="Images\account_balance_48.png" />
-	  <EmbeddedResource Include="Images\account_edit.png" />
-	  <EmbeddedResource Include="Images\arrow_back_48.png" />
-	  <EmbeddedResource Include="Images\arrow_forward.png" />
-	  <EmbeddedResource Include="Images\arrow_forward_48.png" />
-	  <EmbeddedResource Include="Images\assured_workload_48.png" />
-	  <EmbeddedResource Include="Images\auto_awesome.png" />
-	  <EmbeddedResource Include="Images\book_stack.png" />
-	  <EmbeddedResource Include="Images\calendar_checkmark.png" />
-	  <EmbeddedResource Include="Images\calendar_check_simple.png" />
-	  <EmbeddedResource Include="Images\cancel_48.png" />
-	  <EmbeddedResource Include="Images\checkmark_box.png" />
-	  <EmbeddedResource Include="Images\check_box_48.png" />
-	  <EmbeddedResource Include="Images\clipboard.png" />
-	  <EmbeddedResource Include="Images\close.png" />
-	  <EmbeddedResource Include="Images\closed_book.png" />
-	  <EmbeddedResource Include="Images\close_button.png" />
-	  <EmbeddedResource Include="Images\close_button_dark_48.png" />
-	  <EmbeddedResource Include="Images\collapse.png" />
-	  <EmbeddedResource Include="Images\collapse_48.png" />
-	  <EmbeddedResource Include="Images\collapse_96.png" />
-	  <EmbeddedResource Include="Images\contact_mail_48.png" />
-	  <EmbeddedResource Include="Images\contact_support_48.png" />
-	  <EmbeddedResource Include="Images\cup_of_supplies.png" />
-	  <EmbeddedResource Include="Images\edit.png" />
-	  <EmbeddedResource Include="Images\edit_note_48.png" />
-	  <EmbeddedResource Include="Images\emu-pinkCircle.png" />
-	  <EmbeddedResource Include="Images\emu_75.png" />
-	  <EmbeddedResource Include="Images\emu_tall.PNG" />
-	  <EmbeddedResource Include="Images\error.png" />
-	  <EmbeddedResource Include="Images\error_48.png" />
-	  <EmbeddedResource Include="Images\expand.png" />
-	  <EmbeddedResource Include="Images\expand_48.png" />
-	  <EmbeddedResource Include="Images\expand_96.png" />
-	  <EmbeddedResource Include="Images\expand_circle_down_48.png" />
-	  <EmbeddedResource Include="Images\expand_circle_up_48.png" />
-	  <EmbeddedResource Include="Images\filter_sliders_48.png" />
-	  <EmbeddedResource Include="Images\flags_dark.png" />
-	  <EmbeddedResource Include="Images\flags_filled_dark.png" />
-	  <EmbeddedResource Include="Images\flags_filled_light.png" />
-	  <EmbeddedResource Include="Images\flags_light.png" />
-	  <EmbeddedResource Include="Images\flag_48.png" />
-	  <EmbeddedResource Include="Images\glasses.png" />
-	  <EmbeddedResource Include="Images\half_roo.png" />
-	  <EmbeddedResource Include="Images\help_48.png" />
-	  <EmbeddedResource Include="Images\help_75.png" />
-	  <EmbeddedResource Include="Images\home1.png" />
-	  <EmbeddedResource Include="Images\home2.png" />
-	  <EmbeddedResource Include="Images\home3.png" />
-	  <EmbeddedResource Include="Images\home4.png" />
-	  <EmbeddedResource Include="Images\info_48.png" />
-	  <EmbeddedResource Include="Images\location_pin.png" />
-	  <EmbeddedResource Include="Images\map.png" />
-	  <EmbeddedResource Include="Images\message_bubble.png" />
-	  <EmbeddedResource Include="Images\open_book.png" />
-	  <EmbeddedResource Include="Images\outline_arrow_circle_up_48.png" />
-	  <EmbeddedResource Include="Images\outline_question_answer_48.png" />
-	  <EmbeddedResource Include="Images\pen.png" />
-	  <EmbeddedResource Include="Images\pending_48.png" />
-	  <EmbeddedResource Include="Images\pin.png" />
-	  <EmbeddedResource Include="Images\question_draft.png" />
-	  <EmbeddedResource Include="Images\question_draft_resized.png" />
-	  <EmbeddedResource Include="Images\read_and_upvote.png" />
-	  <EmbeddedResource Include="Images\school_house.png" />
-	  <EmbeddedResource Include="Images\search.png" />
-	  <EmbeddedResource Include="Images\search_75.png" />
-	  <EmbeddedResource Include="Images\Search_Gray.png" />
-	  <EmbeddedResource Include="Images\sentiment_very_dissatisfied.png" />
-	  <EmbeddedResource Include="Images\settings_gear.png" />
-	  <EmbeddedResource Include="Images\share_48.png" />
-	  <EmbeddedResource Include="Images\success_48.png" />
-	  <EmbeddedResource Include="Images\swipe_left_48.png" />
-	  <EmbeddedResource Include="Images\thumb_down_dark.png" />
-	  <EmbeddedResource Include="Images\thumb_down_filled.png" />
-	  <EmbeddedResource Include="Images\thumb_down_light.png" />
-	  <EmbeddedResource Include="Images\thumb_up_48.png" />
-	  <EmbeddedResource Include="Images\thumb_up_dark.png" />
-	  <EmbeddedResource Include="Images\thumb_up_filled.png" />
-	  <EmbeddedResource Include="Images\thumb_up_light.png" />
-	  <EmbeddedResource Include="Images\toolbox_bag.png" />
-	  <EmbeddedResource Include="Images\trash_delete_48.png" />
-	  <EmbeddedResource Include="Images\trending_up_48.png" />
-	  <EmbeddedResource Include="Images\visibility_off.png" />
-	  <EmbeddedResource Include="Images\wireframe_roo_small.png" />
-	  <EmbeddedResource Include="Images\wireframe_roo_smaller.png" />
-	  <EmbeddedResource Include="Images\write_draft.png" />
-	</ItemGroup>
-
 	<ItemGroup>
 	  <PackageReference Include="CommunityToolkit.Maui" Version="2.0.0" />
 	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
@@ -275,7 +186,7 @@
 	  <Compile Update="Views\AnswerDisplayCard.xaml.cs">
 	    <DependentUpon>%(Filename)</DependentUpon>
 	  </Compile>
-	  <Compile Update="Views\AppShell.xaml.cs">
+	  <Compile Update="AppShell.xaml.cs">
 	    <DependentUpon>%(Filename)</DependentUpon>
 	  </Compile>
 	  <Compile Update="Views\ClickableListView.xaml.cs">
@@ -390,7 +301,7 @@
 	  <MauiXaml Update="Views\AnswerDisplayCard.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
-	  <MauiXaml Update="Views\AppShell.xaml">
+	  <MauiXaml Update="AppShell.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Views\ClickableListView.xaml">
@@ -491,4 +402,8 @@
 	  </MauiXaml>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="Images\" />
+	</ItemGroup>
+
 </Project>
diff --git a/RightToAskClient/RightToAskClient.Maui/ViewModels/BaseViewModel.cs b/RightToAskClient/RightToAskClient.Maui/ViewModels/BaseViewModel.cs
index fe5be4ae..084dadb6 100644
--- a/RightToAskClient/RightToAskClient.Maui/ViewModels/BaseViewModel.cs
+++ b/RightToAskClient/RightToAskClient.Maui/ViewModels/BaseViewModel.cs
@@ -6,6 +6,7 @@
 using Microsoft.Maui.Controls;
 using Microsoft.Maui;
 using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Maui.Views;
 
 namespace RightToAskClient.Maui.ViewModels
 {
@@ -21,25 +22,25 @@ public BaseViewModel()
             {
                 var popup = new TwoButtonPopup(AppResources.GoHomePopupTitle, AppResources.GoHomePopupText,
                     AppResources.CancelButtonText, AppResources.GoHomeButtonText, false);
-                //TODO:
-                //var popupResult = await Application.Current.MainPage.Navigation.ShowPopupAsync(popup);
-                //if (popup.HasApproved(popupResult))
-                //{
-                //    await Application.Current.MainPage.Navigation.PopToRootAsync();
-                //}
+                
+                var popupResult = await Application.Current.MainPage.ShowPopupAsync(popup);
+                if (popup.HasApproved(popupResult))
+                {
+                    await Application.Current.MainPage.Navigation.PopToRootAsync();
+                }
+            });
+            
+            InfoPopupCommand = new AsyncRelayCommand(async () =>
+            {
+                //Page.Navigation.ShowPopup(new InfoPopup());
+                var popup = new InfoPopup(PopupHeaderText, PopupLabelText, AppResources.OKText);
+                await Application.Current.MainPage.Navigation.PushModalAsync(popup);
+            });
+            TCCommand = new AsyncRelayCommand(async () =>
+            {
+                var popup = new TermAndConditionPopup();
+                _ = await Application.Current.MainPage.ShowPopupAsync(popup);
             });
-            //TODO:
-            //InfoPopupCommand = new AsyncRelayCommand(async () =>
-            //{
-            //    //Page.Navigation.ShowPopup(new InfoPopup());
-            //    var popup = new InfoPopup(PopupHeaderText,PopupLabelText, AppResources.OKText);
-            //    _ = await Application.Current.MainPage.Navigation.ShowPopupAsync(popup);
-            //});
-            //TCCommand = new AsyncRelayCommand(async () =>
-            //{
-            //    var popup = new TermAndConditionPopup();
-            //    _ = await Application.Current.MainPage.Navigation.ShowPopupAsync(popup);
-            //});
         }
 
         private string _title = string.Empty;
diff --git a/RightToAskClient/RightToAskClient.Maui/ViewModels/QuestionViewModel.cs b/RightToAskClient/RightToAskClient.Maui/ViewModels/QuestionViewModel.cs
index 5758800c..885dea2a 100644
--- a/RightToAskClient/RightToAskClient.Maui/ViewModels/QuestionViewModel.cs
+++ b/RightToAskClient/RightToAskClient.Maui/ViewModels/QuestionViewModel.cs
@@ -16,7 +16,6 @@
 using Microsoft.Maui.Controls;
 using Microsoft.Maui;
 using CommunityToolkit.Mvvm.Input;
-
 namespace RightToAskClient.Maui.ViewModels
 {
     public class QuestionViewModel : BaseViewModel
@@ -98,23 +97,19 @@ public bool IsRaiseLayoutVisible
         public List<Uri> HansardLinks => Question.HansardLink;
 
         public string QuestionAnswerers =>
-            "";
-        //TODO:
-            //Extensions.JoinFilter(", ",
-            //        string.Join(", ", Question.Filters.SelectedAnsweringMPsNotMine.Select(mp => mp.ShortestName)),
-            //        string.Join(", ", Question.Filters.SelectedAnsweringMPsMine.Select(mp => mp.ShortestName)),
-            //        string.Join(", ", Question.Filters.SelectedAuthorities.Select(a => a.ShortestName)))
-            //    .NullToEmptyMessage(IsNewQuestion ? AppResources.HasNotMadeSelection : AppResources.NoSelections);
+           Helpers.Extensions.JoinFilter(", ",
+                   string.Join(", ", Question.Filters.SelectedAnsweringMPsNotMine.Select(mp => mp.ShortestName)),
+                   string.Join(", ", Question.Filters.SelectedAnsweringMPsMine.Select(mp => mp.ShortestName)),
+                   string.Join(", ", Question.Filters.SelectedAuthorities.Select(a => a.ShortestName)))
+               .NullToEmptyMessage(IsNewQuestion ? AppResources.HasNotMadeSelection : AppResources.NoSelections);
 
         // The MPs or committee who are meant to ask the question
         public string QuestionAskers =>
-                "";
-        //TODO:
-        //Extensions.JoinFilter(", ",
-        //            string.Join(", ", Question.Filters.SelectedAskingMPsNotMine.Select(mp => mp.ShortestName)),
-        //            string.Join(", ", Question.Filters.SelectedAskingMPsMine.Select(mp => mp.ShortestName)),
-        //            string.Join(",", Question.Filters.SelectedCommittees.Select(com => com.ShortestName)))
-        //        .NullToEmptyMessage(IsNewQuestion ? AppResources.HasNotMadeSelection : AppResources.NoSelections);
+            Helpers.Extensions.JoinFilter(", ",
+                    string.Join(", ", Question.Filters.SelectedAskingMPsNotMine.Select(mp => mp.ShortestName)),
+                    string.Join(", ", Question.Filters.SelectedAskingMPsMine.Select(mp => mp.ShortestName)),
+                    string.Join(",", Question.Filters.SelectedCommittees.Select(com => com.ShortestName)))
+                .NullToEmptyMessage(IsNewQuestion ? AppResources.HasNotMadeSelection : AppResources.NoSelections);
 
         public bool HasAskers
         {
@@ -144,7 +139,7 @@ public string NewHansardLink
                     Question.AddHansardLink(urlResult.Data);
 
                     Updates.NewHansardLinks.Add(new HansardLink(urlResult.Data.OriginalString));
-                        
+
                     ReportLabelText = "";
                     OnPropertyChanged("HansardLink");
                     OnPropertyChanged("HasUpdates");
@@ -180,21 +175,21 @@ public bool IsNewQuestion
 
         // Lists the updates that have occurred since construction.
         public QuestionUpdates Updates { get; protected set; } = new QuestionUpdates();
-        
+
         // Whether this user has updated this question. Used to 
         // determine whether the 'update' button is enabled.
         public bool HasUpdates => Updates.AnyUpdates
             || Question.WhoShouldAnswerTheQuestionPermissions != _initialWhoCanAnswerPermissions
-            || Question.WhoShouldAskTheQuestionPermissions != _initialWhoCanAskPermissions; 
+            || Question.WhoShouldAskTheQuestionPermissions != _initialWhoCanAskPermissions;
 
-    private HowAnsweredOptions _howAnswered = HowAnsweredOptions.DontKnow; 
+        private HowAnsweredOptions _howAnswered = HowAnsweredOptions.DontKnow;
 
         public HowAnsweredOptions HowAnswered
         {
             get => _howAnswered;
             set => SetProperty(ref _howAnswered, value);
         }
-        
+
         public bool IsShowPublicAuthority
         {
             get => _howAnswered != HowAnsweredOptions.InApp;
@@ -214,34 +209,34 @@ public bool EnableAnotherMPShouldRaiseButton
             get => _enableAnotherMPShouldRaiseButton;
             set => SetProperty(ref _enableAnotherMPShouldRaiseButton, value);
         }
-        
+
         public bool CanEditBackground
         {
             get
             {
-                var thisUser =  IndividualParticipant.getInstance().ProfileData.RegistrationInfo.uid;
+                var thisUser = IndividualParticipant.getInstance().ProfileData.RegistrationInfo.uid;
                 var questionWriter = _question.QuestionSuggester;
-                return IsNewQuestion || 
+                return IsNewQuestion ||
                        (!string.IsNullOrEmpty(thisUser) && !string.IsNullOrEmpty(questionWriter) && thisUser == questionWriter) && _question.Background.IsNullOrEmpty();
             }
         }
-        
+
 
         public bool OthersCanAddQuestionAnswerers
         {
-            get => _question.WhoShouldAnswerTheQuestionPermissions == RTAPermissions.Others; 
+            get => _question.WhoShouldAnswerTheQuestionPermissions == RTAPermissions.Others;
             set
             {
                 _question.WhoShouldAnswerTheQuestionPermissions = value ? RTAPermissions.Others : RTAPermissions.WriterOnly;
                 OnPropertyChanged();
                 OnPropertyChanged("HasUpdates");
-            } 
-            
+            }
+
         }
 
         public bool OthersCanAddQuestionAskers
         {
-            get => _question.WhoShouldAskTheQuestionPermissions == RTAPermissions.Others; 
+            get => _question.WhoShouldAskTheQuestionPermissions == RTAPermissions.Others;
             set
             {
                 _question.WhoShouldAskTheQuestionPermissions = value ? RTAPermissions.Others : RTAPermissions.WriterOnly;
@@ -249,7 +244,7 @@ public bool OthersCanAddQuestionAskers
                 OnPropertyChanged("HasUpdates");
             }
         }
-        
+
         private bool _goHome;
         public bool GoHome
         {
@@ -297,7 +292,7 @@ public string SaveButtonText
         // total = up + down
         public int UpVotes => (Question.TotalVotes + Question.NetVotes) / 2;
         public int DownVotes => (Question.TotalVotes - Question.NetVotes) / 2;
-        
+
         public string QuestionSuggesterButtonText => QuestionViewModel.Instance.IsNewQuestion ? AppResources.EditProfileButtonText : string.Format(AppResources.ViewOtherUserProfile, QuestionViewModel.Instance.Question.QuestionSuggester);
 
         public void UpdateMPButtons()
@@ -306,9 +301,9 @@ public void UpdateMPButtons()
         }
 
         // Used for keeping track of whether permissions need to be updated when editing own question.
-        protected RTAPermissions _initialWhoCanAnswerPermissions=RTAPermissions.NoChange;
+        protected RTAPermissions _initialWhoCanAnswerPermissions = RTAPermissions.NoChange;
 
-        protected RTAPermissions _initialWhoCanAskPermissions=RTAPermissions.NoChange;
+        protected RTAPermissions _initialWhoCanAskPermissions = RTAPermissions.NoChange;
         // constructor
         // Set up empty question
         // Used when we're generating our own question for upload.
@@ -324,28 +319,28 @@ public QuestionViewModel()
             AnotherUserButtonText = AppResources.AnotherUserButtonText;
             NotSureWhoShouldRaiseButtonText = AppResources.NotSureButtonText;
             SelectButtonText = AppResources.SelectButtonText;
-            
+
             // commands
-            ProceedToReadingPageCommand = new AsyncRelayCommand (async() => 
+            ProceedToReadingPageCommand = new AsyncRelayCommand(async () =>
             {
                 await Shell.Current.GoToAsync($"{nameof(ReadingPage)}");
             });
-            QuestionDraftDoneCommand = new AsyncRelayCommand (async () =>
+            QuestionDraftDoneCommand = new AsyncRelayCommand(async () =>
             {
                 await Shell.Current.GoToAsync($"{nameof(QuestionAnswererPage)}");
             });
             // For skipping choices - just navigate forwards
-            LeaveAnswererBlankButtonCommand = new AsyncRelayCommand (async () =>
+            LeaveAnswererBlankButtonCommand = new AsyncRelayCommand(async () =>
             {
                 await Shell.Current.GoToAsync($"{nameof(QuestionAskerPage)}");
             });
-            OtherPublicAuthorityButtonCommand = new AsyncRelayCommand (async () =>
+            OtherPublicAuthorityButtonCommand = new AsyncRelayCommand(async () =>
             {
                 // Question.AnswerInApp = false;
                 // AnswerInApp = false;
                 var pageToSearchAuthorities
                     = new SelectableListPage(Instance.Question.Filters.AuthorityLists, "Choose authorities");
-                await Shell.Current.Navigation.PushAsync(pageToSearchAuthorities).ContinueWith((_) => 
+                await Shell.Current.Navigation.PushAsync(pageToSearchAuthorities).ContinueWith((_) =>
                 {
                     MessagingCenter.Send(this, Constants.GoToAskingPageNext); // Sends this view model
                 });
@@ -354,7 +349,7 @@ await Shell.Current.Navigation.PushAsync(pageToSearchAuthorities).ContinueWith((
             // straight to the Explorer page that lists them.
             // If we don't, go to the page for entering address and finding them.
             // It will pop back to here.
-            AnsweredByMyMPCommand = new AsyncRelayCommand (async () =>
+            AnsweredByMyMPCommand = new AsyncRelayCommand(async () =>
             {
                 // Question.AnswerInApp = true;
                 // AnswerInApp = true;
@@ -366,7 +361,7 @@ await NavigationUtils.PushMyAnsweringMPsExploringPage(
                         Constants.GoToQuestionDetailPageNext : Constants.GoToAskingPageNext); // Sends this view model
                 });
             });
-            AnsweredByOtherMPCommandOptionB = new AsyncRelayCommand (async () =>
+            AnsweredByOtherMPCommandOptionB = new AsyncRelayCommand(async () =>
             {
                 // Question.AnswerInApp = false;
                 // AnswerInApp = false;
@@ -377,7 +372,7 @@ await NavigationUtils.PushAnsweringMPsNotMineSelectableListPage(
                         Constants.GoToQuestionDetailPageNext : Constants.GoToAskingPageNext); // Sends this view model
                 });
             });
-            UpvoteCommand = new AsyncRelayCommand (async () =>
+            UpvoteCommand = new AsyncRelayCommand(async () =>
             {
                 // First check if they're registered, and offer them the chance to register if not
                 if (!IndividualParticipant.getInstance().ProfileData.RegistrationInfo.IsRegistered)
@@ -410,10 +405,10 @@ await NavigationUtils.DoRegistrationCheck(
                     }
                 }
             });
-            DownvoteCommand = new AsyncRelayCommand (async () =>
+            DownvoteCommand = new AsyncRelayCommand(async () =>
             {
                 // First check if they're registered, and offer them the chance to register if not
-                if (!IndividualParticipant.getInstance().ProfileData.RegistrationInfo.IsRegistered) 
+                if (!IndividualParticipant.getInstance().ProfileData.RegistrationInfo.IsRegistered)
                 {
                     await NavigationUtils.DoRegistrationCheck(
                         IndividualParticipant.getInstance().ProfileData.RegistrationInfo,
@@ -446,7 +441,7 @@ await NavigationUtils.DoRegistrationCheck(
             {
                 EditQuestionButton_OnClicked();
             });
-            QuestionSuggesterCommand = new AsyncRelayCommand (async () =>
+            QuestionSuggesterCommand = new AsyncRelayCommand(async () =>
             {
                 var userId = Question.QuestionSuggester;
                 var userToSend = await RTAClient.GetUserById(userId);
@@ -460,7 +455,7 @@ await NavigationUtils.DoRegistrationCheck(
                     ReportLabelText = errorMessage;
                 }
                 // Success
-                else 
+                else
                 {
                     var newReg = new Registration(userToSend.Data);
                     Debug.Assert(newReg.registrationStatus == RegistrationStatus.AnotherPerson);
@@ -468,36 +463,36 @@ await NavigationUtils.DoRegistrationCheck(
                     await Application.Current.MainPage.Navigation.PushAsync(userProfilePage);
                 }
             });
-            BackCommand = new AsyncRelayCommand (async () =>
+            BackCommand = new AsyncRelayCommand(async () =>
             {
                 HomeButtonCommand.Execute(null); // just inherit the functionality of the home button from BaseViewModel
             });
-            OptionACommand = new AsyncRelayCommand (async () =>
+            OptionACommand = new AsyncRelayCommand(async () =>
             {
                 await Shell.Current.GoToAsync($"{nameof(QuestionAskerPage)}");
             });
-            OptionBCommand = new AsyncRelayCommand (async () =>
+            OptionBCommand = new AsyncRelayCommand(async () =>
             {
                 await Shell.Current.GoToAsync($"{nameof(QuestionAskerPage)}");
             });
-            ToHowAnsweredOptionPageCommand = new AsyncRelayCommand (async () =>
+            ToHowAnsweredOptionPageCommand = new AsyncRelayCommand(async () =>
             {
                 await Shell.Current.GoToAsync($"{nameof(HowAnsweredOptionPage)}");
             });
-            ToAnswererPageWithHowAnsweredSelectionCommand = new AsyncRelayCommand (async () =>
+            ToAnswererPageWithHowAnsweredSelectionCommand = new AsyncRelayCommand(async () =>
             {
                 await Shell.Current.GoToAsync($"{nameof(QuestionAnswererPage)}");
             });
-            ShareCommand = new AsyncRelayCommand (async() =>
+            ShareCommand = new AsyncRelayCommand(async () =>
             {
-                await Share.RequestAsync(new ShareTextRequest 
+                await Share.RequestAsync(new ShareTextRequest
                 {
                     // FIXME should this be Instance.?
                     Text = Question.QuestionText,
                     Title = "Share Text"
                 });
             });
-            ReportCommand = new AsyncRelayCommand (async () =>
+            ReportCommand = new AsyncRelayCommand(async () =>
             {
                 if (!IndividualParticipant.getInstance().ProfileData.RegistrationInfo.IsRegistered)
                 {
@@ -541,27 +536,27 @@ public bool IsAnswerInApp
 
         public bool IsVerifiedMpAccount => IndividualParticipant.getInstance().ProfileData.RegistrationInfo.IsVerifiedMPAccount;
         public Command NotSureWhoShouldRaiseCommand => _notSureWhoShouldRaiseCommand ??= new Command(NotSureWhoShouldRaiseButtonClicked);
-        public IAsyncRelayCommand  ProceedToReadingPageCommand { get; }
-        public IAsyncRelayCommand  LeaveAnswererBlankButtonCommand { get; }
-        public IAsyncRelayCommand  QuestionDraftDoneCommand { get; }
-        public IAsyncRelayCommand  OtherPublicAuthorityButtonCommand { get; }
-        public IAsyncRelayCommand  AnsweredByMyMPCommand { get; }
+        public IAsyncRelayCommand ProceedToReadingPageCommand { get; }
+        public IAsyncRelayCommand LeaveAnswererBlankButtonCommand { get; }
+        public IAsyncRelayCommand QuestionDraftDoneCommand { get; }
+        public IAsyncRelayCommand OtherPublicAuthorityButtonCommand { get; }
+        public IAsyncRelayCommand AnsweredByMyMPCommand { get; }
         // public IAsyncRelayCommand  AnsweredByOtherMPCommand { get; }
-        public IAsyncRelayCommand  AnsweredByOtherMPCommandOptionB { get; }
-        public IAsyncRelayCommand  QuestionSuggesterCommand { get; }
-        public IAsyncRelayCommand  BackCommand { get; }
+        public IAsyncRelayCommand AnsweredByOtherMPCommandOptionB { get; }
+        public IAsyncRelayCommand QuestionSuggesterCommand { get; }
+        public IAsyncRelayCommand BackCommand { get; }
         public Command SaveQuestionCommand { get; }
-        public IAsyncRelayCommand  UpvoteCommand { get; }
-        public IAsyncRelayCommand  DownvoteCommand { get; }
+        public IAsyncRelayCommand UpvoteCommand { get; }
+        public IAsyncRelayCommand DownvoteCommand { get; }
         public Command EditAnswerCommand { get; }
-        public IAsyncRelayCommand  OptionACommand { get; }
-        public IAsyncRelayCommand  OptionBCommand { get; }
-        
-        public IAsyncRelayCommand  ToAnswererPageWithHowAnsweredSelectionCommand { get; }
-        public IAsyncRelayCommand  ToHowAnsweredOptionPageCommand { get; }
-        public IAsyncRelayCommand  ShareCommand { get; }
-        public IAsyncRelayCommand  ReportCommand { get; }
-        
+        public IAsyncRelayCommand OptionACommand { get; }
+        public IAsyncRelayCommand OptionBCommand { get; }
+
+        public IAsyncRelayCommand ToAnswererPageWithHowAnsweredSelectionCommand { get; }
+        public IAsyncRelayCommand ToHowAnsweredOptionPageCommand { get; }
+        public IAsyncRelayCommand ShareCommand { get; }
+        public IAsyncRelayCommand ReportCommand { get; }
+
         public void ClearQuestionDataAddWriter()
         {
             // set defaults
@@ -571,7 +566,7 @@ public void ClearQuestionDataAddWriter()
         }
 
         // methods for selecting who will raise your question
-        
+
         // Nobody raises the question - just asking for an answer in the app.
         /*
         private async void OnAnswerInAppButtonClicked()
@@ -672,7 +667,7 @@ await NavigationUtils.DoRegistrationCheck(
                     {
                         PromptForNextStepAndClearQuestionIfNeeded();
                     }
-                }                
+                }
             }
         }
 
@@ -681,7 +676,7 @@ private async void EditQuestionButton_OnClicked()
             try
             {
                 if (!IndividualParticipant.getInstance().ProfileData.RegistrationInfo.IsRegistered)
-                { 
+                {
                     await NavigationUtils.DoRegistrationCheck(
                         IndividualParticipant.getInstance().ProfileData.RegistrationInfo,
                         AppResources.CancelButtonText);
@@ -696,10 +691,10 @@ await NavigationUtils.DoRegistrationCheck(
             if (IndividualParticipant.getInstance().ProfileData.RegistrationInfo.IsRegistered)
             {
                 var validQuestion = Question.ValidateUpdateQuestion();
-                if (validQuestion) 
+                if (validQuestion)
                 {
                     SendQuestionEditToServer();
-                }                
+                }
             }
             else
             {
@@ -727,10 +722,10 @@ private async Task<bool> SendUpVoteToServer(bool isUp)
 
             var httpResponse = await RTAClient.SendPlaintextUpvote(voteOnQuestion,
                 IndividualParticipant.getInstance().ProfileData.RegistrationInfo.uid);
-            (bool isValid, string errorMessage) = RTAClient.ValidateHttpResponse(httpResponse, "Vote upload");  
-            if(!isValid) 
+            (bool isValid, string errorMessage) = RTAClient.ValidateHttpResponse(httpResponse, "Vote upload");
+            if (!isValid)
             {
-                var error =  "Error uploading vote: " + errorMessage;
+                var error = "Error uploading vote: " + errorMessage;
                 ReportLabelText = error;
                 Debug.WriteLine(error);
                 return false;
@@ -738,7 +733,7 @@ private async Task<bool> SendUpVoteToServer(bool isUp)
 
             return true;
         }
-        
+
         // For uploading a new question
         // This should be called only if the person is already registered.
         // Returns true if the upload was successful; false otherwise.
@@ -749,7 +744,7 @@ private async Task<bool> SendNewQuestionToServer()
             {
                 throw new TriedToUploadWhileNotRegisteredException("Sending up-vote to server.");
             }
-            
+
             // TODO use returnedData to record questionID, version, hash
             (bool isValid, string errorMessage, string returnedData) successfulSubmission =
                 await BuildSignAndUploadNewQuestion();
@@ -762,12 +757,12 @@ private async Task<bool> SendNewQuestionToServer()
 
             return true;
         }
-        
+
         // This is only called if a question has been successfully uploaded. We clear the
         // question data and ask the user if they'd like to write another question with the same
         // filters, or clear them and go home.
-        private async void PromptForNextStepAndClearQuestionIfNeeded() 
-        { 
+        private async void PromptForNextStepAndClearQuestionIfNeeded()
+        {
             // creating a question will add it to their list
             IndividualParticipant.getInstance().HasQuestions = true;
             XamarinPreferences.shared.Set(Constants.HasQuestions, true);
@@ -780,15 +775,15 @@ private async void PromptForNextStepAndClearQuestionIfNeeded()
             {
                 Instance.Question.Filters.RemoveAllSelections();
                 await Application.Current.MainPage.Navigation.PopToRootAsync();
-                    
+
             }
             // Otherwise remain on the question publish page with the opportunity to write a new question.
-            else 
+            else
             {
                 Question.QuestionText = String.Empty;
                 Background = String.Empty;
             }
-            
+
         }
 
         private async void SendQuestionEditToServer()
@@ -798,9 +793,9 @@ private async void SendQuestionEditToServer()
             {
                 throw new TriedToUploadWhileNotRegisteredException("Sending up-vote to server.");
             }
-            
+
             var successfulSubmission = await BuildSignAndUploadQuestionUpdates();
-            
+
             if (!successfulSubmission.isValid)
             {
                 var message = successfulSubmission.errorMessage ?? "";
@@ -810,13 +805,13 @@ await Application.Current.MainPage.DisplayAlert(AppResources.EditQuestionErrorTe
                 // ReportLabelText = "Error editing question: " + successfulSubmission.errorMessage;
                 return;
             }
-            
+
             // Success - reinitialize question state and make sure we've got the most up to date version.
             Question.Version = successfulSubmission.returnedData;
             ReInitUpdatesAndErrors();
-            
+
             // Go back to the reading page you came from.
-            var popup = new OneButtonPopup(AppResources.QuestionEditSuccessfulPopupTitle, AppResources.QuestionEditSuccessfulPopupText, AppResources.GoHomeButtonText, false);            
+            var popup = new OneButtonPopup(AppResources.QuestionEditSuccessfulPopupTitle, AppResources.QuestionEditSuccessfulPopupText, AppResources.GoHomeButtonText, false);
             await App.Current.MainPage.DisplayAlert(AppResources.QuestionEditSuccessfulPopupTitle, AppResources.QuestionEditSuccessfulPopupText, AppResources.GoHomeButtonText);
 
             await Application.Current.MainPage.Navigation.PopToRootAsync();
@@ -838,7 +833,7 @@ await Application.Current.MainPage.DisplayAlert(AppResources.EditQuestionErrorTe
                 doPermissionUpdate(Question.WhoShouldAnswerTheQuestionPermissions, _initialWhoCanAnswerPermissions);
             Updates.WhoShouldAskPermissions =
                 doPermissionUpdate(Question.WhoShouldAskTheQuestionPermissions, _initialWhoCanAskPermissions);
-            
+
             var httpResponse = await RTAClient.UpdateExistingQuestion(
                 Updates,
                 IndividualParticipant.getInstance().ProfileData.RegistrationInfo.uid);
@@ -857,19 +852,19 @@ private RTAPermissions doPermissionUpdate(RTAPermissions current, RTAPermissions
 
         protected void ReInitUpdatesAndErrors()
         {
-                // Empty updatable fields
-                NewAnswer = "";
-                NewBackground = "";
-                NewHansardLink = "";
-                
-                // Keep track of changes to question asking/answering permission.
-                _initialWhoCanAskPermissions = _question.WhoShouldAskTheQuestionPermissions;
-                _initialWhoCanAnswerPermissions = _question.WhoShouldAnswerTheQuestionPermissions;
+            // Empty updatable fields
+            NewAnswer = "";
+            NewBackground = "";
+            NewHansardLink = "";
 
-                // Keep track of other Updates/changes
-                Updates = new QuestionUpdates(Question.QuestionId, Question.Version);
+            // Keep track of changes to question asking/answering permission.
+            _initialWhoCanAskPermissions = _question.WhoShouldAskTheQuestionPermissions;
+            _initialWhoCanAnswerPermissions = _question.WhoShouldAnswerTheQuestionPermissions;
 
-                ReportLabelText = "";
+            // Keep track of other Updates/changes
+            Updates = new QuestionUpdates(Question.QuestionId, Question.Version);
+
+            ReportLabelText = "";
         }
     }
 }
diff --git a/RightToAskClient/RightToAskClient.Maui/ViewModels/ReadingPageViewModel.cs b/RightToAskClient/RightToAskClient.Maui/ViewModels/ReadingPageViewModel.cs
index 19d0414e..bbd37e2b 100644
--- a/RightToAskClient/RightToAskClient.Maui/ViewModels/ReadingPageViewModel.cs
+++ b/RightToAskClient/RightToAskClient.Maui/ViewModels/ReadingPageViewModel.cs
@@ -16,6 +16,7 @@
 using Microsoft.Maui.Controls;
 using Microsoft.Maui;
 using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Maui.Views;
 
 namespace RightToAskClient.Maui.ViewModels
 {
@@ -166,8 +167,8 @@ await NavigationUtils.DoRegistrationCheck(
                     if (showHowToPublishPopup)
                     {
                         //TODO:
-                        //var popup = new HowToPublishPopup();
-                        //if (popup != null)  await Application.Current.MainPage.Navigation.PopModalAsync(popup);
+                        var popup = new HowToPublishPopup();
+                        if (popup != null) await Application.Current.MainPage.ShowPopupAsync(popup);
 
                         // Only show it once.
                         XamarinPreferences.shared.Set(Constants.ShowHowToPublishPopup, false);
diff --git a/RightToAskClient/RightToAskClient.Maui/ViewModels/RegistrationViewModel.cs b/RightToAskClient/RightToAskClient.Maui/ViewModels/RegistrationViewModel.cs
index 33af0b6a..4c938cd8 100644
--- a/RightToAskClient/RightToAskClient.Maui/ViewModels/RegistrationViewModel.cs
+++ b/RightToAskClient/RightToAskClient.Maui/ViewModels/RegistrationViewModel.cs
@@ -697,8 +697,8 @@ var pageToSearchMPs
 
         private async void PromptUser(string message)
         {
-            //TODO: var popup = new OneButtonPopup(message, AppResources.OKText);
-          //  _ = await Application.Current.MainPage.Navigation.ShowPopupAsync(popup);
+            var popup = new OneButtonPopup(message, AppResources.OKText);
+            await Application.Current.MainPage.Navigation.PushModalAsync(popup);
         }
 
         #endregion
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/AboutPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/AboutPage.xaml
index e85d8455..58cb9ba5 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/AboutPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/AboutPage.xaml
@@ -5,7 +5,7 @@
              xmlns:vm="clr-namespace:RightToAskClient.Maui.ViewModels"
              xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
-           
+             xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:Class="RightToAskClient.Maui.Views.AboutPage"
              Title="About"
              Shell.FlyoutBehavior="Flyout">
@@ -13,8 +13,8 @@
         <vm:BaseViewModel/>
     </ContentPage.BindingContext>
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{StaticResource InfoPopupButtonText}" Command="{Binding InfoPopupCommand}" x:DataType="vm:BaseViewModel" 
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.help_75.png}"/>
+        <ToolbarItem Text="{x:Static strings:AppResources.InfoPopupButtonText}" Command="{Binding InfoPopupCommand}" x:DataType="vm:BaseViewModel" 
+                     IconImageSource="help_75.png"/>
     </ContentPage.ToolbarItems>
     <ContentPage.Content>
             <WebView x:Name="webView" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" 
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/AccountPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/AccountPage.xaml
index 23ce8005..added225 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/AccountPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/AccountPage.xaml
@@ -7,7 +7,7 @@
              xmlns:vm="clr-namespace:RightToAskClient.Maui.ViewModels"
              xmlns:local="clr-namespace:RightToAskClient.Maui"
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
-          
+            xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:Class="RightToAskClient.Maui.Views.AccountPage"
              x:DataType="vm:RegistrationViewModel"
              Shell.FlyoutBehavior="Flyout"
@@ -16,9 +16,9 @@
         <vm:RegistrationViewModel />
     </ContentPage.BindingContext>
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{StaticResource InfoPopupButtonText}" Command="{Binding InfoPopupCommand}"
+        <ToolbarItem Text="{x:Static strings:AppResources.InfoPopupButtonText}" Command="{Binding InfoPopupCommand}"
                      x:DataType="vm:BaseViewModel"
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.help_75.png}" />
+                     IconImageSource="help_75.png" />
     </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <Grid>
@@ -29,20 +29,20 @@
                         <!-- TODO Unfortunately I think this is getting drawn, then made invisible, hence creating a lot of whitespace -->
                         <StackLayout Orientation="Vertical" VerticalOptions="Center">
                             <StackLayout Orientation="Horizontal" HorizontalOptions="Center">
-                                <Button Text="{StaticResource CompleteAccountCreationButtonText}"
+                                <Button Text="{x:Static strings:AppResources.CompleteAccountCreationButtonText}"
                                         Style="{StaticResource DoneButton}" Command="{Binding DoneButtonCommand}"
                                         HorizontalOptions="Center"
                                         IsVisible="{Binding IsMyAccount, Converter={StaticResource Key=cnvInvert}}" />
                             </StackLayout>
                         </StackLayout>
                         <!-- This button seems redundant because you can tap on the electorates to edit -->
-                        <!-- <Button Text="{StaticResource UpdateMPsButtonText}" Style="{StaticResource DoneButton}" Command="{Binding UpdateMPsButtonCommand}" IsVisible="{Binding IsMyAccount}"/> -->
+                        <!-- <Button Text="{x:Static strings:AppResources.UpdateMPsButtonText}" Style="{StaticResource DoneButton}" Command="{Binding UpdateMPsButtonCommand}" IsVisible="{Binding IsMyAccount}"/> -->
                         <!-- 
                 <Label Text="{Binding RegisteredMP.ShortestName, StringFormat='Registered MP account for {0}'}"
                        IsVisible="{Binding ShowExistingMPRegistrationLabel}" Style="{StaticResource NormalText}" />
                 <Label Text="Verified staffer" IsVisible="{Binding ShowStafferLabel}" Style="{StaticResource NormalText}" /> -->
                         <!-- <StackLayout Orientation="Horizontal" HorizontalOptions="CenterAndExpand"> -->
-                        <!--     <Label Text="{StaticResource MPRegistrationOptionText}" Style="{StaticResource NormalText}" -->
+                        <!--     <Label Text="{x:Static strings:AppResources.MPRegistrationOptionText}" Style="{StaticResource NormalText}" -->
                         <!--            VerticalOptions="Center" /> -->
                         <!--     <Button Text="{Binding RegisterMPButtonText}" -->
                         <!--             Command="{Binding ChooseMPToRegisterButtonCommand}" -->
@@ -55,9 +55,9 @@
                                     Command="{Binding ChooseMPToRegisterButtonCommand}"
                                     IsVisible="{Binding ShowRegisterMPButton}" Style="{StaticResource EditorProceed}"
                                     HorizontalOptions="Start"
-                                    SemanticProperties.Hint="{StaticResource RegisterMPButtonHint}"
+                                    SemanticProperties.Hint="{x:Static strings:AppResources.RegisterMPButtonHint}"
                                     SemanticProperties.Description="{Binding RegisterMPButtonText}"/>
-                            <ImageButton Source="{helpers:ImageResource RightToAskClient.Images.arrow_forward.png}"
+                            <ImageButton Source="arrow_forward.png"
                                          BackgroundColor="Transparent" WidthRequest="20" HeightRequest="20" HorizontalOptions="End"/>
                         </FlexLayout>
                         <BoxView Style="{StaticResource ButtonSeparator}"/>
@@ -72,15 +72,15 @@
                 <StackLayout Orientation="Vertical"
                              VerticalOptions="CenterAndExpand"
                              HorizontalOptions="CenterAndExpand">
-                    <Label Text="{StaticResource SignUpTitleText}" Style="{StaticResource SignUpTitle}"/>
-                    <Label Text="{StaticResource SignUpBodyText}" Style="{StaticResource SignUpBody}"/>
+                    <Label Text="{x:Static strings:AppResources.SignUpTitleText}" Style="{StaticResource SignUpTitle}"/>
+                    <Label Text="{x:Static strings:AppResources.SignUpBodyText}" Style="{StaticResource SignUpBody}"/>
                     <StackLayout>
                         <Button Text="Sign up"
                                 Margin="70, 0"
                                 Style="{StaticResource NormalButton}"
                                 Command="{Binding DoRegistrationCommand}"
-                                SemanticProperties.Hint="{StaticResource SignUpButtonHint}"
-                                SemanticProperties.Description="{StaticResource SignUpTitleText}"/>
+                                SemanticProperties.Hint="{x:Static strings:AppResources.SignUpButtonHint}"
+                                SemanticProperties.Description="{x:Static strings:AppResources.SignUpTitleText}"/>
                     </StackLayout>
                 </StackLayout>
             </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/AdvancedSearchFiltersPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/AdvancedSearchFiltersPage.xaml
index 353a8026..7298ef7f 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/AdvancedSearchFiltersPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/AdvancedSearchFiltersPage.xaml
@@ -7,18 +7,18 @@
              xmlns:local="clr-namespace:RightToAskClient.Maui"
              xmlns:views="clr-namespace:RightToAskClient.Maui.Views;assembly=RightToAskClient.Maui"
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
-             
+               xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              Title="{Binding Title}"
              x:DataType="vm:FilterViewModel">
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{StaticResource  InfoPopupButtonText}" Command="{Binding InfoPopupCommand}" x:DataType="vm:BaseViewModel" 
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.help_75.png}"/>
+        <ToolbarItem Text="{x:Static strings:AppResources.InfoPopupButtonText}" Command="{Binding InfoPopupCommand}" x:DataType="vm:BaseViewModel" 
+                     IconImageSource="help_75.png"/>
     </ContentPage.ToolbarItems>
     <Shell.BackButtonBehavior>
         <BackButtonBehavior Command="{Binding BackCommand}"
                             IconOverride="back.png"
-                            SemanticProperties.Hint="{StaticResource  BackHint}"
-                            SemanticProperties.Description="{StaticResource  BackDescription}" />
+                            SemanticProperties.Hint="{x:Static strings:AppResources.BackHint}"
+                            SemanticProperties.Description="{x:Static strings:AppResources.BackDescription}" />
     </Shell.BackButtonBehavior>
         <ContentPage.Content>
         <ScrollView>
@@ -29,12 +29,12 @@
                         <xct:Expander.Header>
                             <StackLayout Orientation="Vertical">                          
                             <StackLayout Orientation="Horizontal" HorizontalOptions="FillAndExpand">
-                                <Label Text="{StaticResource  ToBeAnsweredByText}" Style="{StaticResource NestedListLabel}"/>
-                                <Image Source="{helpers:ImageResource RightToAskClient.Images.expand_48.png}"  
+                                <Label Text="{x:Static strings:AppResources.ToBeAnsweredByText}" Style="{StaticResource NestedListLabel}"/>
+                                <Image Source="expand_48.png"  
                                        Style="{StaticResource NestedListIcon}">
                                     <Image.Triggers>
                                         <DataTrigger TargetType="Image" Binding="{Binding Source={RelativeSource AncestorType={x:Type xct:Expander}}, Path=IsExpanded}" Value="True">
-                                            <Setter Property="Source" Value="{helpers:ImageResource RightToAskClient.Images.collapse_48.png}" />
+                                            <Setter Property="Source" Value="collapse_48.png" />
                                             <Setter Property="Style" Value="{StaticResource NestedListIcon}"/>
                                         </DataTrigger>
                                     </Image.Triggers>
@@ -54,9 +54,9 @@
                                 <views:ClickableListView BindingContext="{Binding AnsweringAuthorities}"/>
                                 <!-- Not currently functional.
                                 <Grid RowDefinitions="Auto,Auto" ColumnDefinitions="Auto, Auto" RowSpacing="10">
-                                        <Label Grid.Column="0" Text="{StaticResource  IncludeAnsweredQuestions}" Style="{StaticResource NormalText}" HorizontalTextAlignment="Start" VerticalTextAlignment="Center" />
+                                        <Label Grid.Column="0" Text="{x:Static strings:AppResources.IncludeAnsweredQuestions}" Style="{StaticResource NormalText}" HorizontalTextAlignment="Start" VerticalTextAlignment="Center" />
                                         <CheckBox Grid.Column="1" IsChecked="True" />
-                                        <Label Grid.Row="1" Grid.Column="0" Text="{StaticResource  IncludeUnansweredQuestions}" Style="{StaticResource NormalText}" HorizontalTextAlignment="Start" VerticalTextAlignment="Center" />
+                                        <Label Grid.Row="1" Grid.Column="0" Text="{x:Static strings:AppResources.IncludeUnansweredQuestions}" Style="{StaticResource NormalText}" HorizontalTextAlignment="Start" VerticalTextAlignment="Center" />
                                         <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="True" />
                                 </Grid>
                                 -->
@@ -70,14 +70,14 @@
                         <xct:Expander.Header>
                             <StackLayout Orientation="Vertical">
                                 <StackLayout Orientation="Horizontal" HorizontalOptions="FillAndExpand">
-                                    <Label Text="{StaticResource  OptionBText4}" Style="{StaticResource NestedListLabel}" />
-                                    <Image Source="{helpers:ImageResource RightToAskClient.Images.expand_48.png}" 
+                                    <Label Text="{x:Static strings:AppResources.OptionBText4}" Style="{StaticResource NestedListLabel}" />
+                                    <Image Source="expand_48.png" 
                                            Style="{StaticResource NestedListIcon}">
                                         <Image.Triggers>
                                             <DataTrigger 
                                                 TargetType="Image" 
                                                 Binding="{Binding Source={RelativeSource AncestorType={x:Type xct:Expander}}, Path=IsExpanded}" Value="True">
-                                                <Setter Property="Source" Value="{helpers:ImageResource RightToAskClient.Images.collapse_48.png}" />
+                                                <Setter Property="Source" Value="collapse_48.png" />
                                                 <Setter Property="Style" Value="{StaticResource NestedListIcon}"/>
                                             </DataTrigger>
                                         </Image.Triggers>
@@ -100,11 +100,11 @@
                     </xct:Expander>
                 </Frame>
                 <StackLayout Orientation="Horizontal">
-                <Button Text="{StaticResource  ResetButtonText}" 
+                <Button Text="{x:Static strings:AppResources.ResetButtonText}" 
                         Style="{StaticResource OutlineButton}" 
                         Margin="8,8,4,8"
                         Command="{Binding ClearSearchCommand}"/>
-                <Button Text="{StaticResource  FilterButtonText}" 
+                <Button Text="{x:Static strings:AppResources.FilterButtonText}" 
                         Style="{StaticResource NormalButton}" 
                         Margin="4,8,8,8"
                         Padding="26,0"
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/AnswerDisplayCard.xaml b/RightToAskClient/RightToAskClient.Maui/Views/AnswerDisplayCard.xaml
index 16a8c12a..f6a232ca 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/AnswerDisplayCard.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/AnswerDisplayCard.xaml
@@ -21,7 +21,7 @@
                 </Grid>                
                 <Label Text="{Binding AnswerText}" Style="{StaticResource QuestionFrameCardText}" 
                        Grid.Row="1" Grid.Column="0"/>
-                <!--<ImageButton Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Source="{local:ImageResource RightToAskClient.Images.check_box_48.png}" BackgroundColor="Transparent"/>-->
+                <!--<ImageButton Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Source="{local:ImageResource RightToAskClient.Images.check_box_48.png" BackgroundColor="Transparent"/>-->
             </Grid>
         </Frame>
     </ContentView.Content>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/AppShell.xaml b/RightToAskClient/RightToAskClient.Maui/Views/AppShell.xaml
deleted file mode 100644
index b9faf5f9..00000000
--- a/RightToAskClient/RightToAskClient.Maui/Views/AppShell.xaml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Shell xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
-       xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-       xmlns:rta="clr-namespace:RightToAskClient.Maui"
-       xmlns:local="clr-namespace:RightToAskClient.Maui.Views"
-       xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
-       xmlns:extensions="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-       Title="AppShell"
-       x:Class="RightToAskClient.Maui.Views.AppShell"
-       FlyoutBackgroundColor="{AppThemeBinding Light={StaticResource WindowBackgroundColor}, Dark={StaticResource WindowBackgroundColorDark}}">
-
-    <!--
-        The overall app visual hierarchy is defined here, along with navigation.
-    
-        https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/shell/
-    -->
-
-    <Shell.Resources>
-        <ResourceDictionary>
-            <Style x:Key="BaseStyle" TargetType="Element">
-                <Setter Property="Shell.BackgroundColor" Value="{StaticResource Primary}" />
-                <Setter Property="Shell.ForegroundColor" Value="White" />
-                <Setter Property="Shell.TitleColor" Value="White" />
-                <Setter Property="Shell.DisabledColor" Value="#B4FFFFFF" />
-                <Setter Property="Shell.UnselectedColor" Value="#95FFFFFF" />
-                <Setter Property="Shell.TabBarBackgroundColor" Value="{StaticResource Primary}" />
-                <Setter Property="Shell.TabBarForegroundColor" Value="White"/>
-                <Setter Property="Shell.TabBarUnselectedColor" Value="#95FFFFFF"/>
-                <Setter Property="Shell.TabBarTitleColor" Value="White"/>
-            </Style>
-            <Style TargetType="TabBar" BasedOn="{StaticResource BaseStyle}" />
-            <Style TargetType="FlyoutItem" BasedOn="{StaticResource BaseStyle}" />
-
-            <!--
-            Default Styles for all Flyout Items
-            https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/shell/flyout#flyoutitem-and-menuitem-style-classes
-            -->
-            <Style Class="FlyoutItemLabelStyle" TargetType="Label">
-                <Setter Property="TextColor" Value="White" />
-            </Style>
-            <Style Class="FlyoutItemLayoutStyle" TargetType="Layout" ApplyToDerivedTypes="True">
-                <Setter Property="VisualStateManager.VisualStateGroups">
-                    <VisualStateGroupList>
-                        <VisualStateGroup x:Name="CommonStates">
-                            <VisualState x:Name="Normal">
-                                <VisualState.Setters>
-                                    <Setter Property="BackgroundColor" Value="{x:OnPlatform WinUI=Transparent, iOS=White}" />
-                                    <Setter TargetName="FlyoutItemLabel" Property="Label.TextColor" Value="{StaticResource Primary}" />
-                                </VisualState.Setters>
-                            </VisualState>
-                            <VisualState x:Name="Selected">
-                                <VisualState.Setters>
-                                    <Setter Property="BackgroundColor" Value="{StaticResource Primary}" />
-                                </VisualState.Setters>
-                            </VisualState>
-                        </VisualStateGroup>
-                    </VisualStateGroupList>
-                </Setter>
-            </Style>
-
-            <!--
-            Custom Style you can apply to any Flyout Item
-            -->
-            <Style Class="MenuItemLayoutStyle" TargetType="Layout" ApplyToDerivedTypes="True">
-                <Setter Property="VisualStateManager.VisualStateGroups">
-                    <VisualStateGroupList>
-                        <VisualStateGroup x:Name="CommonStates">
-                            <VisualState x:Name="Normal">
-                                <VisualState.Setters>
-                                    <Setter TargetName="FlyoutItemLabel" Property="Label.TextColor" Value="{StaticResource Primary}" />
-                                </VisualState.Setters>
-                            </VisualState>
-                        </VisualStateGroup>
-                    </VisualStateGroupList>
-                </Setter>
-            </Style>
-        </ResourceDictionary>
-    </Shell.Resources>
-
-    <!-- 
-        When the Flyout is visible this defines the content to display in the flyout.
-        FlyoutDisplayOptions="AsMultipleItems" will create a separate flyout item for each child element    
-        https://docs.microsoft.com/dotnet/api/xamarin.forms.shellgroupitem.flyoutdisplayoptions?view=xamarin-forms
-    -->
-
-    <FlyoutItem Title="Home" FlyoutIcon="{helpers:ImageResource RightToAskClient.Images.home4.png}">
-        <ShellContent Route="ReadingPage" ContentTemplate="{DataTemplate local:ReadingPage}" />
-    </FlyoutItem>
-    <FlyoutItem Title="My questions" FlyoutIcon="{helpers:ImageResource RightToAskClient.Images.emu_75.png}">
-        <ShellContent Route="ReadingPageByQuestionWriter" ContentTemplate="{DataTemplate local:ReadingPage}" />
-    </FlyoutItem>
-    <FlyoutItem Title="Account" FlyoutIcon="{x:StaticResource RightToAskClient.Images.info_48.png}">
-        <ShellContent Route="Account" ContentTemplate="{DataTemplate local:AccountPage}" />
-    </FlyoutItem>
-    <FlyoutItem Title="How To">
-        <ShellContent Route="HowToPublishPage" ContentTemplate="{DataTemplate local:HowToPublishPage}" />
-    </FlyoutItem>
-    <FlyoutItem Title="About" FlyoutIcon="{helpers:ImageResource RightToAskClient.Images.emu_75.png}">
-        <ShellContent Route="AboutPage" ContentTemplate="{DataTemplate local:AboutPage}" />
-    </FlyoutItem>
-
-    <!-- When the Flyout is visible this will be a menu item you can tie a click behavior to  -->
-    <!--<MenuItem Text="Logout" StyleClass="MenuItemLayoutStyle" Clicked="OnMenuItemClicked">
-    </MenuItem>-->
-
-    <!--
-        TabBar lets you define content that won't show up in a flyout menu. When this content is active
-        the flyout menu won't be available. This is useful for creating areas of the application where 
-        you don't want users to be able to navigate away from. If you would like to navigate to this 
-        content you can do so by calling 
-        await Shell.Current.GoToAsync("//LoginPage");
-    -->
-    <!-- 
-    <TabBar>
-        <ShellContent Route="ReadingPage" ContentTemplate="{DataTemplate local:MainPage}" />
-    </TabBar>
-    <TabBar>
-        <ShellContent Route="MainPage" ContentTemplate="{DataTemplate local:MainPage}" />
-    </TabBar>  -->
-
-    <!-- Optional Templates 
-    // These may be provided inline as below or as separate classes.
-
-    // This header appears at the top of the Flyout.
-    // https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/shell/flyout#flyout-header
-    <Shell.FlyoutHeaderTemplate>
-        <DataTemplate>
-            <Grid>ContentHere</Grid>
-        </DataTemplate>
-    </Shell.FlyoutHeaderTemplate>
-
-    // ItemTemplate is for ShellItems as displayed in a Flyout
-    // https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/shell/flyout#define-flyoutitem-appearance
-    <Shell.ItemTemplate>
-        <DataTemplate>
-            <ContentView>
-                Bindable Properties: Title, Icon
-            </ContentView>
-        </DataTemplate>
-    </Shell.ItemTemplate>
-
-    // MenuItemTemplate is for MenuItems as displayed in a Flyout
-    // https://docs.microsoft.com/xamarin/xamarin-forms/app-fundamentals/shell/flyout#define-menuitem-appearance
-    <Shell.MenuItemTemplate>
-        <DataTemplate>
-            <ContentView>
-                Bindable Properties: Text, Icon
-            </ContentView>
-        </DataTemplate>
-    </Shell.MenuItemTemplate>
-
-    -->
-
-</Shell>
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/AppShell.xaml.cs b/RightToAskClient/RightToAskClient.Maui/Views/AppShell.xaml.cs
deleted file mode 100644
index 05ee6c40..00000000
--- a/RightToAskClient/RightToAskClient.Maui/Views/AppShell.xaml.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Diagnostics;
-using RightToAskClient.Maui.Models;
-using RightToAskClient.Maui.ViewModels;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
-
-namespace RightToAskClient.Maui.Views
-{
-    public partial class AppShell : Microsoft.Maui.Controls.Shell
-    {
-        public AppShell()
-        {
-            InitializeComponent();
-            Routing.RegisterRoute(nameof(QuestionAskerPage), typeof(QuestionAskerPage));
-            Routing.RegisterRoute(nameof(QuestionDetailPage), typeof(QuestionDetailPage));
-            Routing.RegisterRoute(nameof(RegisterAccountPage), typeof(RegisterAccountPage));
-            Routing.RegisterRoute(nameof(FindMPsPage), typeof(FindMPsPage));
-            Routing.RegisterRoute(nameof(OtherUserProfilePage), typeof(OtherUserProfilePage));
-            Routing.RegisterRoute(nameof(QuestionAnswererPage), typeof(QuestionAnswererPage));
-            Routing.RegisterRoute(nameof(AdvancedSearchFiltersPage), typeof(AdvancedSearchFiltersPage));
-            Routing.RegisterRoute(nameof(MPRegistrationVerificationPage), typeof(MPRegistrationVerificationPage));
-            Routing.RegisterRoute(nameof(HowAnsweredOptionPage), typeof(HowAnsweredOptionPage));
-            Routing.RegisterRoute(nameof(QuestionBackgroundPage), typeof(QuestionBackgroundPage));
-            Routing.RegisterRoute(nameof(SelectableListPage), typeof(SelectableListPage));
-            Routing.RegisterRoute(nameof(ReportQuestionPage), typeof(ReportQuestionPage));
-            Routing.RegisterRoute(nameof(CodeOfConductPage), typeof(CodeOfConductPage));
-            // Routing.RegisterRoute(nameof(FindMPsPage), typeof(FindMPsPage));
-        }
-
-        protected override void OnNavigating(ShellNavigatingEventArgs args)
-        {
-            base.OnNavigating(args);
-            if (args.Target.Location.OriginalString.ToLower().Contains("account"))
-            {
-                AccountPageExchanger.Registration = IndividualParticipant.getInstance().ProfileData.RegistrationInfo;
-            }
-
-            if (args.Target.Location.OriginalString.ToLower().Contains("readingpagebyquestionwriter"))
-            {
-               ReadingPageExchanger.ByQuestionWriter = true;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml
index 94834527..40a41d12 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml
@@ -4,7 +4,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:vm="clr-namespace:RightToAskClient.Maui.ViewModels"
-           
+             xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              xmlns:local="clr-namespace:RightToAskClient.Maui"
              xmlns:views="clr-namespace:RightToAskClient.Maui.Views;assembly=RightToAskClient.Maui"
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
@@ -13,8 +13,8 @@
              Style="{StaticResource SubPage}">
     <Shell.BackButtonBehavior>
         <BackButtonBehavior Command="{Binding BackCommand}"
-                            SemanticProperties.Hint="{StaticResource BackHint}"
-                            SemanticProperties.Description="{StaticResource BackDescription}" />
+                            SemanticProperties.Hint="{x:Static strings:AppResources.BackHint}"
+                            SemanticProperties.Description="{x:Static strings:AppResources.BackDescription}" />
     </Shell.BackButtonBehavior>
     <ContentPage.BindingContext>
         <vm:ReportQuestionViewModel />
@@ -39,14 +39,14 @@
                          HorizontalOptions="Fill"
                          Padding="10" ColumnSpacing="20"
                          RowDefinitions="Auto" ColumnDefinitions="*, *">
-                        <Button Grid.Row="0" Grid.Column="0" Text="{StaticResource DisagreeText}"
-                                SemanticProperties.Hint="{StaticResource DisagreeHint}"
-                                SemanticProperties.Description="{StaticResource DisagreeText}"
+                        <Button Grid.Row="0" Grid.Column="0" Text="{x:Static strings:AppResources.DisagreeText}"
+                                SemanticProperties.Hint="{x:Static strings:AppResources.DisagreeHint}"
+                                SemanticProperties.Description="{x:Static strings:AppResources.DisagreeText}"
                                 Style="{StaticResource OutlineButton}"
                                 Clicked="Disagree_OnClicked"/>
-                        <Button Grid.Row="0" Grid.Column="1" Text="{StaticResource AgreeText}"
-                                SemanticProperties.Hint="{StaticResource AgreeHint}"
-                                SemanticProperties.Description="{StaticResource AgreeText}"
+                        <Button Grid.Row="0" Grid.Column="1" Text="{x:Static strings:AppResources.AgreeText}"
+                                SemanticProperties.Hint="{x:Static strings:AppResources.AgreeHint}"
+                                SemanticProperties.Description="{x:Static strings:AppResources.AgreeText}"
                                 Style="{StaticResource OutlineButton}"
                                 Clicked="Agree_OnClicked"/>
                     </Grid>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml.cs b/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml.cs
index fd32aed1..37b510ea 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml.cs
@@ -17,33 +17,27 @@ public CodeOfConductPage()
         {
             InitializeComponent();
         }
-        
+
         public CodeOfConductPage(Registration registration)
         {
             InitializeComponent();
             _registration = registration;
-            //TODO
-            /*
-            var lightTheme = new LightMarkdownTheme();
-            var darkTheme = new DarkMarkdownTheme();
-            // TODO Xamarin.Forms.Device.GetNamedSize is not longer supported. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
-            lightTheme.Paragraph.FontSize = (float)Device.GetNamedSize(NamedSize.Small, typeof(Label));
-            // TODO Xamarin.Forms.Device.GetNamedSize is not longer supported. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
-            lightTheme.Heading3.FontSize = (float)Device.GetNamedSize(NamedSize.Medium, typeof(Label));
-            // TODO Xamarin.Forms.Device.GetNamedSize is not longer supported. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
-            darkTheme.Paragraph.FontSize = (float)Device.GetNamedSize(NamedSize.Small, typeof(Label));
-            // TODO Xamarin.Forms.Device.GetNamedSize is not longer supported. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
-            darkTheme.Heading3.FontSize = (float)Device.GetNamedSize(NamedSize.Medium, typeof(Label));
-            darkTheme.BackgroundColor = Colors.Black;
-            */
-            //TODO:
+
+            //var lightTheme = new LightMarkdownTheme();
+            //var darkTheme = new DarkMarkdownTheme();
+            //lightTheme.Paragraph.FontSize = (float)Device.GetNamedSize(NamedSize.Small, typeof(Label));
+            //lightTheme.Heading3.FontSize = (float)Device.GetNamedSize(NamedSize.Medium, typeof(Label));
+            //darkTheme.Paragraph.FontSize = (float)Device.GetNamedSize(NamedSize.Small, typeof(Label));
+            //darkTheme.Heading3.FontSize = (float)Device.GetNamedSize(NamedSize.Medium, typeof(Label));
+            //darkTheme.BackgroundColor = Color.Black;
+
             //var mdView = new Xam.Forms.Markdown.MarkdownView();
-           
+
             //mdView.Markdown = AppResources.CodeOfConductCopy;
             //mdView.RelativeUrlHost = "";
-          //TODO:  mdView.SetOnAppTheme<MarkdownTheme>(Xam.Forms.Markdown.MarkdownView.ThemeProperty, lightTheme, darkTheme);
-            
-           //TODO: MarkdownView.Children.Add(new ScrollView() { Content = mdView });
+            //mdView.SetOnAppTheme<MarkdownTheme>(Xam.Forms.Markdown.MarkdownView.ThemeProperty, lightTheme, darkTheme);
+
+            //MarkdownView.Children.Add(new ScrollView() { Content = mdView });
         }
 
         private async void Disagree_OnClicked(object sender, EventArgs e)
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/EmptyCollectionView.xaml b/RightToAskClient/RightToAskClient.Maui/Views/EmptyCollectionView.xaml
index 5f08e411..7db975f6 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/EmptyCollectionView.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/EmptyCollectionView.xaml
@@ -3,11 +3,11 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="RightToAskClient.Maui.Views.EmptyCollectionView"
-             
+               xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui">
     <ContentView.Content>
         <StackLayout>
-            <Label Text="{StaticResource EmptyQuestionCollectionViewString}" />
+            <Label Text="{x:Static strings:AppResources.EmptyQuestionCollectionViewString}" />
         </StackLayout>
     </ContentView.Content>
 </ContentView>
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/EmptySelectableListSearchView.xaml b/RightToAskClient/RightToAskClient.Maui/Views/EmptySelectableListSearchView.xaml
index 4bfff390..5cfbf4c0 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/EmptySelectableListSearchView.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/EmptySelectableListSearchView.xaml
@@ -2,11 +2,11 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-            
+              xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:Class="RightToAskClient.Maui.Views.EmtpySelectableListSearchView">
   <ContentView.Content>
       <StackLayout>
-            <Label Text="{StaticResource NoSearchResultsFoundText}" VerticalOptions="Start"/>
+            <Label Text="{x:Static strings:AppResources.NoSearchResultsFoundText}" VerticalOptions="Start"/>
       </StackLayout>
   </ContentView.Content>
 </ContentView>
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/FindMPsPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/FindMPsPage.xaml
index 17430aa9..7e187eab 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/FindMPsPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/FindMPsPage.xaml
@@ -7,7 +7,7 @@
              xmlns:views="clr-namespace:RightToAskClient.Maui.Views;assembly=RightToAskClient.Maui"
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
              x:Class="RightToAskClient.Maui.Views.FindMPsPage"
-            
+              xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:DataType="vm:FindMPsViewModel">
     <ContentPage.BindingContext>
         <vm:FindMPsViewModel />
@@ -17,11 +17,11 @@
             <StackLayout Orientation="Vertical" VerticalOptions="FillAndExpand" Spacing="0">
                 <!--<ActivityIndicator IsRunning="{Binding IsBusy}" IsVisible="{Binding IsBusy}"/>-->
                 <!--Label Choice Option Frames-->
-                <Label Text="{StaticResource FindMyElectorateTitle}" Margin="16,16,16,0" FontAttributes="Bold"
+                <Label Text="{x:Static strings:AppResources.FindMyElectorateTitle}" Margin="16,16,16,0" FontAttributes="Bold"
                        FontSize="Large" />
-                <Label Text="{StaticResource FindMyElectorateContentPartOne}" Margin="16,8,16,0" LineHeight="1.5"
+                <Label Text="{x:Static strings:AppResources.FindMyElectorateContentPartOne}" Margin="16,8,16,0" LineHeight="1.5"
                        FontSize="Medium" />
-                <Label Text="{StaticResource FindMyElectorateContentPartTwo}" Margin="16,8,16,0" LineHeight="1.5"
+                <Label Text="{x:Static strings:AppResources.FindMyElectorateContentPartTwo}" Margin="16,8,16,0" LineHeight="1.5"
                        FontSize="Medium" />
                 <FlexLayout
                     Direction="Row" JustifyContent="Center" AlignItems="Center" Margin="16,20,16,0">
@@ -51,10 +51,10 @@
                                      BackgroundColor="{StaticResource EditorBackground}">
                             <StackLayout VerticalOptions="CenterAndExpand">
                                 <Image HeightRequest="30"
-                                       Source="{helpers:ImageResource RightToAskClient.Images.map.png}"
+                                       Source="map.png"
                                        Style="{StaticResource ListErrorIcon}" 
                                        Margin="0,0,0,10"/>
-                                <Label Text="{StaticResource MapPlaceholderText}" FontSize="Small"
+                                <Label Text="{x:Static strings:AppResources.MapPlaceholderText}" FontSize="Small"
                                        FontAttributes="Bold" HorizontalOptions="CenterAndExpand" HorizontalTextAlignment="Center"
                                        TextColor="Black" VerticalTextAlignment="Center"
                                        Margin="16,0" />
@@ -69,13 +69,13 @@
                         <!--State Selector/Picker-->
                         <views:LabeledPicker BindingContext="{Binding StatePickerModel}" />
 
-                        <Label Text="{StaticResource FederalElectorate}" FontSize="Medium"
+                        <Label Text="{x:Static strings:AppResources.FederalElectorate}" FontSize="Medium"
                                FontAttributes="Bold" HorizontalOptions="Start" HorizontalTextAlignment="Start"
                                TextColor="{AppThemeBinding Light=Black, Dark=White}" VerticalTextAlignment="Center"
                                Margin="0, 5"/>
                         <views:LabeledPicker BindingContext="{Binding FederalPickerModel}" />
                         
-                        <Label Text="{StaticResource StateElectorate}" FontSize="Medium"
+                        <Label Text="{x:Static strings:AppResources.StateElectorate}" FontSize="Medium"
                                FontAttributes="Bold" HorizontalOptions="Start" HorizontalTextAlignment="Start"
                                TextColor="{AppThemeBinding Light=Black, Dark=White}" VerticalTextAlignment="Center"
                                Margin="0,5"/>
@@ -100,7 +100,7 @@
                         <!--State Selector/Picker-->
                         <views:LabeledPicker BindingContext="{Binding StatePickerModel}" />
                         <StackLayout>
-                            <Label Text="{StaticResource StreetHeaderText}"
+                            <Label Text="{x:Static strings:AppResources.StreetHeaderText}"
                                    Style="{StaticResource SmallGreyHeader}" />
                             <Grid Margin="0,0,0,8">
                                 <BoxView Style="{StaticResource ButtonSeparator}" VerticalOptions="End" />
@@ -113,7 +113,7 @@
                             </Grid>
                         </StackLayout>
                         <StackLayout>
-                            <Label Text="{StaticResource CitySuburbHeaderText}"
+                            <Label Text="{x:Static strings:AppResources.CitySuburbHeaderText}"
                                    Style="{StaticResource SmallGreyHeader}"/>
                             <Grid Margin="0,0,0,8">
                                 <BoxView Style="{StaticResource ButtonSeparator}" VerticalOptions="End" />
@@ -126,7 +126,7 @@
                         </StackLayout>
                         
                         <StackLayout>
-                            <Label Text="{StaticResource PostcodeHeaderText}"
+                            <Label Text="{x:Static strings:AppResources.PostcodeHeaderText}"
                                    Style="{StaticResource SmallGreyHeader}"/>
                             <Grid Margin="0,0,0,8">
                                 <BoxView Style="{StaticResource ButtonSeparator}" VerticalOptions="End" />
@@ -138,7 +138,7 @@
                             </Grid>
                         </StackLayout>
                         <Button Margin="8, 12"
-                            Text="{StaticResource LocateButtonText}" 
+                            Text="{x:Static strings:AppResources.LocateButtonText}" 
                             Style="{StaticResource OutlineButton}"
                             Command="{Binding SubmitAddressButtonCommand}" />
                     </StackLayout>
@@ -148,7 +148,7 @@
                 <StackLayout Orientation="Horizontal" HorizontalOptions="FillAndExpand" Margin="16">
                     <Button Style="{StaticResource NormalButton}"
                             x:Name="DoneButton"
-                            Text="{StaticResource SaveButtonText}"
+                            Text="{x:Static strings:AppResources.SaveButtonText}"
                             Command="{Binding SaveMPsButtonCommand}"
                             IsEnabled="{Binding EnableFindMPsButton}" />
                 </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/HowAnsweredOptionPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/HowAnsweredOptionPage.xaml
index c45adcee..542bd282 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/HowAnsweredOptionPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/HowAnsweredOptionPage.xaml
@@ -9,7 +9,7 @@
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
              x:Class="RightToAskClient.Maui.Views.HowAnsweredOptionPage"
              x:DataType="vm:QuestionViewModel"
-            
+              xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              Title="{StaticResource OptionsTitleText}">
     <ContentPage.Content>
         <StackLayout Orientation="Vertical" HorizontalOptions="FillAndExpand" VerticalOptions="Fill"
@@ -21,7 +21,7 @@
             <StackLayout Orientation="Vertical"
                          VerticalOptions="Fill"
                          HorizontalOptions="Fill">
-                <Label Text="{StaticResource OptionsHeaderText}" Style="{StaticResource Header1}" Margin="16, 0"/>
+                <Label Text="{x:Static strings:AppResources.OptionsHeaderText}" Style="{StaticResource Header1}" Margin="16, 0"/>
                 <BoxView Margin="16, 0"/>
                 <Grid VerticalOptions="StartAndExpand" HorizontalOptions="Fill" RowSpacing="25"
                       Margin="8, 16" Grid.RowDefinitions="Auto,Auto,Auto">
@@ -32,8 +32,8 @@
                         <!-- answered in the app -->
                         <RadioButton 
                             Grid.Row="0"
-                            SemanticProperties.Hint="{StaticResource AnswerByMpDescription}"
-                            SemanticProperties.Description="{StaticResource AnswerByMp}"
+                            SemanticProperties.Hint="{x:Static strings:AppResources.AnswerByMpDescription}"
+                            SemanticProperties.Description="{x:Static strings:AppResources.AnswerByMp}"
                             VerticalOptions="StartAndExpand"
                             HorizontalOptions="Fill"
                             x:Name="InAppRadioButton"
@@ -44,16 +44,16 @@
                             <StackLayout.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="InApp_OnTapped" />
                             </StackLayout.GestureRecognizers>
-                            <Label Text="{StaticResource AnswerByMp}"
+                            <Label Text="{x:Static strings:AppResources.AnswerByMp}"
                                    Style="{StaticResource ReportReasonTitle}" />
-                            <Label Text="{StaticResource AnswerByMpDescription}"
+                            <Label Text="{x:Static strings:AppResources.AnswerByMpDescription}"
                                    Style="{StaticResource ReportReasonDetails}"/>
                         </StackLayout>
                         
                         <!-- raise to parliament -->
                         <RadioButton Grid.Row="1" Grid.Column="0"
-                                     SemanticProperties.Hint="{StaticResource VoiceInParliamentDescription}"
-                                     SemanticProperties.Description="{StaticResource VoiceInParliament}"
+                                     SemanticProperties.Hint="{x:Static strings:AppResources.VoiceInParliamentDescription}"
+                                     SemanticProperties.Description="{x:Static strings:AppResources.VoiceInParliament}"
                                      x:Name="InParliamentRadioButton"
                                      VerticalOptions="StartAndExpand"
                                      HorizontalOptions="Fill"
@@ -64,16 +64,16 @@
                             <StackLayout.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="InParliament_OnTapped"/>
                             </StackLayout.GestureRecognizers>
-                            <Label Text="{StaticResource VoiceInParliament}"
+                            <Label Text="{x:Static strings:AppResources.VoiceInParliament}"
                                    Style="{StaticResource ReportReasonTitle}" />
-                            <Label Text="{StaticResource VoiceInParliamentDescription}"
+                            <Label Text="{x:Static strings:AppResources.VoiceInParliamentDescription}"
                                    Style="{StaticResource ReportReasonDetails}"/>
                         </StackLayout>
                         
                         <!-- I dont know -->
                         <RadioButton Grid.Row="2" Grid.Column="0"
-                                     SemanticProperties.Hint="{StaticResource DontKnowOptionDescription}"
-                                     SemanticProperties.Description="{StaticResource DontKnowOption}"
+                                     SemanticProperties.Hint="{x:Static strings:AppResources.DontKnowOptionDescription}"
+                                     SemanticProperties.Description="{x:Static strings:AppResources.DontKnowOption}"
                                      x:Name="DontKnowRadioButton"
                                      VerticalOptions="StartAndExpand"
                                      HorizontalOptions="Fill"
@@ -84,9 +84,9 @@
                             <StackLayout.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="DontKnow_OnTapped"/>
                             </StackLayout.GestureRecognizers>
-                            <Label Text="{StaticResource DontKnowOption}"
+                            <Label Text="{x:Static strings:AppResources.DontKnowOption}"
                                    Style="{StaticResource ReportReasonTitle}" />
-                            <Label Text="{StaticResource DontKnowOptionDescription}"
+                            <Label Text="{x:Static strings:AppResources.DontKnowOptionDescription}"
                                    Style="{StaticResource ReportReasonDetails}"/>
                         </StackLayout>
                     </Grid>
@@ -94,10 +94,10 @@
             </ScrollView>
             <StackLayout Padding="0, 8" VerticalOptions="EndAndExpand" >
                 <BoxView Style="{StaticResource ButtonSeparator}" Margin="0, 12"/>
-                <Button Text="{StaticResource NextButtonText}" Style="{StaticResource NormalButton}"
+                <Button Text="{x:Static strings:AppResources.NextButtonText}" Style="{StaticResource NormalButton}"
                         Command="{Binding ToAnswererPageWithHowAnsweredSelectionCommand}"
-                        SemanticProperties.Hint="{StaticResource NextButtonText}"
-                        SemanticProperties.Description="{StaticResource NextButtonText}"
+                        SemanticProperties.Hint="{x:Static strings:AppResources.NextButtonText}"
+                        SemanticProperties.Description="{x:Static strings:AppResources.NextButtonText}"
                         Padding="16, 12"
                         Margin="16, 0"/>
             </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/HowToPublishView.xaml b/RightToAskClient/RightToAskClient.Maui/Views/HowToPublishView.xaml
index c4499da7..5b9cad28 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/HowToPublishView.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/HowToPublishView.xaml
@@ -2,28 +2,28 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-             
+               xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:Class="RightToAskClient.Maui.Views.HowToPublishView">
   <ContentView.Content>
       <StackLayout Margin="10" VerticalOptions="FillAndExpand" BackgroundColor="Transparent" >
             <Grid RowDefinitions="auto,auto,auto,auto,auto,auto,auto" ColumnDefinitions="auto,*" 
                   BackgroundColor="Transparent" VerticalOptions="FillAndExpand" ColumnSpacing="0" Padding="10" RowSpacing="5">
                 <!--Main Header-->
-                <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{StaticResource HowToHeaderText}" Style="{StaticResource Header1}"
+                <Label Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{x:Static strings:AppResources.HowToHeaderText}" Style="{StaticResource Header1}"
                        HorizontalOptions="Center" HorizontalTextAlignment="Center" Margin="0,0,0,20"/>
                 <!--Step 1-->
                 <Label Grid.Row="1" Grid.Column="0" VerticalTextAlignment="End" VerticalOptions="Start" HorizontalTextAlignment="Start" Margin="0,2,0,0">
                     <Label.FormattedText>
                         <FormattedString>
-                            <Span Text="{StaticResource HowToStep1Number}"/>
+                            <Span Text="{x:Static strings:AppResources.HowToStep1Number}"/>
                         </FormattedString>
                     </Label.FormattedText>
                 </Label>
                 <Label Grid.Row="1" Grid.Column="1" VerticalTextAlignment="End" VerticalOptions="Start" Style="{StaticResource NormalText}" BackgroundColor="Transparent" Margin="0">
                     <Label.FormattedText>
                         <FormattedString>
-                            <Span Text="{StaticResource HowToStep1Bold}" Style="{StaticResource BoldNormalText}"/>
-                            <Span Text="{StaticResource HowToStep1}" />
+                            <Span Text="{x:Static strings:AppResources.HowToStep1Bold}" Style="{StaticResource BoldNormalText}"/>
+                            <Span Text="{x:Static strings:AppResources.HowToStep1}" />
                         </FormattedString>
                     </Label.FormattedText>
                 </Label>
@@ -31,33 +31,33 @@
                 <Label Grid.Row="2" Grid.Column="0" VerticalTextAlignment="Center" Margin="0,2,0,0">
                     <Label.FormattedText>
                         <FormattedString>
-                            <Span Text="{StaticResource HowToStep2Number}"/>
+                            <Span Text="{x:Static strings:AppResources.HowToStep2Number}"/>
                         </FormattedString>
                     </Label.FormattedText>
                 </Label>
                 <Label Grid.Row="2" Grid.Column="1" VerticalTextAlignment="Center" Style="{StaticResource NormalText}" BackgroundColor="Transparent" Margin="0">
                     <Label.FormattedText>
                         <FormattedString>
-                            <Span Text="{StaticResource HowToStep2Bold1}" Style="{StaticResource BoldNormalText}" /> 
-                            <Span Text="{StaticResource HowToStep2}" />
+                            <Span Text="{x:Static strings:AppResources.HowToStep2Bold1}" Style="{StaticResource BoldNormalText}" /> 
+                            <Span Text="{x:Static strings:AppResources.HowToStep2}" />
                         </FormattedString>
                     </Label.FormattedText>
                 </Label>
                 <Grid Grid.Row="3" Grid.Column="1" RowDefinitions="auto,auto"
                       ColumnDefinitions="auto,auto" BackgroundColor="Transparent" Padding="10">
-                    <Label Text="{StaticResource HowToStep2aLetter}" Grid.Row="0" Grid.Column="0" VerticalOptions="Start" VerticalTextAlignment="End" HorizontalTextAlignment="Start"/>
-                    <Label Text="{StaticResource HowToStep2bLetter}" Grid.Row="2" Grid.Column="0" VerticalOptions="Start" VerticalTextAlignment="End" HorizontalTextAlignment="Start"/>
-                    <Label Grid.Row="0" Grid.Column="1" Text="{StaticResource HowToStep2abold}"
+                    <Label Text="{x:Static strings:AppResources.HowToStep2aLetter}" Grid.Row="0" Grid.Column="0" VerticalOptions="Start" VerticalTextAlignment="End" HorizontalTextAlignment="Start"/>
+                    <Label Text="{x:Static strings:AppResources.HowToStep2bLetter}" Grid.Row="2" Grid.Column="0" VerticalOptions="Start" VerticalTextAlignment="End" HorizontalTextAlignment="Start"/>
+                    <Label Grid.Row="0" Grid.Column="1" Text="{x:Static strings:AppResources.HowToStep2abold}"
                            VerticalOptions="Start" Style="{StaticResource BoldNormalText}"/>
-                    <Label Grid.Row="1" Grid.Column="1" Text="{StaticResource HowToStep2a}"
+                    <Label Grid.Row="1" Grid.Column="1" Text="{x:Static strings:AppResources.HowToStep2a}"
                            VerticalOptions="Start" Style="{StaticResource NormalText}"/>
-                    <!-- <Label Grid.Row="2" BackgroundColor="Aqua" Grid.Column="1" VerticalOptions="Start" Text="{StaticResource HowToStep2Or}" Style="{StaticResource NormalText}" />  -->
+                    <!-- <Label Grid.Row="2" BackgroundColor="Aqua" Grid.Column="1" VerticalOptions="Start" Text="{x:Static strings:AppResources.HowToStep2Or}" Style="{StaticResource NormalText}" />  -->
                     <Label Grid.Row="2" Grid.Column="1" VerticalOptions="Start" x:Name="RaisedLabel" Style="{StaticResource NormalText}">
                         <Label.FormattedText>
                             <FormattedString>
-                                <Span Text="{StaticResource HowToStep2b }" Style="{StaticResource NormalText}" /> 
-                                <Span Text="{StaticResource HowToStep2bbold }" Style="{StaticResource BoldNormalText}" />
-                                <Span Text="{StaticResource HowToStep2bend }" Style="{StaticResource NormalText}" />
+                                <Span Text="{x:Static strings:AppResources.HowToStep2b }" Style="{StaticResource NormalText}" /> 
+                                <Span Text="{x:Static strings:AppResources.HowToStep2bbold }" Style="{StaticResource BoldNormalText}" />
+                                <Span Text="{x:Static strings:AppResources.HowToStep2bend }" Style="{StaticResource NormalText}" />
                             </FormattedString>
                     </Label.FormattedText>
                     </Label>
@@ -66,33 +66,33 @@
                 <Label Grid.Row="4" Grid.Column="0" VerticalOptions="Start" VerticalTextAlignment="End" HorizontalTextAlignment="Start" Margin="0,2,0,0">
                     <Label.FormattedText>
                         <FormattedString>
-                            <Span Text="{StaticResource HowToStep3Number}"/>
+                            <Span Text="{x:Static strings:AppResources.HowToStep3Number}"/>
                         </FormattedString>
                     </Label.FormattedText>
                 </Label>
                 <Label Grid.Row="4" Grid.Column="1" VerticalOptions="Start" VerticalTextAlignment="End" Style="{StaticResource NormalText}" BackgroundColor="Transparent" Margin="0">
                     <Label.FormattedText>
                         <FormattedString>
-                            <Span Text="{StaticResource HowToStep3Bold}" Style="{StaticResource BoldNormalText}"/>
-                            <Span Text="{StaticResource HowToStep3part2}" Style="{StaticResource NormalText}"/>
+                            <Span Text="{x:Static strings:AppResources.HowToStep3Bold}" Style="{StaticResource BoldNormalText}"/>
+                            <Span Text="{x:Static strings:AppResources.HowToStep3part2}" Style="{StaticResource NormalText}"/>
                         </FormattedString>
                     </Label.FormattedText>
                 </Label>
-                <Label Grid.Row="5" Grid.Column="1" Text="{StaticResource HowToStep3}" />
+                <Label Grid.Row="5" Grid.Column="1" Text="{x:Static strings:AppResources.HowToStep3}" />
                 <!--Step 4-->
                 <Label Grid.Row="6" Grid.Column="0" VerticalOptions="Start" VerticalTextAlignment="End" Style="{StaticResource NormalText}" HorizontalTextAlignment="Center" Margin="0,2,0,0">
                     <Label.FormattedText>
                         <FormattedString>
-                            <Span Text="{StaticResource HowToStep4Number}"/>
+                            <Span Text="{x:Static strings:AppResources.HowToStep4Number}"/>
                         </FormattedString>
                     </Label.FormattedText>
                 </Label>
                 <Label Grid.Row="6" Grid.Column="1" VerticalOptions="Start" VerticalTextAlignment="End" Style="{StaticResource NormalText}" BackgroundColor="Transparent" Margin="0">
                     <Label.FormattedText>
                         <FormattedString>
-                            <Span Text="{StaticResource HowToStep4}" Style="{StaticResource NormalText}" />
-                            <Span Text="{StaticResource HowToStep4Bold}" Style="{StaticResource BoldNormalText}" />
-                            <Span Text="{StaticResource HowToStep4Part2}" Style="{StaticResource NormalText}" />
+                            <Span Text="{x:Static strings:AppResources.HowToStep4}" Style="{StaticResource NormalText}" />
+                            <Span Text="{x:Static strings:AppResources.HowToStep4Bold}" Style="{StaticResource BoldNormalText}" />
+                            <Span Text="{x:Static strings:AppResources.HowToStep4Part2}" Style="{StaticResource NormalText}" />
                         </FormattedString>
                     </Label.FormattedText>
                 </Label>
@@ -100,15 +100,15 @@
                 <Label Grid.Row="7" Grid.Column="0" VerticalOptions="Start" VerticalTextAlignment="End" Style="{StaticResource NormalText}" Margin="0,2,0,0">
                     <Label.FormattedText>
                         <FormattedString>
-                            <Span Text="{StaticResource HowToStep5Number}"/>
+                            <Span Text="{x:Static strings:AppResources.HowToStep5Number}"/>
                         </FormattedString>
                     </Label.FormattedText>
                 </Label>
                 <Label Grid.Row="7" Grid.Column="1" VerticalOptions="Start" VerticalTextAlignment="End" Style="{StaticResource NormalText}" BackgroundColor="Transparent" Margin="0">
                     <Label.FormattedText>
                         <FormattedString>
-                            <Span Text="{StaticResource HowToStep5Bold}" Style="{StaticResource BoldNormalText}"/>
-                            <Span Text="{StaticResource HowToStep5}" Style="{StaticResource NormalText}" />
+                            <Span Text="{x:Static strings:AppResources.HowToStep5Bold}" Style="{StaticResource BoldNormalText}"/>
+                            <Span Text="{x:Static strings:AppResources.HowToStep5}" Style="{StaticResource NormalText}" />
                         </FormattedString>
                     </Label.FormattedText>
                 </Label>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/MPRegistrationVerificationPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/MPRegistrationVerificationPage.xaml
index 39888848..211c041d 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/MPRegistrationVerificationPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/MPRegistrationVerificationPage.xaml
@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:RightToAskClient.Maui"
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
              xmlns:controls="clr-namespace:RightToAskClient.Maui.Views.Controls;assembly=RightToAskClient.Maui"
-             
+               xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:Class="RightToAskClient.Maui.Views.MPRegistrationVerificationPage"
              x:DataType="vm:MPRegistrationVerificationViewModel"
              Shell.FlyoutBehavior="Flyout"
@@ -15,8 +15,8 @@
         <vm:MPRegistrationVerificationViewModel />
     </ContentPage.BindingContext>
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{StaticResource InfoPopupButtonText}" Command="{Binding InfoPopupCommand}" x:DataType="vm:BaseViewModel" 
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.help_75.png}"/>
+        <ToolbarItem Text="{x:Static strings:AppResources.InfoPopupButtonText}" Command="{Binding InfoPopupCommand}" x:DataType="vm:BaseViewModel" 
+                     IconImageSource="help_75.png"/>
     </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <ScrollView>
@@ -26,18 +26,18 @@
                 <Grid ColumnDefinitions="3, Auto, *, Auto" 
                       Style="{StaticResource ErrorMessageBackgroundStyle}" IsVisible="{Binding IsMsgErrorShown}">
                     <BoxView Grid.Column="0" Color="{StaticResource ColorRed}" WidthRequest="3" VerticalOptions="FillAndExpand" Margin="0" />
-                    <Image Grid.Column="1" Margin="16, 0" Source="{helpers:ImageResource RightToAskClient.Images.error_48.png}"
+                    <Image Grid.Column="1" Margin="16, 0" Source="error_48.png"
                            BackgroundColor="{StaticResource ColorRed}" WidthRequest="24" HeightRequest="24"
                            VerticalOptions="Center" />
                     <Label Grid.Column="2" Text="{Binding ReportLabelText}" Padding="0, 12"
                            VerticalOptions="Center" TextColor="{AppThemeBinding Light=Black, Dark=White}" />
-                    <ImageButton Grid.Column="3" Source="{ AppThemeBinding Light={helpers:ImageResource RightToAskClient.Images.close_button.png}, Dark={helpers:ImageResource RightToAskClient.Images.close_button_dark_48.png} }"
+                    <ImageButton Grid.Column="3" Source="{ AppThemeBinding Light=close_button.png, Dark=Images.close_button_dark_48.png }"
                                  Style="{StaticResource ClearButton}"
                                  BackgroundColor="Transparent"
                                  VerticalOptions="Start"
                                  WidthRequest="24" HeightRequest="24"
-                                 SemanticProperties.Hint="{StaticResource ClearButtonHint}"
-                                 SemanticProperties.Description="{StaticResource ClearButtonDescription}"
+                                 SemanticProperties.Hint="{x:Static strings:AppResources.ClearButtonHint}"
+                                 SemanticProperties.Description="{x:Static strings:AppResources.ClearButtonDescription}"
                                  Command="{Binding HideErrorLayoutCommand}" Margin="10" />
                 </Grid>
 
@@ -53,13 +53,13 @@
                     <Label Grid.Column="2" Text="{Binding ReportLabelText}" Padding="0, 12"
                            VerticalOptions="Center" TextColor="{AppThemeBinding Light=Black, Dark=White}" />
                     <ImageButton Grid.Column="3"
-                                 Source="{AppThemeBinding Light={helpers:ImageResource RightToAskClient.Images.close_button.png}, Dark={helpers:ImageResource RightToAskClient.Images.close_button_dark_48.png} }"
+                                 Source="{AppThemeBinding Light=close_button.png, Dark=Images.close_button_dark_48.png }"
                                  Style="{StaticResource ClearButton}"
                                  BackgroundColor="Transparent"
                                  VerticalOptions="Start"
                                  WidthRequest="24" HeightRequest="24"
-                                 SemanticProperties.Hint="{StaticResource ClearButtonHint}"
-                                 SemanticProperties.Description="{StaticResource ClearButtonDescription}"
+                                 SemanticProperties.Hint="{x:Static strings:AppResources.ClearButtonHint}"
+                                 SemanticProperties.Description="{x:Static strings:AppResources.ClearButtonDescription}"
                                  Command="{Binding HideSuccessLayoutCommand}" Margin="10" />
                 </Grid>
                 <FlexLayout Direction="Row" AlignItems="Center" Wrap="Wrap">
@@ -69,11 +69,11 @@
                 <Grid RowDefinitions="*, *" Margin="0, 10, 0, 0" RadioButtonGroup.GroupName="MpOption">
                     <FlexLayout Grid.Row="0" Direction="Row" AlignItems="Center" Wrap="Wrap">
                         <RadioButton x:Name="ThatsMeRadioButton"
-                                     SemanticProperties.Hint="{StaticResource ThatsMe}"
-                                     SemanticProperties.Description="{StaticResource ThatsMe}"
+                                     SemanticProperties.Hint="{x:Static strings:AppResources.ThatsMe}"
+                                     SemanticProperties.Description="{x:Static strings:AppResources.ThatsMe}"
                                      HorizontalOptions="Fill"
                                      IsChecked="True"/>
-                        <Label Text="{StaticResource ThatsMe}" VerticalOptions="Center">
+                        <Label Text="{x:Static strings:AppResources.ThatsMe}" VerticalOptions="Center">
                             <Label.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="ThatsMeRadioButton_OnTapped"/>
                             </Label.GestureRecognizers>
@@ -81,19 +81,19 @@
                     </FlexLayout>
                     <FlexLayout Grid.Row="1" Direction="Row" AlignItems="Center" Wrap="Wrap">
                         <RadioButton x:Name="IAmAStafferRadioButton"
-                                     SemanticProperties.Hint="{StaticResource IAmAStaffer}"
-                                     SemanticProperties.Description="{StaticResource IAmAStaffer}"
+                                     SemanticProperties.Hint="{x:Static strings:AppResources.IAmAStaffer}"
+                                     SemanticProperties.Description="{x:Static strings:AppResources.IAmAStaffer}"
                                      HorizontalOptions="Fill"
                                      IsChecked="{Binding IsStaffer}"/>
                                      
-                        <Label Text="{StaticResource IAmAStaffer}" VerticalOptions="Center">
+                        <Label Text="{x:Static strings:AppResources.IAmAStaffer}" VerticalOptions="Center">
                             <Label.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="IAmAStafferRadioButton_OnTapped"/>
                             </Label.GestureRecognizers>
                         </Label>
                     </FlexLayout>
                 </Grid>
-                <Label Text="{StaticResource EmailEntry}" Margin="0, 10, 0, 0" />
+                <Label Text="{x:Static strings:AppResources.EmailEntry}" Margin="0, 10, 0, 0" />
                 <FlexLayout Direction="Row" Margin="0, 8, 0, 0" AlignItems="Center" Wrap="Wrap">
                     <StackLayout>
                         <controls:BorderlessEntry 
@@ -127,11 +127,11 @@
                          Command ="{Binding SendMPVerificationEmailCommand}" 
                          Style="{StaticResource NormalButton}" 
                          Padding="16, 12"
-                         Text="{StaticResource SendVerificationPIN}" 
-                         SemanticProperties.Hint="{StaticResource SendVerificationPINHint}"
-                         SemanticProperties.Description="{StaticResource SendVerificationPIN}"/>
+                         Text="{x:Static strings:AppResources.SendVerificationPIN}" 
+                         SemanticProperties.Hint="{x:Static strings:AppResources.SendVerificationPINHint}"
+                         SemanticProperties.Description="{x:Static strings:AppResources.SendVerificationPIN}"/>
                 <BoxView Style="{StaticResource ButtonSeparator}" Margin="0, 24, 0, 0" />
-                <Label Text="{StaticResource SubmitPINButtonText}" Margin="0, 10, 0, 0" />
+                <Label Text="{x:Static strings:AppResources.SubmitPINButtonText}" Margin="0, 10, 0, 0" />
                 <FlexLayout x:Name="CodeLayout" AlignItems="Center" JustifyContent="SpaceBetween" Direction="Row" Margin="32, 24,32,16">
                     <Entry Style="{StaticResource BoxEntry}"
                             TextChanged="VerifyCodeEntries_OnTextChanged"/>
@@ -147,11 +147,11 @@
                            TextChanged="VerifyCodeEntries_OnTextChanged"/>
                 </FlexLayout>
                 
-                <Button Text="{StaticResource Verify}" 
+                <Button Text="{x:Static strings:AppResources.Verify}" 
                         Clicked="SubmitButton_OnClicked"
                         Style="{StaticResource OutlineButton}" 
-                        SemanticProperties.Hint="{StaticResource VerifyHint}"
-                        SemanticProperties.Description="{StaticResource Verify}"
+                        SemanticProperties.Hint="{x:Static strings:AppResources.VerifyHint}"
+                        SemanticProperties.Description="{x:Static strings:AppResources.Verify}"
                         HorizontalOptions="FillAndExpand" />
                 
             </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/OtherUserProfilePage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/OtherUserProfilePage.xaml
index 9254e000..3acbf6bb 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/OtherUserProfilePage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/OtherUserProfilePage.xaml
@@ -6,16 +6,16 @@
              xmlns:views="clr-namespace:RightToAskClient.Maui.Views"
              x:Class="RightToAskClient.Maui.Views.OtherUserProfilePage"
              xmlns:local="clr-namespace:RightToAskClient.Maui"
-             
+               xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui">
     <ContentPage.BindingContext>
         <vm:RegistrationViewModel/>
     </ContentPage.BindingContext>
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{StaticResource HomeButtonText}" Command="{Binding HomeButtonCommand}" x:DataType="vm:BaseViewModel"
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.home4.png}"/>
-        <ToolbarItem Text="{StaticResource InfoPopupButtonText}" Command="{Binding InfoPopupCommand}" x:DataType="vm:BaseViewModel" 
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.help_75.png}"/>
+        <ToolbarItem Text="{x:Static strings:AppResources.HomeButtonText}" Command="{Binding HomeButtonCommand}" x:DataType="vm:BaseViewModel"
+                     IconImageSource="home4.png"/>
+        <ToolbarItem Text="{x:Static strings:AppResources.InfoPopupButtonText}" Command="{Binding InfoPopupCommand}" x:DataType="vm:BaseViewModel" 
+                     IconImageSource="help_75.png"/>
     </ContentPage.ToolbarItems>
     <ContentPage.Content>
         <StackLayout Margin="20">
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/HowToPublishPopup.xaml b/RightToAskClient/RightToAskClient.Maui/Views/Popups/HowToPublishPopup.xaml
index 06e7cf64..a4018610 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/HowToPublishPopup.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/HowToPublishPopup.xaml
@@ -4,7 +4,7 @@
            xmlns:views="clr-namespace:RightToAskClient.Maui.Views"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="RightToAskClient.Maui.Views.Popups.HowToPublishPopup"
-           
+             xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
            Size="350,600"
            Color="Transparent">
     <Frame CornerRadius="10" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" Margin="0" Padding="0"
@@ -13,7 +13,7 @@
             <views:HowToPublishView VerticalOptions="FillAndExpand" Margin="0" Padding="0" BackgroundColor="Transparent"/>
             <!--Ok Button-->
             <Grid ColumnDefinitions="*,*" VerticalOptions="EndAndExpand" BackgroundColor="Transparent" Margin="0" Padding="0">
-                <Button Text="{StaticResource OKText}" Grid.Column="1" Clicked="Button_Clicked" 
+                <Button Text="{x:Static strings:AppResources.OKText}" Grid.Column="1" Clicked="Button_Clicked" 
                         Style="{StaticResource PopupOKButton}" />
             </Grid>
         </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/HowToPublishPopup.xaml.cs b/RightToAskClient/RightToAskClient.Maui/Views/Popups/HowToPublishPopup.xaml.cs
index 10a945b4..001532c2 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/HowToPublishPopup.xaml.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/HowToPublishPopup.xaml.cs
@@ -19,8 +19,7 @@ public HowToPublishPopup()
 
         private void Button_Clicked(object sender, EventArgs e)
         {
-            //TODO
-            ////TODO: Dismiss("Dismissed");
+            App.Current.MainPage.Navigation.PopModalAsync();
         }
     }
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/OneButtonPopup.xaml b/RightToAskClient/RightToAskClient.Maui/Views/Popups/OneButtonPopup.xaml
index 88956488..d0be19b9 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/OneButtonPopup.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/OneButtonPopup.xaml
@@ -7,7 +7,7 @@
            xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
            x:Class="RightToAskClient.Maui.Views.Popups.OneButtonPopup"
            WidthRequest="300"
-        HeightRequest="320"
+           HeightRequest="320"
            BackgroundColor="Transparent">   
     <Frame CornerRadius="5" 
            VerticalOptions="FillAndExpand" 
@@ -35,7 +35,7 @@
                              Orientation="Horizontal"
                              BackgroundColor="{AppThemeBinding Light=White, Dark={StaticResource BackgroundDarkGray}}">
                     <!--Emu Bottom Left-->
-                    <Image x:Name="EmuImage" Source="{helpers:ImageResource RightToAskClient.Images.emu_tall.PNG}"
+                    <Image x:Name="EmuImage" Source="emu_tall.png"
                            WidthRequest="100" HeightRequest="100" Rotation="0" VerticalOptions="End"
                            BackgroundColor="Transparent" />
                     <StackLayout HorizontalOptions="FillAndExpand" VerticalOptions="CenterAndExpand">
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/OneButtonPopup.xaml.cs b/RightToAskClient/RightToAskClient.Maui/Views/Popups/OneButtonPopup.xaml.cs
index 51d63566..5a0e9072 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/OneButtonPopup.xaml.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/OneButtonPopup.xaml.cs
@@ -43,7 +43,7 @@ public OneButtonPopup(string title, string message, string buttonText, bool isIn
 
         private void okButton_Clicked(object sender, EventArgs e)
         {
-            //TODO: Dismiss("Dismissed");
+            App.Current.MainPage.Navigation.PopModalAsync();
         }
 
         private void initialize(string title, string message, string buttonText, bool isInfoPopup)
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/QuestionPublishedPopup.xaml b/RightToAskClient/RightToAskClient.Maui/Views/Popups/QuestionPublishedPopup.xaml
index 5963487a..14924257 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/QuestionPublishedPopup.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/QuestionPublishedPopup.xaml
@@ -4,20 +4,21 @@
            xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
            x:Class="RightToAskClient.Maui.Views.Popups.QuestionPublishedPopup"
             xmlns:r="RightToAskClient.Maui.Resx"
+             xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
            WidthRequest="300"
            HeightRequest="300"
            BackgroundColor="Transparent">
     <Frame CornerRadius="30" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" 
                BackgroundColor="{AppThemeBinding Light={StaticResource WindowBackgroundColor}, Dark={StaticResource WindowBackgroundColorDark}}">
         <StackLayout VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" BackgroundColor="Transparent">
-            <Label Text="{StaticResource QuestionPublishedPopupText}" 
+            <Label Text="{x:Static strings:AppResources.QuestionPublishedPopupText}" 
                    Style="{StaticResource PopupHeaderText}"/>
-            <Label x:Name="mainMessage" Text="{StaticResource QuestionPublishedPopupDetailText}" VerticalOptions="CenterAndExpand" VerticalTextAlignment="Center" 
+            <Label x:Name="mainMessage" Text="{x:Static strings:AppResources.QuestionPublishedPopupDetailText}" VerticalOptions="CenterAndExpand" VerticalTextAlignment="Center" 
                        Style="{StaticResource PopupText}" />
             <Grid ColumnDefinitions="*,*" VerticalOptions="End" BackgroundColor="Transparent">
-                <Button Text="{StaticResource WriteAnotherQuestionButtonText}" Grid.Column="0" 
+                <Button Text="{x:Static strings:AppResources.WriteAnotherQuestionButtonText}" Grid.Column="0" 
                         Clicked="WriteAnotherButtonClicked" Style="{StaticResource PopupCancelButton}" />
-                <Button Text="{StaticResource GoHomeButtonText}" Grid.Column="1" Clicked="GoHomeButtonClicked" 
+                <Button Text="{x:Static strings:AppResources.GoHomeButtonText}" Grid.Column="1" Clicked="GoHomeButtonClicked" 
                         Style = "{StaticResource PopupOKButton}" />
             </Grid>
         </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/QuestionPublishedPopup.xaml.cs b/RightToAskClient/RightToAskClient.Maui/Views/Popups/QuestionPublishedPopup.xaml.cs
index 059d0390..f2850d80 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/QuestionPublishedPopup.xaml.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/QuestionPublishedPopup.xaml.cs
@@ -21,13 +21,13 @@ public QuestionPublishedPopup()
         private void WriteAnotherButtonClicked(object sender, EventArgs e)
         {
             QuestionViewModel.Instance.GoHome = false;
-            //TODO: Dismiss("Dismissed");
+            App.Current.MainPage.Navigation.PopModalAsync();
         }
 
         private void GoHomeButtonClicked(object sender, EventArgs e)
         {
             QuestionViewModel.Instance.GoHome = true;
-            //TODO: Dismiss("Dismissed");
+            App.Current.MainPage.Navigation.PopModalAsync();
         }
     }
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/ReadingPagePopup.xaml b/RightToAskClient/RightToAskClient.Maui/Views/Popups/ReadingPagePopup.xaml
index 50c2b83d..8c4a83ed 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/ReadingPagePopup.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/ReadingPagePopup.xaml
@@ -6,7 +6,7 @@
            xmlns:viewmodels="clr-namespace:RightToAskClient.Maui.ViewModels"
            x:DataType="viewmodels:ReadingPageViewModel"
            x:Class="RightToAskClient.Maui.Views.Popups.ReadingPagePopup"
-          
+            xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
            Size="300,300"
            Color="Transparent">
 
@@ -17,10 +17,10 @@
                      BackgroundColor="{AppThemeBinding Light={StaticResource WindowBackgroundColor}, Dark={StaticResource WindowBackgroundColorDark}}">
             <StackLayout VerticalOptions="FillAndExpand" BackgroundColor="Transparent">
                 <Label Text="{Binding Heading1}" Style="{StaticResource PopupHeaderText}" />
-                <Label Text="{StaticResource ReadingPageHeader1}" VerticalOptions="Center"
+                <Label Text="{x:Static strings:AppResources.ReadingPageHeader1}" VerticalOptions="Center"
                        VerticalTextAlignment="Center" LineHeight="1.3" Style="{StaticResource PopupText}" />
                 <Grid ColumnDefinitions="*,*" VerticalOptions="EndAndExpand" BackgroundColor="Transparent">
-                    <Button Text="{StaticResource OKText}" Grid.Column="1" Clicked="Button_Clicked" 
+                    <Button Text="{x:Static strings:AppResources.OKText}" Grid.Column="1" Clicked="Button_Clicked" 
                             Style="{StaticResource PopupOKButton}" />
                 </Grid>
             </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/ReadingPagePopup.xaml.cs b/RightToAskClient/RightToAskClient.Maui/Views/Popups/ReadingPagePopup.xaml.cs
index d5ac9062..bdf4c5a5 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/ReadingPagePopup.xaml.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/ReadingPagePopup.xaml.cs
@@ -21,7 +21,7 @@ public ReadingPagePopup(ReadingPageViewModel vm)
 
         private void Button_Clicked(object sender, EventArgs e)
         {
-            //TODO: Dismiss("Dismissed");
+            App.Current.MainPage.Navigation.PopModalAsync();
         }
     }
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/TermAndConditionPopup.xaml b/RightToAskClient/RightToAskClient.Maui/Views/Popups/TermAndConditionPopup.xaml
index f5cc2652..60588a72 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/TermAndConditionPopup.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/TermAndConditionPopup.xaml
@@ -2,8 +2,11 @@
 <xct:Popup xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
            xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"    
            xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-           x:Class="RightToAskClient.Maui.Views.Popups.TermAndConditionPopup"         
+           x:Class="RightToAskClient.Maui.Views.Popups.TermAndConditionPopup" 
+           xmlns:local="clr-namespace:RightToAskClient.Maui.Helpers"
+           xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
            Size="300,160"
+           CanBeDismissedByTappingOutsideOfPopup="False"
            Color="Transparent">
     <Frame CornerRadius="5" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" Padding="0"
            BackgroundColor="{AppThemeBinding Light={StaticResource WindowBackgroundColor}, Dark={StaticResource BackgroundDarkGray}}">
@@ -14,22 +17,35 @@
                          HorizontalOptions="CenterAndExpand"
                          x:Name="MarkdownView"
                          Margin="16, 0">
+                <Label>
+                    <Label.FormattedText>
+                        <FormattedString>
+                            <Span Text="By tapping 'Agree and Continue', you agree to our " />
+                            <local:HyperlinkSpan Text="Privacy Policy" Url="https://www.democracydevelopers.org.au/privacy-policy/">
+                            </local:HyperlinkSpan>
+                            <Span Text=" and " />
+                            <local:HyperlinkSpan Text="Terms and Conditions." Url="https://www.democracydevelopers.org.au/terms-conditions">
+                            </local:HyperlinkSpan>
+                        </FormattedString>
+                    </Label.FormattedText>
+                </Label>
             </StackLayout>
 
             <StackLayout Padding="0,1,0,0"
                          BackgroundColor="{AppThemeBinding Light={StaticResource FadedButtonColor}, Dark={StaticResource SeparatorDarkModeColor}}">
                 <!--Acknowledge/Dismiss Button Bottom Right-->
-                <StackLayout
+                <StackLayout x:Name="TermsStackLayout"
                     BackgroundColor="{AppThemeBinding Light=White, Dark={StaticResource BackgroundDarkGray}}">
-                    <Button Text="{StaticResource AgreeAndContinueButton}" HorizontalOptions="Center"
+                    
+                    <Button Text="{x:Static strings:AppResources.AgreeAndContinueButton}" HorizontalOptions="Center"
                             FontSize="Small"
                             VerticalOptions="End" Clicked="okButton_Clicked"
-                            SemanticProperties.Hint="{StaticResource TCContinueButtonHint}"
-                            SemanticProperties.Description="{StaticResource AgreeAndContinueButton}"
+                            SemanticProperties.Hint="{x:Static strings:AppResources.TCContinueButtonHint}"
+                            SemanticProperties.Description="{x:Static strings:AppResources.AgreeAndContinueButton}"
                             Style="{StaticResource PopupOKButton}" BackgroundColor="Transparent" />
                 </StackLayout>
             </StackLayout>
-            
+
         </StackLayout>
     </Frame>
 </xct:Popup>
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/TermAndConditionPopup.xaml.cs b/RightToAskClient/RightToAskClient.Maui/Views/Popups/TermAndConditionPopup.xaml.cs
index e1e65a06..b854cf73 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/TermAndConditionPopup.xaml.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/TermAndConditionPopup.xaml.cs
@@ -18,9 +18,12 @@ namespace RightToAskClient.Maui.Views.Popups
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class TermAndConditionPopup : Popup
     {
+        //TODO: localisation of the terms text will need to be handled at a later point when localisation occurs as the hyperlinks are seperate
+        //and this was left as the MAUI conversion was a lengthy process
         public TermAndConditionPopup()
         {
             InitializeComponent();
+            
             //TODO:
             //var lightTheme = new LightMarkdownTheme();
             //// TODO Xamarin.Forms.Device.GetNamedSize is not longer supported. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes
@@ -47,7 +50,14 @@ public TermAndConditionPopup()
             //{
             //    AutomationProperties.SetHelpText(mdView, AppResources.TermsAndConditionsHelpTextIOS);
             //}
-
+            //if (DeviceInfo.Platform == DevicePlatform.Android)
+            //{
+            //    TermsText.Text = AppResources.TermsAndConditionsHelpTextAndroid;
+            //}
+            //else
+            //{
+            //    TermsText.Text = AppResources.TermsAndConditionsHelpTextIOS;
+            //}
             //mdView.SetOnAppTheme<MarkdownTheme>(Xam.Forms.Markdown.MarkdownView.ThemeProperty, lightTheme, darkTheme);
 
             //MarkdownView.Children.Add(new ScrollView() { Content = mdView });
@@ -56,21 +66,21 @@ public TermAndConditionPopup()
         private void okButton_Clicked(object sender, EventArgs e)
         {
             XamarinPreferences.shared.Set(Constants.ShowFirstTimeReadingPopup, false);
-            //TODO: Dismiss("Dismissed");
+            Close();
         }
 
-        /*
-        private async void PrivacyPolicy_OnTapped(object sender, EventArgs e)
-        {
-            await Browser.OpenAsync(Constants.DDPrivacyPolicyURL,
-                BrowserLaunchMode.SystemPreferred);
-        }
 
-        private async void TermAndCondition_OnTapped(object sender, EventArgs e)
-        {
-            await Browser.OpenAsync(Constants.DDTermsAndConditionsURL,
-                BrowserLaunchMode.SystemPreferred);
-        }
-        */
+        //private async void PrivacyPolicy_OnTapped(object sender, EventArgs e)
+        //{
+        //    await Browser.OpenAsync(Constants.DDPrivacyPolicyURL,
+        //        BrowserLaunchMode.SystemPreferred);
+        //}
+
+        //private async void TermAndCondition_OnTapped(object sender, EventArgs e)
+        //{
+        //    await Browser.OpenAsync(Constants.DDTermsAndConditionsURL,
+        //        BrowserLaunchMode.SystemPreferred);
+        //}
+
     }
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/TwoButtonPopup.xaml.cs b/RightToAskClient/RightToAskClient.Maui/Views/Popups/TwoButtonPopup.xaml.cs
index dd0f6df9..692cc9dc 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/TwoButtonPopup.xaml.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/TwoButtonPopup.xaml.cs
@@ -42,16 +42,16 @@ public bool HasApproved(object? value)
 
         private void DismissPopup(object sender, EventArgs e)
         {
-            //TODO: Dismiss("cancel");
+            App.Current.MainPage.Navigation.PopModalAsync();
         }
 
         private void CancelButtonClicked(object sender, EventArgs e)
         {
-            //TODO: Dismiss("cancel");
+            App.Current.MainPage.Navigation.PopModalAsync();
         }
         private void ApproveButtonClicked(object sender, EventArgs e)
         {
-            //TODO: Dismiss("OK");
+            App.Current.MainPage.Navigation.PopModalAsync();
         }
     }
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/PublicPrivateLabel.xaml b/RightToAskClient/RightToAskClient.Maui/Views/PublicPrivateLabel.xaml
index 1aefa154..ed8c082f 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/PublicPrivateLabel.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/PublicPrivateLabel.xaml
@@ -4,7 +4,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="RightToAskClient.Maui.Views.PublicPrivateLabel"
-            
+              xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:Name="This">
     <Frame
         x:Name="PublicLabel"
@@ -16,7 +16,7 @@
         Padding="15, 2"
         CornerRadius="13">
         <Label Style="{StaticResource PublicPrivateLabelText}"
-               Text="{StaticResource PublicLabel}"
+               Text="{x:Static strings:AppResources.PublicLabel}"
                TextColor="White" />
     </Frame>
 
@@ -31,7 +31,7 @@
             Style="{StaticResource PublicPrivateLabel}"
             BackgroundColor="{AppThemeBinding Light=White, Dark=Black}">
             <Label Style="{StaticResource PublicPrivateLabelText}"
-                   Text="{StaticResource PrivateLabel}"
+                   Text="{x:Static strings:AppResources.PrivateLabel}"
                    TextColor="{AppThemeBinding Light={StaticResource Primary}, Dark=White}" />
         </Frame>
     </Frame>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/QuestionAnswererPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/QuestionAnswererPage.xaml
index d3c03769..e3253e39 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/QuestionAnswererPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/QuestionAnswererPage.xaml
@@ -4,14 +4,14 @@
              xmlns:vm="clr-namespace:RightToAskClient.Maui.ViewModels"
              xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:Class="RightToAskClient.Maui.Views.QuestionAnswererPage"
-            
+              xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              Title="{StaticResource WhoShouldAnswerTitle}" 
              x:DataType="vm:QuestionViewModel">
     <ContentPage.Content>        
         <StackLayout VerticalOptions="FillAndExpand">
             <ScrollView>
                 <StackLayout VerticalOptions="Fill">
-                    <Label Text="{StaticResource AnswerQuestionHeaderText}" Style="{StaticResource Header1}" VerticalOptions="Start" Margin="16, 16, 16, 0"/>
+                    <Label Text="{x:Static strings:AppResources.AnswerQuestionHeaderText}" Style="{StaticResource Header1}" VerticalOptions="Start" Margin="16, 16, 16, 0"/>
                     <BoxView Margin="16, 0"/>
                         <Grid VerticalOptions="StartAndExpand" HorizontalOptions="Fill" RowSpacing="0"
                           Margin="8, 16" Grid.RowDefinitions="Auto,Auto,Auto,Auto" RadioButtonGroup.GroupName="WhoAnswerOptions">
@@ -22,8 +22,8 @@
                         <!-- my mp -->
                         <RadioButton 
                             Grid.Row="0" Grid.Column="0"
-                            SemanticProperties.Hint="{StaticResource MyMPAnswerExplText}"
-                            SemanticProperties.Description="{StaticResource MyMp}"
+                            SemanticProperties.Hint="{x:Static strings:AppResources.MyMPAnswerExplText}"
+                            SemanticProperties.Description="{x:Static strings:AppResources.MyMp}"
                             VerticalOptions="StartAndExpand"
                             HorizontalOptions="Fill"
                             x:Name="MyMpRadioButton"
@@ -33,9 +33,9 @@
                             <StackLayout.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="MyMpRadioButton_OnTapped"/>
                             </StackLayout.GestureRecognizers>
-                            <Label Text="{StaticResource MyMp}"
+                            <Label Text="{x:Static strings:AppResources.MyMp}"
                                    Style="{StaticResource ReportReasonTitle}" />
-                            <Label Text="{StaticResource MyMPAnswerExplText}"
+                            <Label Text="{x:Static strings:AppResources.MyMPAnswerExplText}"
                                    Style="{StaticResource ReportReasonDetails}"/>
                         </StackLayout>
                         
@@ -43,8 +43,8 @@
                         <RadioButton 
                             Margin="0, 24, 0,0"
                             Grid.Row="1" Grid.Column="0"
-                            SemanticProperties.Hint="{StaticResource OtherMPAnswerExplText}"
-                            SemanticProperties.Description="{StaticResource AnotherMPButtonText}"
+                            SemanticProperties.Hint="{x:Static strings:AppResources.OtherMPAnswerExplText}"
+                            SemanticProperties.Description="{x:Static strings:AppResources.AnotherMPButtonText}"
                             VerticalOptions="StartAndExpand"
                             HorizontalOptions="Fill"
                             x:Name="AnotherMpRadioButton"
@@ -54,9 +54,9 @@
                             <StackLayout.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="AnotherMpRadioButton_OnTapped"/>
                             </StackLayout.GestureRecognizers>
-                            <Label Text="{StaticResource AnotherMPButtonText}"
+                            <Label Text="{x:Static strings:AppResources.AnotherMPButtonText}"
                                    Style="{StaticResource ReportReasonTitle}" />
-                            <Label Text="{StaticResource OtherMPAnswerExplText}"
+                            <Label Text="{x:Static strings:AppResources.OtherMPAnswerExplText}"
                                    Style="{StaticResource ReportReasonDetails}"/>
                         </StackLayout>
                         
@@ -64,8 +64,8 @@
                         <RadioButton 
                             Margin="0, 24, 0,0"
                             Grid.Row="2" Grid.Column="0"
-                            SemanticProperties.Hint="{StaticResource AuthorityAnswerExplText}"
-                            SemanticProperties.Description="{StaticResource PublicAuthority}"
+                            SemanticProperties.Hint="{x:Static strings:AppResources.AuthorityAnswerExplText}"
+                            SemanticProperties.Description="{x:Static strings:AppResources.PublicAuthority}"
                             VerticalOptions="StartAndExpand"
                             HorizontalOptions="Fill"
                             x:Name="PublicAuthorityRadioButton"
@@ -77,9 +77,9 @@
                             <StackLayout.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="PublicAuthorityRadioButton_OnTapped"/>
                             </StackLayout.GestureRecognizers>
-                            <Label Text="{StaticResource PublicAuthority}"
+                            <Label Text="{x:Static strings:AppResources.PublicAuthority}"
                                    Style="{StaticResource ReportReasonTitle}" />
-                            <Label Text="{StaticResource AuthorityAnswerExplText}"
+                            <Label Text="{x:Static strings:AppResources.AuthorityAnswerExplText}"
                                    Style="{StaticResource ReportReasonDetails}"/>
                         </StackLayout>
                         
@@ -87,8 +87,8 @@
                         <RadioButton 
                             Margin="0, 24, 0,0"
                             Grid.Row="3" Grid.Column="0"
-                            SemanticProperties.Hint="{StaticResource LeaveBlankExplText}"
-                            SemanticProperties.Description="{StaticResource DontKnowOption}"
+                            SemanticProperties.Hint="{x:Static strings:AppResources.LeaveBlankExplText}"
+                            SemanticProperties.Description="{x:Static strings:AppResources.DontKnowOption}"
                             VerticalOptions="StartAndExpand"
                             HorizontalOptions="Fill"
                             x:Name="DontKnowRadioButton"
@@ -98,9 +98,9 @@
                             <StackLayout.GestureRecognizers>
                                 <TapGestureRecognizer Tapped="DontKnowRadioButton_OnTapped"/>
                             </StackLayout.GestureRecognizers>
-                            <Label Text="{StaticResource DontKnowOption}"
+                            <Label Text="{x:Static strings:AppResources.DontKnowOption}"
                                    Style="{StaticResource ReportReasonTitle}" />
-                            <Label Text="{StaticResource LeaveBlankExplText}"
+                            <Label Text="{x:Static strings:AppResources.LeaveBlankExplText}"
                                    Style="{StaticResource ReportReasonDetails}"/>
                         </StackLayout>
                     </Grid>
@@ -109,11 +109,11 @@
             
             <StackLayout Padding="0, 8" VerticalOptions="EndAndExpand" Margin="0,0,0, 10">
                 <BoxView Style="{StaticResource ButtonSeparator}" Margin="0, 12"/>
-                <Button Text="{StaticResource NextButtonText}" Style="{StaticResource NormalButton}"
+                <Button Text="{x:Static strings:AppResources.NextButtonText}" Style="{StaticResource NormalButton}"
                         Padding="16, 12"
                         Margin="16, 0"
-                        SemanticProperties.Hint="{StaticResource NextButtonText}"
-                        SemanticProperties.Description="{StaticResource NextButtonText}"
+                        SemanticProperties.Hint="{x:Static strings:AppResources.NextButtonText}"
+                        SemanticProperties.Description="{x:Static strings:AppResources.NextButtonText}"
                         Clicked="NextButton_OnClicked"/>
             </StackLayout>
         </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/QuestionAskerPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/QuestionAskerPage.xaml
index 0f27b903..7ec37913 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/QuestionAskerPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/QuestionAskerPage.xaml
@@ -5,16 +5,16 @@
              xmlns:xct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              xmlns:vm="clr-namespace:RightToAskClient.Maui.ViewModels"
              x:Class="RightToAskClient.Maui.Views.QuestionAskerPage"
-             
+               xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              Title="{StaticResource RaiseQuestionTitle}"
              x:DataType="vm:QuestionViewModel">
     <ContentPage.Content>
         <StackLayout VerticalOptions="FillAndExpand">
         <ScrollView >
             <StackLayout VerticalOptions="Fill" Margin="10">
-                <Label Text="{StaticResource RaiseQuestionHeaderText}" Style="{StaticResource Header1}" VerticalOptions="Start" />
+                <Label Text="{x:Static strings:AppResources.RaiseQuestionHeaderText}" Style="{StaticResource Header1}" VerticalOptions="Start" />
                 <BoxView/>
-                <Label Text="{StaticResource InParliamentHeaderText}"
+                <Label Text="{x:Static strings:AppResources.InParliamentHeaderText}"
                        Style="{StaticResource Header2}" HorizontalTextAlignment="Center" />
              
                 <Grid VerticalOptions="StartAndExpand" HorizontalOptions="Fill" RowSpacing="0"
@@ -26,8 +26,8 @@
                     <!-- Committee -->
                     <RadioButton 
                         Grid.Row="0" Grid.Column="0"
-                        SemanticProperties.Hint="{StaticResource InParliamentExplText}"
-                        SemanticProperties.Description="{StaticResource FindCommitteeButtonText}"
+                        SemanticProperties.Hint="{x:Static strings:AppResources.InParliamentExplText}"
+                        SemanticProperties.Description="{x:Static strings:AppResources.FindCommitteeButtonText}"
                         VerticalOptions="StartAndExpand"
                         HorizontalOptions="Fill"
                         x:Name="CommitteeRadioButton"
@@ -37,9 +37,9 @@
                         <StackLayout.GestureRecognizers>
                             <TapGestureRecognizer Tapped="CommitteeRadioButton_OnTapped"/>
                         </StackLayout.GestureRecognizers>
-                        <Label Text="{StaticResource FindCommitteeButtonText}"
+                        <Label Text="{x:Static strings:AppResources.FindCommitteeButtonText}"
                                Style="{StaticResource ReportReasonTitle}" />
-                        <Label Text="{StaticResource InParliamentExplText}"
+                        <Label Text="{x:Static strings:AppResources.InParliamentExplText}"
                                Style="{StaticResource ReportReasonDetails}"/>
                     </StackLayout>
                     
@@ -48,8 +48,8 @@
                     <RadioButton 
                         Margin="0, 24, 0,0"
                         Grid.Row="1" Grid.Column="0"
-                        SemanticProperties.Hint="{StaticResource MyMPExplText}"
-                        SemanticProperties.Description="{StaticResource MyMp}"
+                        SemanticProperties.Hint="{x:Static strings:AppResources.MyMPExplText}"
+                        SemanticProperties.Description="{x:Static strings:AppResources.MyMp}"
                         VerticalOptions="StartAndExpand"
                         HorizontalOptions="Fill"
                         x:Name="MyMpRadioButton"
@@ -59,9 +59,9 @@
                         <StackLayout.GestureRecognizers>
                             <TapGestureRecognizer Tapped="MyMpRadioButton_OnTapped"/>
                         </StackLayout.GestureRecognizers>
-                        <Label Text="{StaticResource MyMp}"
+                        <Label Text="{x:Static strings:AppResources.MyMp}"
                                Style="{StaticResource ReportReasonTitle}" />
-                        <Label Text="{StaticResource MyMPExplText}"
+                        <Label Text="{x:Static strings:AppResources.MyMPExplText}"
                                Style="{StaticResource ReportReasonDetails}"/>
                     </StackLayout>
                     
@@ -70,8 +70,8 @@
                     <RadioButton 
                         Margin="0, 24, 0,0"
                         Grid.Row="2" Grid.Column="0"
-                        SemanticProperties.Hint="{StaticResource OtherMPRaiseExplText}"
-                        SemanticProperties.Description="{StaticResource AnotherMPButtonText}"
+                        SemanticProperties.Hint="{x:Static strings:AppResources.OtherMPRaiseExplText}"
+                        SemanticProperties.Description="{x:Static strings:AppResources.AnotherMPButtonText}"
                         VerticalOptions="StartAndExpand"
                         HorizontalOptions="Fill"
                         x:Name="OtherMpRadioButton"
@@ -81,15 +81,15 @@
                         <StackLayout.GestureRecognizers>
                             <TapGestureRecognizer Tapped="OtherMpRadioButton_OnTapped"/>
                         </StackLayout.GestureRecognizers>
-                        <Label Text="{StaticResource AnotherMPButtonText}"
+                        <Label Text="{x:Static strings:AppResources.AnotherMPButtonText}"
                                Style="{StaticResource ReportReasonTitle}" />
-                        <Label Text="{StaticResource OtherMPRaiseExplText}"
+                        <Label Text="{x:Static strings:AppResources.OtherMPRaiseExplText}"
                                Style="{StaticResource ReportReasonDetails}"/>
                     </StackLayout>
                     
                     <StackLayout Grid.Row="3" Orientation="Horizontal" VerticalOptions="CenterAndExpand" Grid.ColumnSpan="2" Margin="0, 12">
                         <BoxView Style="{StaticResource ButtonSeparator}"/>
-                        <Label Text="{StaticResource OR}" Style="{StaticResource Header2}" FontSize="Small"/>
+                        <Label Text="{x:Static strings:AppResources.OR}" Style="{StaticResource Header2}" FontSize="Small"/>
                         <BoxView Style="{StaticResource ButtonSeparator}"/>
                     </StackLayout>
                     
@@ -97,8 +97,8 @@
                     <RadioButton 
                         Margin="0, 24, 0,0"
                         Grid.Row="4" Grid.Column="0"
-                        SemanticProperties.Hint="{StaticResource LeaveBlankExplText}"
-                        SemanticProperties.Description="{StaticResource DontKnowTitle}"
+                        SemanticProperties.Hint="{x:Static strings:AppResources.LeaveBlankExplText}"
+                        SemanticProperties.Description="{x:Static strings:AppResources.DontKnowTitle}"
                         VerticalOptions="StartAndExpand"
                         HorizontalOptions="Fill"
                         x:Name="DontKnowRadioButton"
@@ -108,9 +108,9 @@
                         <StackLayout.GestureRecognizers>
                             <TapGestureRecognizer Tapped="DontKnowRadioButton_OnTapped"/>
                         </StackLayout.GestureRecognizers>
-                        <Label Text="{StaticResource DontKnowTitle}"
+                        <Label Text="{x:Static strings:AppResources.DontKnowTitle}"
                                Style="{StaticResource ReportReasonTitle}" />
-                        <Label Text="{StaticResource LeaveBlankExplText}"
+                        <Label Text="{x:Static strings:AppResources.LeaveBlankExplText}"
                                Style="{StaticResource ReportReasonDetails}"/>
                     </StackLayout>
                 </Grid>
@@ -120,11 +120,11 @@
             
             <StackLayout Padding="0, 8" VerticalOptions="EndAndExpand" Margin="0,0,0, 10">
                 <BoxView Style="{StaticResource ButtonSeparator}" Margin="0, 12"/>
-                <Button Text="{StaticResource NextButtonText}" Style="{StaticResource NormalButton}"
+                <Button Text="{x:Static strings:AppResources.NextButtonText}" Style="{StaticResource NormalButton}"
                         Padding="16, 12"
                         Margin="16, 0"
-                        SemanticProperties.Hint="{StaticResource NextButtonText}"
-                        SemanticProperties.Description="{StaticResource NextButtonText}"
+                        SemanticProperties.Hint="{x:Static strings:AppResources.NextButtonText}"
+                        SemanticProperties.Description="{x:Static strings:AppResources.NextButtonText}"
                         Clicked="NextButton_OnClicked"/>
             </StackLayout>
             </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/QuestionBackgroundPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/QuestionBackgroundPage.xaml
index 3093c779..eb33732d 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/QuestionBackgroundPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/QuestionBackgroundPage.xaml
@@ -5,7 +5,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="RightToAskClient.Maui.Views.QuestionBackgroundPage"
              x:DataType="vm:QuestionViewModel"
-            
+              xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              Title="{StaticResource BackgroundPageTitle}">
     <ContentPage.Content>
         <ScrollView VerticalScrollBarVisibility="Never">
@@ -13,7 +13,7 @@
                 
                 <StackLayout VerticalOptions="Fill">
                     <StackLayout Padding="16, 16, 16, 0">
-                        <Label Text="{StaticResource YouAskTitle}" Style="{StaticResource SmallGreyHeader}"/>
+                        <Label Text="{x:Static strings:AppResources.YouAskTitle}" Style="{StaticResource SmallGreyHeader}"/>
                         <Label Text="{Binding Question.QuestionText}" FontSize="Medium" LineHeight="1.3"/>
                         <BoxView Style="{StaticResource ButtonSeparator}" Margin="0, 8, 0, 0"/>
                     </StackLayout>
@@ -49,8 +49,8 @@
                                 Padding="16, 8"
                                 Style="{StaticResource NormalButton}"
                                 Command="{Binding ToHowAnsweredOptionPageCommand}"
-                                SemanticProperties.Hint="{StaticResource EditorProceedHint}"
-                                SemanticProperties.Description="{StaticResource EditorProceedButtonDescription}" />
+                                SemanticProperties.Hint="{x:Static strings:AppResources.EditorProceedHint}"
+                                SemanticProperties.Description="{x:Static strings:AppResources.EditorProceedButtonDescription}" />
                     </StackLayout>
                 </StackLayout>
             </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/QuestionDetailPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/QuestionDetailPage.xaml
index f317d98b..cd0d82a8 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/QuestionDetailPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/QuestionDetailPage.xaml
@@ -11,15 +11,15 @@
              xmlns:controls="clr-namespace:RightToAskClient.Maui.Views.Controls;assembly=RightToAskClient.Maui"
              xmlns:system="clr-namespace:System;assembly=netstandard"
              x:Class="RightToAskClient.Maui.Views.QuestionDetailPage"
-            
+              xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:DataType="vm:QuestionViewModel">
 	<ContentPage.ToolbarItems>
-		<ToolbarItem Text="{StaticResource HomeButtonText}" Command="{Binding HomeButtonCommand}"
+		<ToolbarItem Text="{x:Static strings:AppResources.HomeButtonText}" Command="{Binding HomeButtonCommand}"
 		             x:DataType="vm:BaseViewModel"
-		             IconImageSource="{helpers:ImageResource RightToAskClient.Images.home4.png}" />
-		<ToolbarItem Text="{StaticResource InfoPopupButtonText}" Command="{Binding InfoPopupCommand}"
+		             IconImageSource="home4.png" />
+		<ToolbarItem Text="{x:Static strings:AppResources.InfoPopupButtonText}" Command="{Binding InfoPopupCommand}"
 		             x:DataType="vm:BaseViewModel"
-		             IconImageSource="{helpers:ImageResource RightToAskClient.Images.help_75.png}" />
+		             IconImageSource="help_75.png" />
 	</ContentPage.ToolbarItems>
 	<ContentPage.Content>
 		<ScrollView>
@@ -38,17 +38,17 @@
 						                                  HorizontalOptions="Start"
 						                                  AutomationProperties.IsInAccessibleTree="True"
 						                                  AutomationProperties.Name="{StaticResource QuestionFrameThumbsUpAccessibilityName}"
-						                                  AutomationProperties.HelpText="{StaticResource QuestionFrameThumbsUpAccessibilityText}">
+						                                  AutomationProperties.HelpText="{x:Static strings:AppResources.QuestionFrameThumbsUpAccessibilityText}">
 							<VisualStateManager.VisualStateGroups>
 								<VisualStateGroup Name="BrightenedStates">
 									<VisualState Name="NotBrightened">
 										<VisualState.Setters>
-											<Setter Property="Source" Value="{AppThemeBinding Light={helpers:ImageResource RightToAskClient.Images.thumb_up_light.png}, Dark={helpers:ImageResource RightToAskClient.Images.thumb_up_dark.png} }"/>
+											<Setter Property="Source" Value="{AppThemeBinding Light=thumb_up_light.png, Dark=thumb_up_dark.png }"/>
 										</VisualState.Setters>
 									</VisualState>
 									<VisualState Name="Brightened">
 										<VisualState.Setters>
-											<Setter Property="Source" Value="{helpers:ImageResource RightToAskClient.Images.thumb_up_filled.png}"/>
+											<Setter Property="Source" Value="thumb_up_filled.png"/>
 										</VisualState.Setters>
 									</VisualState>
 								</VisualStateGroup>
@@ -62,17 +62,17 @@
 	                             HorizontalOptions="Start"
 	                             HeightRequest="{x:OnPlatform Android=27, iOS=44}"
 	                             AutomationProperties.IsInAccessibleTree="True" AutomationProperties.Name="{StaticResource QuestionFrameThumbsDownAccessibilityName}"
-	                             AutomationProperties.HelpText="{StaticResource QuestionFrameThumbsDownAccessibilityText}">
+	                             AutomationProperties.HelpText="{x:Static strings:AppResources.QuestionFrameThumbsDownAccessibilityText}">
 		                    <VisualStateManager.VisualStateGroups>
 			                    <VisualStateGroup Name="BrightenedStates">
 				                    <VisualState Name="NotBrightened">
 					                    <VisualState.Setters>
-						                    <Setter Property="Source" Value="{AppThemeBinding Light={helpers:ImageResource RightToAskClient.Images.thumb_down_light.png}, Dark={helpers:ImageResource RightToAskClient.Images.thumb_down_dark.png} }"/>
+						                    <Setter Property="Source" Value="{AppThemeBinding Light=thumb_down_light.png, Dark=Images.thumb_down_dark.png}"/>
 					                    </VisualState.Setters>
 				                    </VisualState>
 				                    <VisualState Name="Brightened">
 					                    <VisualState.Setters>
-						                    <Setter Property="Source" Value="{helpers:ImageResource RightToAskClient.Images.thumb_down_filled.png}"/>
+						                    <Setter Property="Source" Value="thumb_down_filled.png"/>
 					                    </VisualState.Setters>
 				                    </VisualState>
 			                    </VisualStateGroup>
@@ -90,28 +90,28 @@
 						                                  BackgroundColor="Transparent"
 						                                  AutomationProperties.IsInAccessibleTree="True"
 						                                  AutomationProperties.Name="{StaticResource QuestionFrameFlagButtonAccessibilityName}"
-						                                  AutomationProperties.HelpText="{StaticResource QuestionFrameFlagButtonAccessibilityTextRed}" >
+						                                  AutomationProperties.HelpText="{x:Static strings:AppResources.QuestionFrameFlagButtonAccessibilityTextRed}" >
 							<VisualStateManager.VisualStateGroups>
 								<VisualStateGroup Name="BrightenedStates">
 									<VisualState Name="NotBrightened">
 										<VisualState.Setters>
-											<Setter Property="Source" Value="{AppThemeBinding Light={helpers:ImageResource RightToAskClient.Images.flags_light.png}, Dark={helpers:ImageResource RightToAskClient.Images.flags_dark.png} }"/>
+											<Setter Property="Source" Value="{AppThemeBinding Light=flags_light.png, Dark=Images.flags_dark.png }"/>
 										</VisualState.Setters>
 									</VisualState>
 									<VisualState Name="Brightened">
 										<VisualState.Setters>
-											<Setter Property="Source" Value="{AppThemeBinding Light={helpers:ImageResource RightToAskClient.Images.flags_filled_light.png}, Dark={helpers:ImageResource RightToAskClient.Images.flags_filled_dark.png} }"/>
+											<Setter Property="Source" Value="{AppThemeBinding Light=flags_filled_light.png, Dark=Images.flags_filled_dark.png }"/>
 										</VisualState.Setters>
 									</VisualState>
 								</VisualStateGroup>
 							</VisualStateManager.VisualStateGroups>
 						</controls:ColorSingleToggleButton>
-						<Label Text="{StaticResource ReportDisplayCardButtonText}" Style="{StaticResource QuestionButtonText}" TextColor="{AppThemeBinding Light={StaticResource TextColorGray}, Dark=White}"/>
+						<Label Text="{x:Static strings:AppResources.ReportDisplayCardButtonText}" Style="{StaticResource QuestionButtonText}" TextColor="{AppThemeBinding Light={StaticResource TextColorGray}, Dark=White}"/>
 					</StackLayout>
 					
 				</FlexLayout>
 				<!-- Answers, visible if there are any -->
-				<Label x:Name="AnswerLabel" Text="{StaticResource AnswerHeaderText}" Style="{StaticResource Header2}" />
+				<Label x:Name="AnswerLabel" Text="{x:Static strings:AppResources.AnswerHeaderText}" Style="{StaticResource Header2}" />
 				<StackLayout x:Name="ExistingAnswers"
 				             BindableLayout.ItemsSource="{Binding QuestionAnswers}">
 					<BindableLayout.ItemTemplate >
@@ -123,10 +123,10 @@
 				
 				<Editor x:Name="AnswerEditor" Placeholder="{StaticResource AnswerPlaceholderText}"
 				        Style="{StaticResource NormalEditor}" Completed="Answer_Entered" />
-				<Label Text="{StaticResource WhoShouldAnswerTitle}" Style="{StaticResource Header2}" />
+				<Label Text="{x:Static strings:AppResources.WhoShouldAnswerTitle}" Style="{StaticResource Header2}" />
 				<Label Text="{Binding QuestionAnswerers, StringFormat='{0:F0}'}" Style="{StaticResource LeftMedium}" />
 				<StackLayout x:Name="AnswerPermissionCheckbox" Orientation="Horizontal">
-					<Label Text="{StaticResource AnswererPermissions}" Style="{StaticResource Header2}" />
+					<Label Text="{x:Static strings:AppResources.AnswererPermissions}" Style="{StaticResource Header2}" />
 					<CheckBox x:Name="AnswerCheckBox" 
 					          IsChecked="{Binding OthersCanAddQuestionAnswerers}" 
 					          Style="{StaticResource CheckBoxStyle}"
@@ -135,11 +135,11 @@
 				<!--Question Askers/Option B things-->
 				<StackLayout x:Name="RaiseLayout" IsVisible="{Binding IsRaiseLayoutVisible}">
 					<!-- who should raise it -->
-					<Label Text="{StaticResource OptionBText4}" Style="{StaticResource Header2}" />
+					<Label Text="{x:Static strings:AppResources.OptionBText4}" Style="{StaticResource Header2}" />
 					<Label Text="{Binding QuestionAskers, StringFormat='{0:F0}'}" Style="{StaticResource LeftMedium}" />
 					<!-- Ask the user whether they allow other users to add QuestionAskers. (Y/N) -->
 					<StackLayout x:Name="AskerPermissionCheckbox" Orientation="Horizontal">
-						<Label Text="{StaticResource AskerPermissions}" Style="{StaticResource Header2}" />
+						<Label Text="{x:Static strings:AppResources.AskerPermissions}" Style="{StaticResource Header2}" />
 						<CheckBox x:Name="RaiseCheckBox" 
 						          IsChecked="{Binding OthersCanAddQuestionAskers}"  
 						          Style="{StaticResource CheckBoxStyle}"
@@ -152,7 +152,7 @@
 						<TapGestureRecognizer Command="{Binding QuestionSuggesterCommand}" />
 					</StackLayout.GestureRecognizers>
 					<StackLayout Orientation="Vertical">
-						<Label Text="{StaticResource QuestionWriterHeaderText}" Style="{StaticResource Header2}" />
+						<Label Text="{x:Static strings:AppResources.QuestionWriterHeaderText}" Style="{StaticResource Header2}" />
 						<Label x:Name="WriterNameLabel" Text="{Binding Question.QuestionSuggester, StringFormat='{0:F0}'}"
 						       Style="{StaticResource NormalText}" Margin="0, 10, 0, 0"
 						       IsEnabled="{Binding IsNewQuestion, Converter={StaticResource Key=cnvInvert}}" />
@@ -161,7 +161,7 @@
 				<!-- Background -->
 				<!-- At most one editor is visible at once - this visibility is set in the code-behind. -->
 				<StackLayout Orientation="Vertical">
-					<Label x:Name="BackgroundLabel" Text="{StaticResource BackgroundPageTitle}" Style="{StaticResource Header2}" />
+					<Label x:Name="BackgroundLabel" Text="{x:Static strings:AppResources.BackgroundPageTitle}" Style="{StaticResource Header2}" />
 					<!-- Editor for new questions, and for read-only of questions that already have background. -->
 					<Editor x:Name="BackgroundEditor" Placeholder="{StaticResource AddBackgroundPlaceholderText}"
 					        Text="{Binding Background}"
@@ -173,7 +173,7 @@
 				</StackLayout>
 				<!-- Hansard link -->
 			    <StackLayout Orientation="Vertical" IsVisible="{Binding IsNewQuestion, Converter={StaticResource Key=cnvInvert}}">
-				    <Label Text="{StaticResource LinkForAnswerHeaderText}" Style="{StaticResource Header2}"/>
+				    <Label Text="{x:Static strings:AppResources.LinkForAnswerHeaderText}" Style="{StaticResource Header2}"/>
 				    <StackLayout BindableLayout.ItemsSource="{Binding HansardLinks}">
 					    <BindableLayout.ItemTemplate>
 						    <DataTemplate>
@@ -191,19 +191,19 @@
 				<Label x:Name="ReportLabel" Text="{Binding ReportLabelText}" Style="{StaticResource ReportLabel}"/>
 			    </StackLayout>
 				<StackLayout Margin="0,8">
-				    <Button Text="{StaticResource EditQuestionButtonText}" 
+				    <Button Text="{x:Static strings:AppResources.EditQuestionButtonText}" 
 				            Style="{StaticResource NormalButton}"
 				            Command="{Binding EditAnswerCommand}" 
 				            IsEnabled="{Binding HasUpdates}"
 							IsVisible="{Binding IsNewQuestion, Converter={StaticResource Key=cnvInvert}}"
-							SemanticProperties.Hint="{StaticResource EditQuestionButtonHint}"
-				            SemanticProperties.Description="{StaticResource EditQuestionButtonText}"/>
-				    <Button Text="{StaticResource PublishQuestionButtonText}" 
+							SemanticProperties.Hint="{x:Static strings:AppResources.EditQuestionButtonHint}"
+				            SemanticProperties.Description="{x:Static strings:AppResources.EditQuestionButtonText}"/>
+				    <Button Text="{x:Static strings:AppResources.PublishQuestionButtonText}" 
 				            Style="{StaticResource NormalButton}"
 				            Command="{Binding SaveQuestionCommand}" 
 				            IsVisible="{Binding IsNewQuestion}" 
-				            SemanticProperties.Hint="{StaticResource PublishQuestionButtonText}"
-				            SemanticProperties.Description="{StaticResource PublishQuestionButtonText}"/>
+				            SemanticProperties.Hint="{x:Static strings:AppResources.PublishQuestionButtonText}"
+				            SemanticProperties.Description="{x:Static strings:AppResources.PublishQuestionButtonText}"/>
 				</StackLayout>
 			</StackLayout>
 	    </ScrollView>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/QuestionDisplayCard.xaml b/RightToAskClient/RightToAskClient.Maui/Views/QuestionDisplayCard.xaml
index 214a1acd..2845b957 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/QuestionDisplayCard.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/QuestionDisplayCard.xaml
@@ -7,7 +7,7 @@
              xmlns:viewModels="clr-namespace:RightToAskClient.Maui.ViewModels;assembly=RightToAskClient.Maui"
              xmlns:controls="clr-namespace:RightToAskClient.Maui.Views.Controls;assembly=RightToAskClient.Maui"
              x:Class="RightToAskClient.Maui.Views.QuestionDisplayCard"
-            
+              xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:DataType="viewModels:QuestionDisplayCardViewModel">
     <ContentView.Content>
         <!-- <StackLayout> -->
@@ -48,19 +48,19 @@
                                 HorizontalOptions="Start"
                                 AutomationProperties.IsInAccessibleTree="True"
                                 AutomationProperties.Name="{StaticResource QuestionFrameThumbsUpAccessibilityName}"
-                                AutomationProperties.HelpText="{StaticResource QuestionFrameThumbsUpAccessibilityText}">
+                                AutomationProperties.HelpText="{x:Static strings:AppResources.QuestionFrameThumbsUpAccessibilityText}">
                                 <VisualStateManager.VisualStateGroups>
                                     <VisualStateGroup Name="BrightenedStates">
                                         <VisualState Name="NotBrightened">
                                             <VisualState.Setters>
                                                 <Setter Property="Source"
-                                                        Value="{AppThemeBinding Light={helpers:ImageResource RightToAskClient.Images.thumb_up_light.png}, Dark={helpers:ImageResource RightToAskClient.Images.thumb_up_dark.png} }" />
+                                                        Value="{AppThemeBinding Light=thumb_up_light.png, Dark=Images.thumb_up_dark.png }" />
                                             </VisualState.Setters>
                                         </VisualState>
                                         <VisualState Name="Brightened">
                                             <VisualState.Setters>
                                                 <Setter Property="Source"
-                                                        Value="{helpers:ImageResource RightToAskClient.Images.thumb_up_filled.png}" />
+                                                        Value="thumb_up_filled.png" />
                                             </VisualState.Setters>
                                         </VisualState>
                                     </VisualStateGroup>
@@ -78,19 +78,19 @@
                                 IsBrightened="{Binding Question.AlreadyDownvoted}"
                                 AutomationProperties.IsInAccessibleTree="True"
                                 AutomationProperties.Name="{StaticResource QuestionFrameThumbsDownAccessibilityName}"
-                                AutomationProperties.HelpText="{StaticResource QuestionFrameThumbsDownAccessibilityText}">
+                                AutomationProperties.HelpText="{x:Static strings:AppResources.QuestionFrameThumbsDownAccessibilityText}">
                                 <VisualStateManager.VisualStateGroups>
                                     <VisualStateGroup Name="BrightenedStates">
                                         <VisualState Name="NotBrightened">
                                             <VisualState.Setters>
                                                 <Setter Property="Source"
-                                                        Value="{AppThemeBinding Light={helpers:ImageResource RightToAskClient.Images.thumb_down_light.png}, Dark={helpers:ImageResource RightToAskClient.Images.thumb_down_dark.png} }" />
+                                                        Value="{AppThemeBinding Light=thumb_down_light.png, Dark=Images.thumb_down_dark.png }" />
                                             </VisualState.Setters>
                                         </VisualState>
                                         <VisualState Name="Brightened">
                                             <VisualState.Setters>
                                                 <Setter Property="Source"
-                                                        Value="{helpers:ImageResource RightToAskClient.Images.thumb_down_filled.png}" />
+                                                        Value="thumb_down_filled.png" />
                                             </VisualState.Setters>
                                         </VisualState>
                                     </VisualStateGroup>
@@ -101,35 +101,35 @@
                                    Margin="0"
                                    Padding="0"
                                    TextColor="{AppThemeBinding Light={StaticResource TextColorGray}, Dark=White}" />
-                            <!-- <Label Text="{StaticResource UpvoteDisplayCardButtonText}" -->
+                            <!-- <Label Text="{x:Static strings:AppResources.UpvoteDisplayCardButtonText}" -->
                             <!--        Style="{StaticResource QuestionButtonText}"  -->
                             <!--        TextColor="{AppThemeBinding Light={StaticResource TextColorGray}, Dark=White}"/> -->
                         </StackLayout>
                         <!--Share Button-->
                         <!-- TODO: Commented until better times
                         <StackLayout Orientation="Horizontal" Grid.Row="2" Grid.Column="1">
-                            <ImageButton Source="{helpers:ImageResource RightToAskClient.Images.share_48.png}"
+                            <ImageButton Source="share_48.png"
                                          Padding="5" Command="{Binding ShareCommand}" BackgroundColor="Transparent"
                                          xct:IconTintColorEffect.TintColor="Gray"
                                          AutomationProperties.IsInAccessibleTree="True"
                                          AutomationProperties.Name="{StaticResource QuestionFrameShareButtonAccessibilityName}"
-                                         AutomationProperties.HelpText="{StaticResource QuestionFrameShareButtonAccessibilityText}" />
+                                         AutomationProperties.HelpText="{x:Static strings:AppResources.QuestionFrameShareButtonAccessibilityText}" />
                             <Label Text="Share" Style="{StaticResource QuestionButtonText}" />
                         </StackLayout>
                         -->
                         <!--Answer/Has an Answer Buttons-->
                         <!-- TODO: We will still need a 'has answer' indicator and a 'write an answer' button (for MPs), but do UI design first.
                     <StackLayout Orientation="Horizontal" Grid.Row="2" Grid.Column="2">
-                        <ImageButton Source="{helpers:ImageResource RightToAskClient.Images.account_balance_48.png}" 
+                        <ImageButton Source="account_balance_48.png" 
                                  Padding="5" BackgroundColor="Transparent" IsVisible="{Binding Question.HasAnswer, Converter={StaticResource Key=cnvInvert}}"
                                  xct:IconTintColorEffect.TintColor="Gray"
                                  AutomationProperties.IsInAccessibleTree="True" AutomationProperties.Name="{StaticResource QuestionFrameAnswerButtonAccessibilityName}"
-                                 AutomationProperties.HelpText="{StaticResource QuestionFrameAnswerButtonAccessibilityText}"/>
-                        <ImageButton Source="{helpers:ImageResource RightToAskClient.Images.assured_workload_48.png}" 
+                                 AutomationProperties.HelpText="{x:Static strings:AppResources.QuestionFrameAnswerButtonAccessibilityText}"/>
+                        <ImageButton Source="assured_workload_48.png" 
                                  Padding="5" BackgroundColor="Transparent" IsVisible="{Binding Question.HasAnswer}"
                                  xct:IconTintColorEffect.TintColor="{StaticResource ButtonColor}"
                                  AutomationProperties.IsInAccessibleTree="True" AutomationProperties.Name="{StaticResource QuestionFrameShareButtonAccessibilityName}"
-                                 AutomationProperties.HelpText="{StaticResource QuestionFrameAnswerButtonAccessibilityText}"/>
+                                 AutomationProperties.HelpText="{x:Static strings:AppResources.QuestionFrameAnswerButtonAccessibilityText}"/>
                         <Label Text="Answer" Style="{StaticResource QuestionButtonText}"/>
                     </StackLayout>
                     -->
@@ -137,15 +137,15 @@
                         <StackLayout Orientation="Horizontal">
 
                             <ImageButton
-                                Source="{AppThemeBinding Light={helpers:ImageResource RightToAskClient.Images.flags_light.png}, Dark={helpers:ImageResource RightToAskClient.Images.flags_dark.png} }"
+                                Source="{AppThemeBinding Light=flags_light.png, Dark=Images.flags_dark.png }"
                                 Padding="5"
                                 HeightRequest="{x:OnPlatform Android=27, iOS=44}"
                                 Command="{Binding ReportCommand}"
                                 BackgroundColor="Transparent"
                                 AutomationProperties.IsInAccessibleTree="True"
                                 AutomationProperties.Name="{StaticResource QuestionFrameFlagButtonAccessibilityName}"
-                                AutomationProperties.HelpText="{StaticResource QuestionFrameFlagButtonAccessibilityTextRed}" />
-                            <Label Text="{StaticResource ReportDisplayCardButtonText}"
+                                AutomationProperties.HelpText="{x:Static strings:AppResources.QuestionFrameFlagButtonAccessibilityTextRed}" />
+                            <Label Text="{x:Static strings:AppResources.ReportDisplayCardButtonText}"
                                    Style="{StaticResource QuestionButtonText}"
                                    TextColor="{AppThemeBinding Light={StaticResource TextColorGray}, Dark=White}" />
                         </StackLayout>
@@ -163,16 +163,16 @@
                              VerticalOptions="CenterAndExpand"
                              HorizontalOptions="CenterAndExpand"
                              Padding="16">
-                    <Image Source="{helpers:ImageResource RightToAskClient.Images.visibility_off.png}"
+                    <Image Source="visibility_off.png"
                            WidthRequest="24"
                            HorizontalOptions="CenterAndExpand"
                            VerticalOptions="Center" />
-                    <Label Text="{StaticResource DisplayCardHiddenQuestionTitle}"
+                    <Label Text="{x:Static strings:AppResources.DisplayCardHiddenQuestionTitle}"
                            FontAttributes="Bold"
                            FontSize="16"
                            HorizontalOptions="CenterAndExpand"
                            VerticalOptions="Center" />
-                    <Label Text="{StaticResource DisplayCardHiddenQuestionBody}"
+                    <Label Text="{x:Static strings:AppResources.DisplayCardHiddenQuestionBody}"
                            FontSize="14"
                            HorizontalOptions="CenterAndExpand"
                            VerticalOptions="Center" />
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/ReadingPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/ReadingPage.xaml
index 731db4e5..b0b23e68 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/ReadingPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/ReadingPage.xaml
@@ -8,18 +8,18 @@
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
              xmlns:controls="clr-namespace:RightToAskClient.Maui.Views.Controls;assembly=RightToAskClient.Maui"
              x:Class="RightToAskClient.Maui.Views.ReadingPage"
-             
+             xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:Name="ReadingPageName"
              Shell.FlyoutBehavior="Flyout"
              Title="{Binding Title}"
              x:DataType="vm:ReadingPageViewModel">
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{StaticResource SearchButtonText}"
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.search_75.png}"
+        <ToolbarItem Text="{x:Static strings:AppResources.SearchButtonText}"
+                     IconImageSource="search_75.png"
                      Clicked="MenuItem_OnClicked" />
-        <ToolbarItem Text="{StaticResource InfoPopupButtonText}"
+        <ToolbarItem Text="{x:Static strings:AppResources.InfoPopupButtonText}"
                      Command="{Binding InfoPopupCommand}" x:DataType="vm:BaseViewModel"
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.help_75.png}" />
+                     IconImageSource="help_75.png" />
     </ContentPage.ToolbarItems>
     <ContentPage.BindingContext>
         <vm:ReadingPageViewModel />
@@ -73,13 +73,13 @@
                                     Grid.Row="0"
                                     Grid.Column="0">
                                     <ImageButton
-                                        Source="{helpers:ImageResource RightToAskClient.Images.Search_Gray.png}"
+                                        Source="search_gray.png"
                                         Style="{StaticResource SearchIcon}"
                                         
-                                        SemanticProperties.Hint="{StaticResource SearchButtonText}"
-                                        SemanticProperties.Description="{StaticResource SearchButtonText}" />
+                                        SemanticProperties.Hint="{x:Static strings:AppResources.SearchButtonText}"
+                                        SemanticProperties.Description="{x:Static strings:AppResources.SearchButtonText}" />
                                 </StackLayout>
-                                <controls:BorderlessEntry Placeholder="{StaticResource SearchBarPlaceholderText}"
+                                <controls:BorderlessEntry Placeholder="{x:Static strings:AppResources.SearchBarPlaceholderText}"
                                                           Text="{Binding Keyword}"
                                                           VerticalOptions="FillAndExpand"
                                                           HorizontalOptions="FillAndExpand"
@@ -90,7 +90,7 @@
                                                           MaxLength="280"
                                                           Completed="KeywordEntry_OnCompleted"
                                                           TextChanged="KeywordEntry_OnTextChanged"
-                                                          SemanticProperties.Hint="{StaticResource DraftQuestionPlaceholderText}"
+                                                          SemanticProperties.Hint="{x:Static strings:AppResources.DraftQuestionPlaceholderText}"
                                                           Margin="0"
                                                           Grid.Row="0"
                                                           Grid.Column="1" />
@@ -100,11 +100,11 @@
                                     HorizontalOptions="Center"
                                     Grid.Row="0"
                                     Grid.Column="2">
-                                    <ImageButton Source="{helpers:ImageResource RightToAskClient.Images.close.png}"
+                                    <ImageButton Source="close.png"
                                                  Style="{StaticResource ClearButtonGreen}"
                                                  
-                                                 SemanticProperties.Hint="{StaticResource ClearButtonHint}"
-                                                 SemanticProperties.Description="{StaticResource ClearButtonDescription}"
+                                                 SemanticProperties.Hint="{x:Static strings:AppResources.ClearButtonHint}"
+                                                 SemanticProperties.Description="{x:Static strings:AppResources.ClearButtonDescription}"
                                                  Clicked="ClearButton_OnClicked"
                                                  x:Name="ClearButton" />
                                 </StackLayout>
@@ -127,7 +127,7 @@
                                     HorizontalOptions="FillAndExpand"
                                     Grid.Row="0"
                                     Grid.Column="0">
-                                    <ImageButton Source="{helpers:ImageResource RightToAskClient.Images.filter_sliders_48.png}"
+                                    <ImageButton Source="filter_sliders_48.png"
                                         x:Name="FilterButton"
                                         Style="{StaticResource ClearButtonGreen}"
                                         
@@ -160,7 +160,7 @@
                                         <SwipeView VerticalOptions="FillAndExpand" BackgroundColor="Transparent">
                                             <SwipeView.RightItems>
                                                 <SwipeItem Text="Dismiss"
-                                                           IconImageSource="{helpers:ImageResource RightToAskClient.Images.trash_delete_48.png}"
+                                                           IconImageSource="trash_delete_48.png"
                                                            BackgroundColor="{StaticResource AlertColor}"
                                                            Command="{Binding Path=BindingContext.RemoveQuestionCommand, Source={x:Reference ReadingPageName}}"
                                                            CommandParameter="{Binding .}" />
@@ -174,7 +174,7 @@
                                                  Padding="0, 100 ,0 ,0">
                                         <Image Source="{Binding ListEmptyViewIcon}"
                                                Style="{StaticResource ListErrorIcon}"/>
-                                        <Label Text="{Binding EmptyViewLabelText}"
+                                        <Label Text="{x:Static strings:AppResources.EmptyFieldMessage}"
                                                Style="{StaticResource ListErrorText}"
                                                VerticalOptions="Start" />
                                     </StackLayout>
@@ -188,16 +188,16 @@
                              VerticalOptions="End"
                              HorizontalOptions="End"
                              Margin="10"
-                             Source="{helpers:ImageResource RightToAskClient.Images.edit.png}"
-                             WidthRequest="70"
-                             HeightRequest="70"
-                             CornerRadius="35"
+                             Source="edit.png"
+                             WidthRequest="110"
+                             HeightRequest="110"
+                             CornerRadius="30"
                              Padding="20"
                              Aspect="AspectFit"
                              BackgroundColor="{StaticResource Purple}"
                              Command="{Binding DraftCommand}"
-                             SemanticProperties.Hint="{StaticResource ReadingPageWriteHint}"
-                             SemanticProperties.Description="{StaticResource ReadingPageWriteDescription}" />
+                             SemanticProperties.Hint="{x:Static strings:AppResources.ReadingPageWriteHint}"
+                             SemanticProperties.Description="{x:Static strings:AppResources.ReadingPageWriteDescription}" />
             </Grid>
         </StackLayout>
     </ContentPage.Content>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/RegisterAccountPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/RegisterAccountPage.xaml
index d7286227..5d821238 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/RegisterAccountPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/RegisterAccountPage.xaml
@@ -9,11 +9,11 @@
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
              xmlns:controls="clr-namespace:RightToAskClient.Maui.Views.Controls;assembly=RightToAskClient.Maui"
              x:Class="RightToAskClient.Maui.Views.RegisterAccountPage"
-            
+              xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:DataType="vm:RegistrationViewModel"
              Title="{Binding Title}">
     <Shell.TitleView>
-        <Image Source="{helpers:ImageResource error.png}"
+        <Image Source="error.png"
                HorizontalOptions="Center"
                VerticalOptions="Start" />
     </Shell.TitleView>
@@ -27,7 +27,7 @@
                      HorizontalOptions="Fill">
             <ScrollView VerticalOptions="FillAndExpand" Padding="16">
                 <StackLayout Orientation="Vertical">
-                    <Label Text="{StaticResource AccountTitle}"
+                    <Label Text="{x:Static strings:AppResources.AccountTitle}"
                            Style="{StaticResource RegistrationTitle}"
                            controls:Accessibility.AccessibilityTraits="Header">
                     </Label>
@@ -36,7 +36,7 @@
                         <StackLayout Orientation="Vertical"
                                      Spacing="0">
                             <Label x:Name="NameLabel"
-                                   Text="{StaticResource DisplayNameHeaderText}"
+                                   Text="{x:Static strings:AppResources.DisplayNameHeaderText}"
                                    Style="{StaticResource SmallGreyHeader}"
                                    IsVisible="{Binding DisplayName.Length}" />
                             <controls:BorderlessEntry
@@ -52,10 +52,10 @@
                                 Style="{StaticResource EntryBorder}" />
                         </StackLayout>
                     </ContentView>
-                    <Label Text="{StaticResource NamePrivacyNote}"
+                    <Label Text="{x:Static strings:AppResources.NamePrivacyNote}"
                            Style="{StaticResource TextFieldDescription}" />
                     <StackLayout Orientation="Horizontal" IsVisible="{Binding NameLabelText.Length}">
-                        <Image Source="{helpers:ImageResource RightToAskClient.Images.error.png}"
+                        <Image Source="error.png"
                                
                                WidthRequest="13"
                                HeightRequest="13"
@@ -73,7 +73,7 @@
                                      Spacing="0"
                                      Margin="0,16,0,0">
                             <Label x:Name="UsernameLabel"
-                                   Text="{StaticResource UserNameHeaderText}"
+                                   Text="{x:Static strings:AppResources.UserNameHeaderText}"
                                    Style="{StaticResource SmallGreyHeader}"
                                    IsVisible="{Binding UserId.Length}" />
                             <controls:BorderlessEntry
@@ -89,9 +89,9 @@
                                 Style="{StaticResource EntryBorder}" />
                         </StackLayout>
                     </ContentView>
-                    <Label Text="{StaticResource UsernamePrivacyNote}" Style="{StaticResource TextFieldDescription}" />
+                    <Label Text="{x:Static strings:AppResources.UsernamePrivacyNote}" Style="{StaticResource TextFieldDescription}" />
                     <StackLayout Orientation="Horizontal" IsVisible="{Binding ReportLabelText.Length}">
-                        <Image Source="{helpers:ImageResource RightToAskClient.Images.error.png}"
+                        <Image Source="error.png"
                                
                                WidthRequest="13"
                                HeightRequest="13"
@@ -110,10 +110,10 @@
                          HorizontalOptions="Fill"
                          Padding="16">
                 <Button x:Name="ContinueButton"
-                        Text="{StaticResource Continue}"
+                        Text="{x:Static strings:AppResources.Continue}"
                         Command="{Binding DoneButtonCommand}"
-                        SemanticProperties.Hint="{StaticResource ContinueButtonHint}"
-                        SemanticProperties.Description="{StaticResource ContinueButtonDescription}"
+                        SemanticProperties.Hint="{x:Static strings:AppResources.ContinueButtonHint}"
+                        SemanticProperties.Description="{x:Static strings:AppResources.ContinueButtonDescription}"
                         Margin="0,0,0,16"
                         Style="{StaticResource NormalButton}"
                         CornerRadius="5"
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/ReportQuestionPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/ReportQuestionPage.xaml
index c9f6b071..893f41ff 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/ReportQuestionPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/ReportQuestionPage.xaml
@@ -10,7 +10,7 @@
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
              Title="Report Question"
              x:Class="RightToAskClient.Maui.Views.ReportQuestionPage"
-             
+               xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:DataType="vm:ReportQuestionViewModel"
              Style="{StaticResource SubPage}"
              ios:Page.UseSafeArea="true">
@@ -77,8 +77,8 @@
 
     <Shell.BackButtonBehavior>
         <BackButtonBehavior Command="{Binding BackCommand}"
-                            SemanticProperties.Hint="{StaticResource BackHint}"
-                            SemanticProperties.Description="{StaticResource BackDescription}" />
+                            SemanticProperties.Hint="{x:Static strings:AppResources.BackHint}"
+                            SemanticProperties.Description="{x:Static strings:AppResources.BackDescription}" />
     </Shell.BackButtonBehavior>
     <ContentPage.BindingContext>
         <vm:ReportQuestionViewModel />
@@ -135,10 +135,10 @@
                          VerticalOptions="End"
                          HorizontalOptions="Fill"
                          Padding="10">
-                <Button Text="{StaticResource ReportSubmit}"
+                <Button Text="{x:Static strings:AppResources.ReportSubmit}"
                         Command="{Binding ReportCommand}"
-                        SemanticProperties.Hint="{StaticResource ReportSubmitHint}"
-                        SemanticProperties.Description="{StaticResource ReportSubmit}"
+                        SemanticProperties.Hint="{x:Static strings:AppResources.ReportSubmitHint}"
+                        SemanticProperties.Description="{x:Static strings:AppResources.ReportSubmit}"
                         Style="{StaticResource NormalButton}"
                         CornerRadius="5"
                         IsEnabled="{Binding IsSelected}" />
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/SelectableListPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/SelectableListPage.xaml
index 3879e79f..086f480a 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/SelectableListPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/SelectableListPage.xaml
@@ -6,20 +6,20 @@
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
              xmlns:controls="clr-namespace:RightToAskClient.Maui.Views.Controls;assembly=RightToAskClient.Maui"
              x:Class="RightToAskClient.Maui.Views.SelectableListPage"
-            
+              xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:DataType="vm:SelectableListViewModel"
              Title="{Binding TitleText}">
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="{StaticResource SearchButtonText}" 
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.search_75.png}"
+        <ToolbarItem Text="{x:Static strings:AppResources.SearchButtonText}" 
+                     IconImageSource="search_75.png"
                      Clicked="MenuItem_OnClicked"/>
-        <ToolbarItem Text="{StaticResource HomeButtonText}" 
+        <ToolbarItem Text="{x:Static strings:AppResources.HomeButtonText}" 
                      Command="{Binding HomeButtonCommand}" 
                      x:DataType="vm:BaseViewModel"
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.home4.png}"/>
+                     IconImageSource="home4.png"/>
         <ToolbarItem Command="{Binding InfoPopupCommand}" 
                      x:DataType="vm:BaseViewModel"
-                     IconImageSource="{helpers:ImageResource RightToAskClient.Images.help_75.png}"/>
+                     IconImageSource="help_75.png"/>
     </ContentPage.ToolbarItems>
     <ContentPage.Content>
 		<StackLayout HorizontalOptions="Center" 
@@ -56,11 +56,11 @@
                             HorizontalOptions="Center"
                             Grid.Row="0"
                             Grid.Column="0">
-                            <ImageButton Source="{helpers:ImageResource RightToAskClient.Images.Search_Gray.png}"
+                            <ImageButton Source="Search_Gray.png"
                                          Style="{StaticResource SearchIcon}"
                                          CornerRadius="8"
-                                         SemanticProperties.Hint="{StaticResource SearchButtonText}"
-                                         SemanticProperties.Description="{StaticResource SearchButtonText}">
+                                         SemanticProperties.Hint="{x:Static strings:AppResources.SearchButtonText}"
+                                         SemanticProperties.Description="{x:Static strings:AppResources.SearchButtonText}">
                             </ImageButton>
                         </StackLayout>
                         <controls:BorderlessEntry Placeholder="{StaticResource SearchBarPlaceholderText}"
@@ -73,7 +73,7 @@
                                                   Keyboard="Chat"
                                                   MaxLength="280"
                                                   TextChanged="KeywordEntry_OnTextChanged"
-                                                  SemanticProperties.Hint="{StaticResource DraftQuestionPlaceholderText}"
+                                                  SemanticProperties.Hint="{x:Static strings:AppResources.DraftQuestionPlaceholderText}"
                                                   Margin="0"
                                                   Grid.Row="0"
                                                   Grid.Column="1">
@@ -84,11 +84,11 @@
                             HorizontalOptions="Center"
                             Grid.Row="0"
                             Grid.Column="2">
-                            <ImageButton Source="{helpers:ImageResource RightToAskClient.Images.close.png}"
+                            <ImageButton Source="close.png"
                                          Style="{StaticResource ClearButtonGreen}"
                                          CornerRadius="8"
-                                         SemanticProperties.Hint="{StaticResource ClearButtonHint}"
-                                         SemanticProperties.Description="{StaticResource ClearButtonDescription}"
+                                         SemanticProperties.Hint="{x:Static strings:AppResources.ClearButtonHint}"
+                                         SemanticProperties.Description="{x:Static strings:AppResources.ClearButtonDescription}"
                                          Clicked="ClearButton_OnClicked"
                                          x:Name="ClearButton">
                             </ImageButton>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/SharingElectorateInfoPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/SharingElectorateInfoPage.xaml
index 080a5de6..635d84b8 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/SharingElectorateInfoPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/SharingElectorateInfoPage.xaml
@@ -8,12 +8,12 @@
              xmlns:views="clr-namespace:RightToAskClient.Maui.Views;assembly=RightToAskClient.Maui"
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
              x:Class="RightToAskClient.Maui.Views.SharingElectorateInfoPage"
-            
+              xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:DataType="viewModels:SharingElectorateInfoViewModel">
     <Shell.BackButtonBehavior>
         <BackButtonBehavior Command="{Binding BackCommand}"
-                            SemanticProperties.Hint="{StaticResource BackHint}"
-                            SemanticProperties.Description="{StaticResource BackDescription}" />
+                            SemanticProperties.Hint="{x:Static strings:AppResources.BackHint}"
+                            SemanticProperties.Description="{x:Static strings:AppResources.BackDescription}" />
     </Shell.BackButtonBehavior>
     <ContentPage.Content>
         <StackLayout Orientation="Vertical"
@@ -24,11 +24,11 @@
                 <StackLayout Orientation="Vertical"
                              VerticalOptions="FillAndExpand"
                              HorizontalOptions="Fill">
-                    <Label Text="{StaticResource SharingElectorateInfoHeaderText}"
+                    <Label Text="{x:Static strings:AppResources.SharingElectorateInfoHeaderText}"
                            Style="{StaticResource SignUpTitle}"
                            Margin="0, 0, 0, 8"
                            HorizontalOptions="StartAndExpand" />
-                    <Label Text="{StaticResource SharingElectorateInfoParagraph}"
+                    <Label Text="{x:Static strings:AppResources.SharingElectorateInfoParagraph}"
                            Style="{StaticResource SignUpBody}"
                            HorizontalOptions="StartAndExpand" />
 
@@ -58,10 +58,10 @@
                          VerticalOptions="End"
                          HorizontalOptions="Fill"
                          Padding="16">
-                <Button Text="{StaticResource SaveAndFinish}"
+                <Button Text="{x:Static strings:AppResources.SaveAndFinish}"
                         Command="{Binding SaveAndFinishCommand}"
-                        SemanticProperties.Hint="{StaticResource SaveAndFinishHint}"
-                        SemanticProperties.Description="{StaticResource SaveAndFinish}"
+                        SemanticProperties.Hint="{x:Static strings:AppResources.SaveAndFinishHint}"
+                        SemanticProperties.Description="{x:Static strings:AppResources.SaveAndFinish}"
                         Style="{StaticResource NormalButton}"
                         IsEnabled="{Binding AbleToFinish}" />
             <Label Text="{Binding ReportLabelText}" Style="{StaticResource ErrorLabel}"
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/UserAccountInfoView.xaml b/RightToAskClient/RightToAskClient.Maui/Views/UserAccountInfoView.xaml
index a8927763..f04650b6 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/UserAccountInfoView.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/UserAccountInfoView.xaml
@@ -8,6 +8,7 @@
              xmlns:helpers="clr-namespace:RightToAskClient.Maui.Helpers;assembly=RightToAskClient.Maui"
              xmlns:views="clr-namespace:RightToAskClient.Maui.Views;assembly=RightToAskClient.Maui"
              x:Class="RightToAskClient.Maui.Views.UserAccountInfoView"
+               xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:DataType="vm:RegistrationViewModel">
     <ContentView.Content>
         <StackLayout Orientation="Vertical">
@@ -15,18 +16,18 @@
             <Grid ColumnDefinitions="3, Auto, *, Auto" IsVisible="{Binding IsUpdateErrorShown}"
                   Style="{StaticResource ErrorMessageBackgroundStyle}">
                 <BoxView Grid.Column="0" Color="{StaticResource ColorRed}" WidthRequest="3" VerticalOptions="FillAndExpand" Margin="0" />
-                <Image Grid.Column="1" Margin="16, 0" Source="{helpers:ImageResource RightToAskClient.Images.error_48.png}"
+                <Image Grid.Column="1" Margin="16, 0" Source="error_48.png"
                        BackgroundColor="{StaticResource ColorRed}" WidthRequest="24" HeightRequest="24"
                        VerticalOptions="Center" />
                 <Label Grid.Column="2" Text="{Binding ReportLabelText}" Padding="0, 12"
                        VerticalOptions="Center" TextColor="{AppThemeBinding Light=Black, Dark=White}" />
-                <ImageButton Grid.Column="3" Source="{ AppThemeBinding Light={helpers:ImageResource RightToAskClient.Images.close_button.png}, Dark={helpers:ImageResource RightToAskClient.Images.close_button_dark_48.png} }"
+                <ImageButton Grid.Column="3" Source="{ AppThemeBinding Light=close_button.png, Dark=Images.close_button_dark_48.png }"
                              Style="{StaticResource ClearButton}"
                              BackgroundColor="Transparent"
                              VerticalOptions="Start"
                              WidthRequest="24" HeightRequest="24"
-                             SemanticProperties.Hint="{StaticResource ClearButtonHint}"
-                             SemanticProperties.Description="{StaticResource ClearButtonDescription}"
+                             SemanticProperties.Hint="{x:Static strings:AppResources.ClearButtonHint}"
+                             SemanticProperties.Description="{x:Static strings:AppResources.ClearButtonDescription}"
                              Command="{Binding HideErrorLayoutCommand}" Margin="10" />
             </Grid>
 
@@ -35,19 +36,19 @@
                   Style="{StaticResource SuccessMessageBackgroundStyle}">
                 <BoxView Grid.Column="0" Color="Green" WidthRequest="3" VerticalOptions="FillAndExpand" Margin="0" />
                 <Image Grid.Column="1" Margin="16, 0"
-                       Source="{helpers:ImageResource RightToAskClient.Images.success_48.png}"
+                       Source="success_48.png"
                        BackgroundColor="Green" WidthRequest="24" HeightRequest="24"
                        VerticalOptions="Center" />
                 <Label Grid.Column="2" Text="{Binding ReportLabelText}" Padding="0, 12"
                        VerticalOptions="Center" TextColor="{AppThemeBinding Light=Black, Dark=White}" />
                 <ImageButton Grid.Column="3"
-                             Source="{ AppThemeBinding Light={helpers:ImageResource RightToAskClient.Images.close_button.png}, Dark={helpers:ImageResource RightToAskClient.Images.close_button_dark_48.png} }"
+                             Source="{ AppThemeBinding Light=close_button.png, Dark=Images.close_button_dark_48.png }"
                              Style="{StaticResource ClearButton}"
                              BackgroundColor="Transparent"
                              VerticalOptions="Start"
                              WidthRequest="24" HeightRequest="24"
-                             SemanticProperties.Hint="{StaticResource ClearButtonHint}"
-                             SemanticProperties.Description="{StaticResource ClearButtonDescription}"
+                             SemanticProperties.Hint="{x:Static strings:AppResources.ClearButtonHint}"
+                             SemanticProperties.Description="{x:Static strings:AppResources.ClearButtonDescription}"
                              Command="{Binding HideSuccessLayoutCommand}" Margin="10" />
             </Grid>
 
@@ -57,7 +58,7 @@
             <BoxView Style="{StaticResource ButtonSeparator}" IsVisible="{Binding IsVerifiedMPAccount}" />
 
             
-            <Label Text="{StaticResource UserNameHeaderText}"
+            <Label Text="{x:Static strings:AppResources.UserNameHeaderText}"
                    Style="{StaticResource SmallGreyHeader}" />
             <!-- Styled in code-behind according to whether this is permitted edits. -->
             <!-- username -->
@@ -67,7 +68,7 @@
             <BoxView Style="{StaticResource ButtonSeparator}" />
             <!-- name -->
             <Label
-                Text="{StaticResource DisplayNameHeaderText}"
+                Text="{x:Static strings:AppResources.DisplayNameHeaderText}"
                 Style="{StaticResource SmallGreyHeader}" />
             <controls:BorderlessEntry
                 Text="{Binding DisplayName}"
@@ -81,7 +82,7 @@
             <Button Text="{DynamicResource UpdateAccountButtonText}" Command="{Binding UpdateAccountButtonCommand}"
                     Style="{StaticResource OutlineButton}" HorizontalOptions="End"
                     IsVisible="{Binding IsMyAccount}" Margin="0,4,0,0"
-                    SemanticProperties.Hint="{StaticResource UpdateAccountButtonText}"
+                    SemanticProperties.Hint="{x:Static strings:AppResources.UpdateAccountButtonText}"
                     SemanticProperties.Description="{DynamicResource UpdateAccountButtonText}" />
 
             <!-- <Label Text="Verified staffer" IsVisible="{Binding IsVerifiedStafferAccount}" Style="{StaticResource NormalText}" /> -->
@@ -89,12 +90,12 @@
                         Margin="0,12,0,0">
                 <Label Text="{DynamicResource ElectoratesInfoHeaderText}"
                        Style="{StaticResource SmallGreyHeader}" VerticalOptions="Center" />
-                <ImageButton Source="{helpers:ImageResource RightToAskClient.Images.account_edit.png}"
+                <ImageButton Source="account_edit.png"
                              Command="{Binding EditElectoratesCommand}"
                              IsVisible="{Binding IsMyAccount}"
                              BackgroundColor="Transparent" WidthRequest="20" HeightRequest="20" HorizontalOptions="End"
-                             SemanticProperties.Hint="{StaticResource EditElectoratesButtonHint}"
-                             SemanticProperties.Description="{StaticResource EditElectoratesButtonDescription}"/>
+                             SemanticProperties.Hint="{x:Static strings:AppResources.EditElectoratesButtonHint}"
+                             SemanticProperties.Description="{x:Static strings:AppResources.EditElectoratesButtonDescription}"/>
             </FlexLayout>
             <BoxView Style="{StaticResource ButtonSeparator}" Margin="0" />
             <!-- The height request is a kludge because otherwise the CollectionView takes up all the rest of the page -->
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/WriteQuestionPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/WriteQuestionPage.xaml
index 1e5b2d56..f31f5478 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/WriteQuestionPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/WriteQuestionPage.xaml
@@ -13,13 +13,14 @@
              x:DataType="vm:WriteQuestionViewModel"
              xmlns:ios="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;assembly=Microsoft.Maui.Controls"
              ios:Page.UseSafeArea="true"
+               xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              SizeChanged="WriteQuestionPage_OnSizeChanged">
 
     <Shell.BackButtonBehavior>
         <BackButtonBehavior Command="{Binding BackCommand}"
-                            IconOverride="{helpers:ImageResource RightToAskClient.Images.close.png}"
-                            SemanticProperties.Hint="{StaticResource BackHint}"
-                            SemanticProperties.Description="{StaticResource BackDescription}" />
+                            IconOverride="close.png"
+                            SemanticProperties.Hint="{x:Static strings:AppResources.BackHint}"
+                            SemanticProperties.Description="{x:Static strings:AppResources.BackDescription}" />
     </Shell.BackButtonBehavior>
     <ContentPage.BindingContext>
         <vm:WriteQuestionViewModel />
@@ -39,7 +40,7 @@
                                              VerticalOptions="StartAndExpand"
                                              HorizontalOptions="FillAndExpand"
                                              IsVisible="{Binding ShowHeader}">
-                                    <Label Text="{StaticResource SimilarQuestionsInstructionText}"
+                                    <Label Text="{x:Static strings:AppResources.SimilarQuestionsInstructionText}"
                                            Style="{StaticResource BodyCopyLarge}"
                                            HorizontalOptions="FillAndExpand"
                                            VerticalOptions="FillAndExpand" />
@@ -101,8 +102,8 @@
                                                   Unfocused="KeywordEntry_FocusedChange"
                                                   TextChanged="KeywordEntry_OnTextChanged"
                                                   
-                                                  SemanticProperties.Hint="{StaticResource WriteQuestionEditorHint}"
-                                                  SemanticProperties.Description="{StaticResource WriteQuestionEditorDescription}"
+                                                  SemanticProperties.Hint="{x:Static strings:AppResources.WriteQuestionEditorHint}"
+                                                  SemanticProperties.Description="{x:Static strings:AppResources.WriteQuestionEditorDescription}"
                                                   Grid.Row="0"
                                                   Grid.Column="0"
                                                   Margin="0">
@@ -113,11 +114,11 @@
                             HorizontalOptions="Center"
                             Grid.Row="0"
                             Grid.Column="1">
-                            <ImageButton Source="{helpers:ImageResource RightToAskClient.Images.close.png}"
+                            <ImageButton Source="close.png"
                                          Style="{StaticResource ClearButton}"
                                          
-                                         SemanticProperties.Hint="{StaticResource ClearButtonHint}"
-                                         SemanticProperties.Description="{StaticResource ClearButtonDescription}"
+                                         SemanticProperties.Hint="{x:Static strings:AppResources.ClearButtonHint}"
+                                         SemanticProperties.Description="{x:Static strings:AppResources.ClearButtonDescription}"
                                          Clicked="ClearButton_OnClicked"
                                          x:Name="ClearButton">
                             </ImageButton>
@@ -128,8 +129,8 @@
                         <Button Text="Return home"
                                 Style="{StaticResource EditorProceed}"
                                 Command="{Binding BackCommand}"
-                                SemanticProperties.Hint="{StaticResource ReturnHomeHint}"
-                                SemanticProperties.Description="{StaticResource ReturnHomeButtonDescription}" />
+                                SemanticProperties.Hint="{x:Static strings:AppResources.ReturnHomeHint}"
+                                SemanticProperties.Description="{x:Static strings:AppResources.ReturnHomeButtonDescription}" />
 
                         <StackLayout Margin="0" HorizontalOptions="End" Orientation="Horizontal">
                             <Label Text="0/280"
@@ -145,8 +146,8 @@
                                     Padding="8, 0, 16, 0"
                                     Style="{StaticResource EditorProceed}"
                                     Command="{Binding ProceedButtonCommand}"
-                                    SemanticProperties.Hint="{StaticResource EditorProceedHint}"
-                                    SemanticProperties.Description="{StaticResource EditorProceedButtonDescription}" />
+                                    SemanticProperties.Hint="{x:Static strings:AppResources.EditorProceedHint}"
+                                    SemanticProperties.Description="{x:Static strings:AppResources.EditorProceedButtonDescription}" />
                         </StackLayout>
                     </FlexLayout>
                 </StackLayout>