From fffddc1ff78d9a0006bb72e0703ba641156005c8 Mon Sep 17 00:00:00 2001
From: Ben Harnett <ben.harnett@collabcare.com.au>
Date: Thu, 30 Nov 2023 16:27:47 +1100
Subject: [PATCH] refistration done

---
 .../RightToAskClient.Maui/App.xaml            |   3 +-
 .../RightToAskClient.Maui/MauiProgram.cs      |  10 +-
 .../RightToAskClient.Maui.csproj              |   2 +
 .../ViewModels/QuestionViewModel.cs           |   2 +-
 .../ViewModels/ReadingPageViewModel.cs        | 112 ++++----
 .../ViewModels/WriteQuestionViewModel.cs      |  12 +-
 .../Views/CodeOfConductPage.xaml              | 259 +++++++++++++++++-
 .../Views/CodeOfConductPage.xaml.cs           |  21 +-
 .../Views/FindMPsPage.xaml                    |  14 +-
 .../Views/Popups/TwoButtonPopup.xaml.cs       |  15 +-
 .../Views/QuestionDetailPage.xaml             |  15 +-
 .../Views/QuestionDisplayCard.xaml            |  18 +-
 .../Views/ReadingPage.xaml                    |  33 +--
 .../Views/ReadingPage.xaml.cs                 |  24 +-
 .../Views/RegisterAccountPage.xaml            |   8 +-
 15 files changed, 415 insertions(+), 133 deletions(-)

diff --git a/RightToAskClient/RightToAskClient.Maui/App.xaml b/RightToAskClient/RightToAskClient.Maui/App.xaml
index f0daee3e..65ba8c46 100644
--- a/RightToAskClient/RightToAskClient.Maui/App.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/App.xaml
@@ -29,7 +29,7 @@
             <!-- These are all the same light green -->
             <Color x:Key="FadedButtonColor">#dfdfdf</Color>
             <Color x:Key="SeparatorDarkModeColor">#363636</Color>
-            <Color x:Key="FrameColor">#dfdfdf</Color>
+            <Color x:Key="FrameColor">Transparent</Color>
 
             <!-- Second theme color -->
             <Color x:Key="DarkPurple">#600C82</Color>
@@ -382,6 +382,7 @@
                 <Setter Property="CornerRadius" Value="0" />
                 <Setter Property="Padding" Value="0" />
                 <Setter Property="HasShadow" Value="False" />
+                <Setter Property="BorderColor" Value="Transparent" />
             </Style>
             <Style x:Key="TransparentSwipeView" TargetType="SwipeView">
                 <Setter Property="BackgroundColor" Value="Transparent" />
diff --git a/RightToAskClient/RightToAskClient.Maui/MauiProgram.cs b/RightToAskClient/RightToAskClient.Maui/MauiProgram.cs
index e075a5eb..7208300a 100644
--- a/RightToAskClient/RightToAskClient.Maui/MauiProgram.cs
+++ b/RightToAskClient/RightToAskClient.Maui/MauiProgram.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Maui;
+using static RightToAskClient.Maui.Views.Controls.Accessibility;
 
 namespace RightToAskClient.Maui
 {
@@ -10,13 +11,18 @@ public static MauiApp CreateMauiApp()
             builder
                 .UseMauiApp<App>()
                 .UseMauiCommunityToolkit()
+                .ConfigureEffects(effects =>
+                {
+                    //effects.Add<>();
+                })
                 .ConfigureFonts(fonts =>
                 {
                     fonts.AddFont("DancingScript-VariableFont_wght.ttf", "DanceFont");
-                  //  fonts.AddFont("Roboto-Black.ttf", "AppFont");
+                    //  fonts.AddFont("Roboto-Black.ttf", "AppFont");
                 });
-
+         
             return builder.Build();
         }
+
     }
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/RightToAskClient.Maui.csproj b/RightToAskClient/RightToAskClient.Maui/RightToAskClient.Maui.csproj
index db3709e3..5c258ba6 100644
--- a/RightToAskClient/RightToAskClient.Maui/RightToAskClient.Maui.csproj
+++ b/RightToAskClient/RightToAskClient.Maui/RightToAskClient.Maui.csproj
@@ -323,4 +323,6 @@
 	  </MauiXaml>
 	</ItemGroup>
 
+	<ProjectExtensions><VisualStudio><UserProperties XamarinHotReloadDebuggerTimeoutExceptionRightToAskClientMauiHideInfoBar="True" /></VisualStudio></ProjectExtensions>
+
 </Project>
diff --git a/RightToAskClient/RightToAskClient.Maui/ViewModels/QuestionViewModel.cs b/RightToAskClient/RightToAskClient.Maui/ViewModels/QuestionViewModel.cs
index 885dea2a..77307e58 100644
--- a/RightToAskClient/RightToAskClient.Maui/ViewModels/QuestionViewModel.cs
+++ b/RightToAskClient/RightToAskClient.Maui/ViewModels/QuestionViewModel.cs
@@ -95,7 +95,7 @@ public bool IsRaiseLayoutVisible
         // Convenient views of things stored in the Question.
         public List<Answer> QuestionAnswers => Question.Answers;
         public List<Uri> HansardLinks => Question.HansardLink;
-
+       
         public string QuestionAnswerers =>
            Helpers.Extensions.JoinFilter(", ",
                    string.Join(", ", Question.Filters.SelectedAnsweringMPsNotMine.Select(mp => mp.ShortestName)),
diff --git a/RightToAskClient/RightToAskClient.Maui/ViewModels/ReadingPageViewModel.cs b/RightToAskClient/RightToAskClient.Maui/ViewModels/ReadingPageViewModel.cs
index 507c28d3..6a72aa47 100644
--- a/RightToAskClient/RightToAskClient.Maui/ViewModels/ReadingPageViewModel.cs
+++ b/RightToAskClient/RightToAskClient.Maui/ViewModels/ReadingPageViewModel.cs
@@ -17,25 +17,28 @@
 using Microsoft.Maui;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Maui.Views;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Windows.Input;
 
 namespace RightToAskClient.Maui.ViewModels
 {
-    public class ReadingPageViewModel: BaseViewModel
+    public class ReadingPageViewModel : BaseViewModel
     {
         public FilterChoices FilterChoices = new FilterChoices();
-     
+
         // This is static because we want every instance of ReadingPageViewModel to have the same one:
         // if you up-vote a question in one version of the ReadingView, we need the other ReadingPages to
         // see the same change.
         private static QuestionResponseRecords _thisUsersResponsesToQuestions = new QuestionResponseRecords();
-        
+
         // properties
         public Boolean HasFilter
         {
-            get => FilterChoices.SelectedAnsweringMPsNotMine.Count == 0 && 
+            get => FilterChoices.SelectedAnsweringMPsNotMine.Count == 0 &&
                    FilterChoices.SelectedAnsweringMPsMine.Count == 0 &&
-                   FilterChoices.SelectedCommittees.Count == 0 && 
-                   FilterChoices.SelectedAskingMPsMine.Count == 0 && 
+                   FilterChoices.SelectedCommittees.Count == 0 &&
+                   FilterChoices.SelectedAskingMPsMine.Count == 0 &&
                    FilterChoices.SelectedAskingMPsNotMine.Count == 0 &&
                    FilterChoices.SelectedAuthorities.Count == 0 ? true : false;
         }
@@ -74,12 +77,17 @@ public ObservableCollection<QuestionDisplayCardViewModel> QuestionsToDisplay
             set => SetProperty(ref _questionsToDisplay, value);
         }
 
-        private bool _isRefreshing = true;
+        private bool _isRefreshing = false;
         public bool IsRefreshing
         {
             get => _isRefreshing;
             set => SetProperty(ref _isRefreshing, value);
         }
+        #region INotifyPropertyChanged
+
+      
+
+        #endregion
 
         public string Keyword
         {
@@ -88,9 +96,9 @@ public string Keyword
             {
                 FilterChoices.SearchKeyword = value;
             }
-            
+
         }
-        
+
         private string _writerOnlyUid = string.Empty;
         private bool _readByQuestionWriter;
         protected bool _successRespond = true;
@@ -104,25 +112,26 @@ public string EmptyViewLabelText
 
         // Parameters for server question searches
         protected readonly Weights SearchWeights;
-        public ReadingPageViewModel(): this(false, true)
+        public ReadingPageViewModel() : this(false, true)
         {
+            Task.Run(async() => await RefreshItemsAsync());
         }
-        
+
         // constructor
         public ReadingPageViewModel(bool readByQuestionWriter, bool needRefresh)
         {
             _readByQuestionWriter = readByQuestionWriter;
-            
+
             // Retrieve previous responses from Preferences, e.g. to display proper coloration on prior up-votes.
             _thisUsersResponsesToQuestions.Init();
-            
+
             // Keyword = FilterChoices.SearchKeyword;
-            
+
             // Default to search weights for main reading page; derived classes can alter this for other priorities.
             SearchWeights = Constants.mainReadingPageWeights;
-            
+
             // If we're already searching for something, show the user what.
-            ShowSearchFrame = !readByQuestionWriter; 
+            ShowSearchFrame = !readByQuestionWriter;
 
             // Reading with a draft question - prompt for upvoting similar questions
             Heading1 = AppResources.FocusSupportInstructionReadingOnly;
@@ -130,12 +139,12 @@ public ReadingPageViewModel(bool readByQuestionWriter, bool needRefresh)
 
             PopupLabelText = AppResources.ReadingPageHeader1;
             PopupHeaderText = Heading1;
-            
+
             if (XamarinPreferences.shared.Get(Constants.ShowFirstTimeReadingPopup, true))
             {
                 // InfoPopupCommand.ExecuteAsync(null);
                 TCCommand.ExecuteAsync(null);
-                
+
             }
             // Note: There is a race condition here, in that it is possible
             // for this command to be executed multiple times simultaneously,
@@ -143,15 +152,12 @@ public ReadingPageViewModel(bool readByQuestionWriter, bool needRefresh)
             // of questions from various versions of questionsToDisplay List.
             // I don't *think* this will cause a lock because QuestionsToDisplay
             // ought to be able to be cleared and added to in any order.
-            RefreshCommand = new AsyncRelayCommand (async () =>
+            RefreshCommand = new AsyncRelayCommand(async () =>
             {
-                    var questionsToDisplayList = await LoadQuestions();
-                    doQuestionDisplayRefresh(questionsToDisplayList);
-                    IsRefreshing = false;
+                await RefreshItemsAsync();
             });
-            DraftCommand = new AsyncRelayCommand (async () =>
+            DraftCommand = new AsyncRelayCommand(async () =>
             {
-                
                 // Check that they are registered - if not, prompt them to get an account.
                 if (!IndividualParticipant.getInstance().ProfileData.RegistrationInfo.IsRegistered)
                 {
@@ -173,7 +179,7 @@ await NavigationUtils.DoRegistrationCheck(
                         // Only show it once.
                         XamarinPreferences.shared.Set(Constants.ShowHowToPublishPopup, false);
                     }
-                    
+
                     // Now let them start drafting.
                     await Shell.Current.GoToAsync($"{nameof(WriteQuestionPage)}");
                 }
@@ -182,7 +188,7 @@ await NavigationUtils.DoRegistrationCheck(
             {
                 ShowSearchFrame = !ShowSearchFrame; // just toggle it
             });
-            ShowFiltersCommand = new AsyncRelayCommand (async () =>
+            ShowFiltersCommand = new AsyncRelayCommand(async () =>
             {
                 var advancedSearchFiltersPage = new AdvancedSearchFiltersPage(FilterChoices);
                 await Application.Current.MainPage.Navigation.PushAsync(advancedSearchFiltersPage);
@@ -195,39 +201,45 @@ await NavigationUtils.DoRegistrationCheck(
                     QuestionsToDisplay.Remove(questionToRemove);
                 }
                 // removeQuestionAddRecord(questionToRemove);
-            }); 
+            });
 
             // Get the question list for display
             if (needRefresh)
             {
-                RefreshCommand.ExecuteAsync(null);
+                //RefreshCommand.Execute(null);
             }
             else
             {
                 IsRefreshing = false;
             }
-            
+
             // Makes the question list refresh when the Advanced Search page has updated search terms.
-            MessagingCenter.Subscribe<FilterViewModel>(this, Constants.RefreshQuestionList, 
+            MessagingCenter.Subscribe<FilterViewModel>(this, Constants.RefreshQuestionList,
                  (sender) =>
                 {
-                    RefreshCommand.ExecuteAsync(null);
+                  //  RefreshCommand.Execute(null);
                 });
         }
-
+        async Task RefreshItemsAsync()
+        {
+            IsRefreshing = true;
+            var questionsToDisplayList = await LoadQuestions();
+            DoQuestionDisplayRefresh(questionsToDisplayList);
+            IsRefreshing = false;
+        }
         // commands
-        public AsyncRelayCommand  RefreshCommand { get; protected set; }
-        public IAsyncRelayCommand  DraftCommand { get; }
+        public ICommand RefreshCommand { get; protected set; }
+        public IAsyncRelayCommand DraftCommand { get; }
         public Command SearchToolbarCommand { get; }
         public Command<QuestionDisplayCardViewModel> RemoveQuestionCommand { get; }
-        public IAsyncRelayCommand  ShowFiltersCommand { get; }
+        public IAsyncRelayCommand ShowFiltersCommand { get; }
 
         // Loads the questions, depending on the value of ReadByQuestionWriter.
         protected async Task<List<QuestionDisplayCardViewModel>> LoadQuestions()
         {
             var serverQuestions = new List<QuestionReceiveFromServer>();
             var questionsToDisplay = new List<QuestionDisplayCardViewModel>();
-            
+
             JOSResult<List<string>> httpResponse;
             if (_readByQuestionWriter)
             {
@@ -239,7 +251,7 @@ protected async Task<List<QuestionDisplayCardViewModel>> LoadQuestions()
                 EmptyViewLabelText = AppResources.EmptyMatchingQuestionCollectionViewString;
                 httpResponse = await GetQuestionListBySearch();
             }
-            
+
             var httpValidation = RTAClient.ValidateHttpResponse(httpResponse, "Server Signature Verification");
             _successRespond = httpValidation.isValid;
             if (!httpValidation.isValid)
@@ -247,10 +259,10 @@ protected async Task<List<QuestionDisplayCardViewModel>> LoadQuestions()
                 ReportLabelText = "Failed to get Question List from server." + httpValidation.errorMessage;
                 return questionsToDisplay;
             }
-            
+
             // httpValidation isValid
             var questionIds = httpResponse.Data;
-            
+
             // loop through the questions
             foreach (var questionId in questionIds)
             {
@@ -293,19 +305,17 @@ protected async Task<List<QuestionDisplayCardViewModel>> LoadQuestions()
                     questionsToDisplay.Add(new QuestionDisplayCardViewModel(serverQuestion, _thisUsersResponsesToQuestions));
                 }
             }
-
+            DoQuestionDisplayRefresh(questionsToDisplay);
             return questionsToDisplay;
         }
 
-        protected void doQuestionDisplayRefresh(List<QuestionDisplayCardViewModel> questions)
+        protected void DoQuestionDisplayRefresh(List<QuestionDisplayCardViewModel> questions)
         {
             QuestionsToDisplay.Clear();
             foreach (var q in questions)
-            {  
-                QuestionsToDisplay.Add(q);
-                
+            {
+                QuestionsToDisplay.Add(q);               
             }
-
             if (QuestionsToDisplay.Count == 0)
             {
                 if (!_successRespond)
@@ -319,12 +329,12 @@ protected void doQuestionDisplayRefresh(List<QuestionDisplayCardViewModel> quest
                 }
             }
         }
-        
+
         // Gets the list of question IDs, using 'similarity' material
         private async Task<JOSResult<List<string>>> GetQuestionListBySearch()
         {
             var filters = FilterChoices;
-            
+
             // use the filters to search for similar questions.
             var serverSearchQuery = new WeightedSearchRequest()
             {
@@ -332,13 +342,13 @@ private async Task<JOSResult<List<string>>> GetQuestionListBySearch()
                 page = new QuestionListPage()
                 {
                     from = 0,
-                    to = Constants.DefaultPageSize 
+                    to = Constants.DefaultPageSize
                 },
                 weights = SearchWeights,
                 entity_who_should_answer_the_question = filters.TranscribeQuestionAnswerersForUpload(),
                 mp_who_should_ask_the_question = filters.TranscribeQuestionAskersForUpload()
             };
-            
+
             // Search based on filters and/or search/draft words.
             var scoredList = await RTAClient.GetSortedSimilarQuestionIDs(serverSearchQuery);
 
@@ -357,7 +367,7 @@ private async Task<JOSResult<List<string>>> GetQuestionListBySearch()
             // For the moment, ignore both the token and the individual-question scores.
             return new SuccessResult<List<string>>(scoredList.Data.questions.Select(sq => sq.id).ToList());
         }
-        
+
         private async Task<JOSResult<List<string>>> GetQuestionListByWriter()
         {
             var myUID = IndividualParticipant.getInstance().ProfileData.RegistrationInfo.uid;
@@ -379,4 +389,6 @@ private async Task<JOSResult<List<string>>> GetQuestionListByWriter()
             return new SuccessResult<List<string>>(questionIDs.Data);
         }
     }
+
+    
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/ViewModels/WriteQuestionViewModel.cs b/RightToAskClient/RightToAskClient.Maui/ViewModels/WriteQuestionViewModel.cs
index 798d564a..6ebf6209 100644
--- a/RightToAskClient/RightToAskClient.Maui/ViewModels/WriteQuestionViewModel.cs
+++ b/RightToAskClient/RightToAskClient.Maui/ViewModels/WriteQuestionViewModel.cs
@@ -23,28 +23,28 @@ public class WriteQuestionViewModel : ReadingPageViewModel
         public string EmptyViewContent
         {
             get => _emptyViewContent;
-            set => SetProperty(ref _emptyViewContent, value);
+            set => _emptyViewContent = value;
         }
 
         private ImageSource _emptyViewIcon;
         public ImageSource EmptyViewIcon
         {
             get => _emptyViewIcon;
-            set => SetProperty(ref _emptyViewIcon, value);
+            set => _emptyViewIcon = value;
         }
         
         private bool _showHeader = true;
         public bool ShowHeader
         {
             get => _showHeader;
-            set => SetProperty(ref _showHeader, value);
+            set => _showHeader =  value;
         }
         
         private string _draftQuestion = "";
         public string DraftQuestion
         {
             get => _draftQuestion;
-            set => SetProperty(ref _draftQuestion, value);
+            set => _draftQuestion =  value;
         }
 
         // Commands
@@ -75,7 +75,7 @@ public WriteQuestionViewModel() : base(false, false)
                 var questionsToDisplayList = await LoadQuestions();
                 if (hasQuery)
                 {
-                    doQuestionDisplayRefresh(questionsToDisplayList);
+                    DoQuestionDisplayRefresh(questionsToDisplayList);
                 }
                 IsRefreshing = false;
                 if (QuestionsToDisplay.Count == 0 && hasQuery)
@@ -122,7 +122,7 @@ public void RequestUpdate(String query, bool force = false)
             FilterChoices = new FilterChoices();
             FilterChoices.SearchKeyword = query;
             hasQuery = true;
-            RefreshCommand.ExecuteAsync(null);
+            RefreshCommand.Execute(null);
         }
         private async void OnSaveButtonClicked()
         {
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml
index 40a41d12..d12c9529 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml
@@ -31,25 +31,274 @@
                     <StackLayout Orientation="Vertical"
                                  VerticalOptions="FillAndExpand"
                                  HorizontalOptions="Fill"
-                                 Padding="16"
+                                 Padding="0"
                                  x:Name="MarkdownView"/>
+                    <Label Margin="20,0,20,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="Democracy demands civil exchange of differing views."></Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="20,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontSize="18" FontAttributes="Bold" Text="Behaviour that is encouraged"></Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="20,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="We encourage real questions."></Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Ask for information">
+                                </Span>
+                                <Span Text=" especially when you think nobody else has noticed that the information isn’t available"></Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Ask for explanations">
+                                </Span>
+                                <Span Text=" of decisions, policies or outcomes, especially if you disagree with them"></Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Be specific">
+                                </Span>
+                                <Span Text=" - specific questions are much harder to evade"></Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="20,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontSize="18" FontAttributes="Bold" Text="Questions that may be removed"></Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5,40,0">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Harassment">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,0,40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="Aggression against a specific individual or group.">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5,40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Threatening Violence">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5,40,0">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Encouraging harm">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,0,40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="Encouraging self-harm or harm to others.">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5,40,0">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Hate">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,0,40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="Attacks or threats against an individual or group because of their protected attributes or anything else about the person rather than the political issue.">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5,40,0">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Spam">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,0,40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="Malicious links, fake engagement, or advertisements.">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5,40,0">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Personal information">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,0,40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="Sharing other people’s private information without their consent.">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5,40,0">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Defamation">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,0,40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="Accusations or other defamatory statements.">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5,40,0">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Illegal">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,0,40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="Copyright violation, promotion of criminal activities, money scams etc.">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5,40,20">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Not a question">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="20,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontSize="18" FontAttributes="Bold" Text="Accounts that may be suspended"></Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="20,10">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span Text="Accounts that post questions in any of the above categories may be suspended. Also accounts in the following categories.">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Sockpuppet accounts.">
+                                </Span>
+                                <Span Text=" An additional account set up to evade suspension, inflate influence (e.g. by having multiple up- or down-votes on one question), or for other forms of bad behavior. This does not include multiple accounts set up for multiple roles, e.g. a personal account and a professional account."></Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Accounts that claim to be someone they’re not.">
+                                </Span>
+                                <Span Text=" Pseudonyms or non-names are fine, but using someone else’s name is not."></Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="40,5">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span FontAttributes="Bold" Text="* Accounts with a name that violates any of our rules for questions.">
+                                </Span>
+                               </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="20,10">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span  Text="There is no guarantee that suspended accounts will be reinstated.">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="20,10">
+                        <Label.FormattedText>
+                            <FormattedString>
+                                <Span  Text="We are still learning about how people use Right To Ask. These rules may change as we improve our understanding.">
+                                </Span>
+                            </FormattedString>
+                        </Label.FormattedText>
+                    </Label>
+                    <Label Margin="20,10">
+                    <Label.FormattedText>
+                        <FormattedString>
+                            <Span FontAttributes="Bold" Text="If you disagree with the code of conduct, you may still read Right To Ask questions freely. To participate actively (including writing questions), click “Agree”.">
+                            </Span>
+                        </FormattedString>
+                    </Label.FormattedText>
+                    </Label>
+                  
                     <BoxView Style="{StaticResource ButtonSeparator}" />
-                    <Grid 
+                        <Grid 
                          VerticalOptions="End"
                          HorizontalOptions="Fill"
                          Padding="10" ColumnSpacing="20"
                          RowDefinitions="Auto" ColumnDefinitions="*, *">
-                        <Button Grid.Row="0" Grid.Column="0" Text="{x:Static strings:AppResources.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="{x:Static strings:AppResources.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>
+                        </Grid>
                 </StackLayout>
             </ScrollView>
         </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml.cs b/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml.cs
index 37b510ea..e12cb49d 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Views/CodeOfConductPage.xaml.cs
@@ -6,6 +6,7 @@
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui;
+using CommunityToolkit.Maui.Views;
 
 namespace RightToAskClient.Maui.Views
 {
@@ -42,18 +43,16 @@ public CodeOfConductPage(Registration registration)
 
         private async void Disagree_OnClicked(object sender, EventArgs e)
         {
-            //var popup = new TwoButtonPopup(
-            //    "", 
-            //    AppResources.DisagreeCodeOfConductPopText, 
-            //    AppResources.CancelButtonText, 
-            //    AppResources.OKText,  
-            //    false);
-            var popupResult = await App.Current.MainPage.DisplayPromptAsync("", AppResources.DisagreeCodeOfConductPopText, AppResources.OKText,
-                AppResources.CancelButtonText);
-            //var popupResult = await App.Current.MainPage.Navigation.ShowPopupAsync(popup);
-            if (popupResult == AppResources.OKText)
+            var popup = new TwoButtonPopup(
+                "",
+                AppResources.DisagreeCodeOfConductPopText,
+                AppResources.CancelButtonText,
+                AppResources.OKText,
+                false);
+            var popupResult = await App.Current.MainPage.ShowPopupAsync(popup);
+            if (popup.HasApproved(popupResult))
             {
-                await Application.Current.MainPage.Navigation.PopAsync();
+                
             }
         }
         
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/FindMPsPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/FindMPsPage.xaml
index 7e187eab..665b4bd5 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/FindMPsPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/FindMPsPage.xaml
@@ -25,18 +25,18 @@
                        FontSize="Medium" />
                 <FlexLayout
                     Direction="Row" JustifyContent="Center" AlignItems="Center" Margin="16,20,16,0">
-                    <StackLayout Orientation="Vertical">
-                        <Button x:Name="SelectEleButton" Clicked="SelectEleButton_OnClicked" Text="Select electorates"
+                    <StackLayout Orientation="Vertical"  WidthRequest="200">
+                        <Button x:Name="SelectEleButton" HorizontalOptions="Start" Clicked="SelectEleButton_OnClicked" Text="Select electorates"
                                 TextColor="{StaticResource ButtonColor}" Command="{Binding KnowElectoratesCommand}"
-                                HorizontalOptions="End" Style="{StaticResource TabButton}" SizeChanged="SelectEleButton_OnSizeChanged"/>
-                        <BoxView x:Name="SelectEleButtonUnderLine" VerticalOptions="End" HeightRequest="2"/>
+                               Style="{StaticResource TabButton}" SizeChanged="SelectEleButton_OnSizeChanged"/>
+                        <BoxView x:Name="SelectEleButtonUnderLine" HorizontalOptions="Center" WidthRequest="180" VerticalOptions="Center" HeightRequest="2"/>
                     </StackLayout>
                     <BoxView WidthRequest="25" BackgroundColor="Transparent" HeightRequest="0"/>
-                    <StackLayout Orientation="Vertical">
+                    <StackLayout Orientation="Vertical"  WidthRequest="200">
                         <Button x:Name="TypeAddButton" Clicked="TypeAddButton_OnClicked" Text="Enter an address" 
                                 TextColor="{StaticResource MediumDarkShadeOfGray}" Command="{Binding LookupElectoratesCommand}"
-                                HorizontalOptions="End"  Style="{StaticResource TabButton}" SizeChanged="SelectEleButton_OnSizeChanged"/>
-                        <BoxView x:Name="TypeAddButtonUnderLine" VerticalOptions="End" HeightRequest="2" Color="Transparent"/>
+                                HorizontalOptions="Start"  Style="{StaticResource TabButton}" SizeChanged="SelectEleButton_OnSizeChanged"/>
+                        <BoxView x:Name="TypeAddButtonUnderLine" VerticalOptions="End"  WidthRequest="180"  HeightRequest="2" Color="Transparent"/>
                     </StackLayout>
                 </FlexLayout>
                 <!--Map Display-->
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/Popups/TwoButtonPopup.xaml.cs b/RightToAskClient/RightToAskClient.Maui/Views/Popups/TwoButtonPopup.xaml.cs
index 692cc9dc..bc36ada8 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/Popups/TwoButtonPopup.xaml.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Views/Popups/TwoButtonPopup.xaml.cs
@@ -35,23 +35,28 @@ public TwoButtonPopup(string popupTitle, string popupText, string cancelMessage,
             mainTitle.IsVisible = popupTitle.Length > 0;
         }
 
+        public bool IsOk = false;
+
         public bool HasApproved(object? value)
         {
-            return value?.ToString() == "OK";
+            return IsOk;
         }
 
         private void DismissPopup(object sender, EventArgs e)
         {
-            App.Current.MainPage.Navigation.PopModalAsync();
+            IsOk = false;
+            Close();
         }
 
         private void CancelButtonClicked(object sender, EventArgs e)
         {
-            App.Current.MainPage.Navigation.PopModalAsync();
+            IsOk = false;
+            Close();
         }
-        private void ApproveButtonClicked(object sender, EventArgs e)
+        private async void ApproveButtonClicked(object sender, EventArgs e)
         {
-            App.Current.MainPage.Navigation.PopModalAsync();
+            IsOk = true;
+            Close();
         }
     }
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/QuestionDetailPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/QuestionDetailPage.xaml
index cd0d82a8..a7b8922b 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/QuestionDetailPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/QuestionDetailPage.xaml
@@ -23,9 +23,9 @@
 	</ContentPage.ToolbarItems>
 	<ContentPage.Content>
 		<ScrollView>
-			<StackLayout x:Name="WholePage" Margin="20">
+			<StackLayout x:Name="WholePage" Margin="20" >
 				<Editor x:Name="QuestionTextEditor" Text="{Binding Question.QuestionText}"
-				        IsReadOnly="{Binding IsNewQuestion, Converter={StaticResource Key=cnvInvert}}" />
+                        IsReadOnly="{Binding IsNewQuestion, Converter={StaticResource Key=cnvInvert}}" />
 				<FlexLayout AlignItems="Center" JustifyContent="SpaceBetween" HorizontalOptions="CenterAndExpand"
 				            Direction="Row" Margin="0" Wrap="Wrap" IsVisible="{Binding IsNewQuestion, Converter={StaticResource Key=cnvInvert}}">
 					<StackLayout Orientation="Horizontal" >
@@ -33,7 +33,8 @@
 						<controls:ColorSingleToggleButton 
 						                                  IsBrightened="{Binding Question.AlreadyUpvoted}"
 						                                  Padding="5"
-						                                  HeightRequest="{x:OnPlatform Android=27, iOS=44}"
+						                                  HeightRequest="{x:OnPlatform Android=35, iOS=44}"
+														  WidthRequest="{x:OnPlatform Android=35, iOS=44}"
 						                                  BackgroundColor="Transparent" Command="{Binding UpvoteCommand}"
 						                                  HorizontalOptions="Start"
 						                                  AutomationProperties.IsInAccessibleTree="True"
@@ -60,7 +61,8 @@
 	                             BackgroundColor="Transparent" Command="{Binding DownvoteCommand}" Padding="5"
 	                             IsBrightened="{Binding Question.AlreadyDownvoted}"
 	                             HorizontalOptions="Start"
-	                             HeightRequest="{x:OnPlatform Android=27, iOS=44}"
+	                             HeightRequest="{x:OnPlatform Android=35, iOS=44}"
+								 WidthRequest="{x:OnPlatform Android=35, iOS=44}"
 	                             AutomationProperties.IsInAccessibleTree="True" AutomationProperties.Name="{StaticResource QuestionFrameThumbsDownAccessibilityName}"
 	                             AutomationProperties.HelpText="{x:Static strings:AppResources.QuestionFrameThumbsDownAccessibilityText}">
 		                    <VisualStateManager.VisualStateGroups>
@@ -84,7 +86,8 @@
 						<!-- report/flag button -->
 						<controls:ColorSingleToggleButton Padding="5" 
 						                                  IsBrightened="{Binding Question.AlreadyReported}"
-						                                  HeightRequest="{x:OnPlatform Android=27, iOS=44}"
+						                                  HeightRequest="{x:OnPlatform Android=35, iOS=44}"
+                                                          WidthRequest="{x:OnPlatform Android=35, iOS=44}"
 						                                  IsEnabled="{Binding Question.AlreadyReported, Converter={StaticResource Key=cnvInvert}}"
 						                                  Command="{Binding ReportCommand}"
 						                                  BackgroundColor="Transparent"
@@ -186,7 +189,7 @@
 						    </DataTemplate>
 					    </BindableLayout.ItemTemplate>
 				    </StackLayout>
-				    <Editor x:Name="LinkToAnswerEditor" Placeholder="{StaticResource LinkPlaceholderText}" Completed="Link_Entered"
+                    <Editor x:Name="LinkToAnswerEditor" Placeholder="{x:Static strings:AppResources.LinkPlaceholderText}" Completed="Link_Entered"
 				            Style="{StaticResource NormalEditor}" />
 				<Label x:Name="ReportLabel" Text="{Binding ReportLabelText}" Style="{StaticResource ReportLabel}"/>
 			    </StackLayout>
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/QuestionDisplayCard.xaml b/RightToAskClient/RightToAskClient.Maui/Views/QuestionDisplayCard.xaml
index 2845b957..a7884444 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"
+             xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:DataType="viewModels:QuestionDisplayCardViewModel">
     <ContentView.Content>
         <!-- <StackLayout> -->
@@ -36,14 +36,16 @@
                             Style="{StaticResource TransparentSquareButton}"
                             Command="{Binding QuestionDetailsCommand}" BackgroundColor="Transparent" />
                     <!--UpVote Button-->
-                    <FlexLayout Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" AlignItems="Center"
-                                JustifyContent="SpaceBetween" HorizontalOptions="CenterAndExpand"
-                                Direction="Row" Margin="16, 0" Wrap="Wrap">
+                    <FlexLayout Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" AlignItems="Start"
+                                JustifyContent="SpaceBetween" HorizontalOptions="StartAndExpand"
+                                Direction="Row" Margin="6, 0" Wrap="Wrap">
                         <StackLayout Orientation="Horizontal">
                             <controls:ColorSingleToggleButton
                                 IsBrightened="{Binding Question.AlreadyUpvoted}"
                                 Padding="5"
-                                HeightRequest="{x:OnPlatform Android=27, iOS=44}"
+                                
+                                WidthRequest="{x:OnPlatform Android=35, iOS=44}"
+                                HeightRequest="{x:OnPlatform Android=35, iOS=44}"
                                 BackgroundColor="Transparent" Command="{Binding UpvoteCommand}"
                                 HorizontalOptions="Start"
                                 AutomationProperties.IsInAccessibleTree="True"
@@ -72,7 +74,8 @@
                             <!-- Down-vote button -->
                             <controls:ColorSingleToggleButton
                                 Padding="5"
-                                HeightRequest="{x:OnPlatform Android=27, iOS=44}"
+                                HeightRequest="{x:OnPlatform Android=35, iOS=44}"
+                                WidthRequest="{x:OnPlatform Android=35, iOS=44}"
                                 BackgroundColor="Transparent" Command="{Binding DownvoteCommand}"
                                 HorizontalOptions="Start"
                                 IsBrightened="{Binding Question.AlreadyDownvoted}"
@@ -139,7 +142,8 @@
                             <ImageButton
                                 Source="{AppThemeBinding Light=flags_light.png, Dark=Images.flags_dark.png }"
                                 Padding="5"
-                                HeightRequest="{x:OnPlatform Android=27, iOS=44}"
+                                HeightRequest="{x:OnPlatform Android=35, iOS=44}"
+                                WidthRequest="{x:OnPlatform Android=35, iOS=44}"
                                 Command="{Binding ReportCommand}"
                                 BackgroundColor="Transparent"
                                 AutomationProperties.IsInAccessibleTree="True"
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/ReadingPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/ReadingPage.xaml
index b0b23e68..79813bef 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/ReadingPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/ReadingPage.xaml
@@ -147,7 +147,8 @@
                              IsRefreshing="{Binding IsRefreshing}"
                              Command="{Binding RefreshCommand}">
                     <ScrollView VerticalOptions="FillAndExpand">
-                        <StackLayout><!--Heading text moved inside of the scrollview to have it scroll off the page-->
+                        <StackLayout>
+                            <!--Heading text moved inside of the scrollview to have it scroll off the page-->
                             <CollectionView x:Name="QuestionList"
                                             ItemsSource="{Binding QuestionsToDisplay}"
                                             SelectionMode="None"
@@ -174,7 +175,7 @@
                                                  Padding="0, 100 ,0 ,0">
                                         <Image Source="{Binding ListEmptyViewIcon}"
                                                Style="{StaticResource ListErrorIcon}"/>
-                                        <Label Text="{x:Static strings:AppResources.EmptyFieldMessage}"
+                                        <Label Text="{Binding EmptyViewLabelText}"
                                                Style="{StaticResource ListErrorText}"
                                                VerticalOptions="Start" />
                                     </StackLayout>
@@ -184,20 +185,20 @@
                     </ScrollView>
                 </RefreshView>
                 <ImageButton Grid.Row="1"
-                             Grid.Column="1"
-                             VerticalOptions="End"
-                             HorizontalOptions="End"
-                             Margin="10"
-                             Source="edit.png"
-                             WidthRequest="110"
-                             HeightRequest="110"
-                             CornerRadius="30"
-                             Padding="20"
-                             Aspect="AspectFit"
-                             BackgroundColor="{StaticResource Purple}"
-                             Command="{Binding DraftCommand}"
-                             SemanticProperties.Hint="{x:Static strings:AppResources.ReadingPageWriteHint}"
-                             SemanticProperties.Description="{x:Static strings:AppResources.ReadingPageWriteDescription}" />
+              Grid.Column="1"
+              VerticalOptions="End"
+              HorizontalOptions="End"
+              Margin="10"
+              Source="edit.png"
+              WidthRequest="120"
+              HeightRequest="120"
+              CornerRadius="35"
+              Padding="20"
+              Aspect="AspectFit"
+              BackgroundColor="{StaticResource Purple}"
+              Command="{Binding DraftCommand}"
+              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/ReadingPage.xaml.cs b/RightToAskClient/RightToAskClient.Maui/Views/ReadingPage.xaml.cs
index 0ac3f170..5147f06d 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/ReadingPage.xaml.cs
+++ b/RightToAskClient/RightToAskClient.Maui/Views/ReadingPage.xaml.cs
@@ -30,9 +30,9 @@ protected override void OnAppearing()
             }
             
             var vmReadingPage = BindingContext as ReadingPageViewModel;
-            FilterButton.BackgroundColor = vmReadingPage.HasFilter
-                ? (Color)Application.Current.Resources["Primary"]
-                : (Color)Application.Current.Resources["Purple"];
+            //FilterButton.BackgroundColor = vmReadingPage.HasFilter
+            //    ? (Color)Application.Current.Resources["Primary"]
+            //    : (Color)Application.Current.Resources["Purple"];
         }
         
         protected override void OnDisappearing()
@@ -43,8 +43,8 @@ protected override void OnDisappearing()
         }
         private void ClearButton_OnClicked(object sender, EventArgs e)
         {
-            KeywordEntry.Text = "";
-            ClearButton.IsVisible = false;
+            //KeywordEntry.Text = "";
+            //ClearButton.IsVisible = false;
         }
 
         private ReadingPageViewModel? GetViewModel()
@@ -54,22 +54,22 @@ private void ClearButton_OnClicked(object sender, EventArgs e)
 
         private void KeywordEntry_OnCompleted(object sender, EventArgs e)
         {
-            GetViewModel().RefreshCommand.ExecuteAsync(null);
+            GetViewModel().RefreshCommand.Execute(null);
         }
 
         private void KeywordEntry_OnTextChanged(object sender, TextChangedEventArgs e)
         {
             int length = e.NewTextValue.Length;
-            ClearButton.IsVisible = length > 0;
+            //ClearButton.IsVisible = length > 0;
         }
 
         private void MenuItem_OnClicked(object sender, EventArgs e)
         {
-            SearchFrame.IsVisible = !SearchFrame.IsVisible;
-            if (!SearchFrame.IsVisible)
-                KeywordEntry.Unfocus();
-            else
-                KeywordEntry.Focus();
+            //SearchFrame.IsVisible = !SearchFrame.IsVisible;
+            //if (!SearchFrame.IsVisible)
+            //    KeywordEntry.Unfocus();
+            //else
+            //    KeywordEntry.Focus();
         }
     }
 }
\ No newline at end of file
diff --git a/RightToAskClient/RightToAskClient.Maui/Views/RegisterAccountPage.xaml b/RightToAskClient/RightToAskClient.Maui/Views/RegisterAccountPage.xaml
index 5d821238..316050d8 100644
--- a/RightToAskClient/RightToAskClient.Maui/Views/RegisterAccountPage.xaml
+++ b/RightToAskClient/RightToAskClient.Maui/Views/RegisterAccountPage.xaml
@@ -12,11 +12,11 @@
               xmlns:strings="clr-namespace:RightToAskClient.Maui.Resx"
              x:DataType="vm:RegistrationViewModel"
              Title="{Binding Title}">
-    <Shell.TitleView>
+    <!--<Shell.TitleView>
         <Image Source="error.png"
                HorizontalOptions="Center"
                VerticalOptions="Start" />
-    </Shell.TitleView>
+    </Shell.TitleView>-->
 
     <ContentPage.BindingContext>
         <vm:RegistrationViewModel />
@@ -42,7 +42,7 @@
                             <controls:BorderlessEntry
                                 AutomationProperties.Name="{StaticResource DisplayNamePlaceholderText}"
                                 Text="{Binding DisplayName}"
-                                Placeholder="{StaticResource DisplayNamePlaceholderText}"
+                                Placeholder="{x:Static strings:AppResources.DisplayNamePlaceholderText}"
                                 Style="{StaticResource TextInput}"
                                 Unfocused="NameEntry_OnUnfocused"
                                 Focused="NameEntry_OnFocused" />
@@ -79,7 +79,7 @@
                             <controls:BorderlessEntry
                                 AutomationProperties.Name="{StaticResource UIDPlaceholderText}"
                                 Text="{Binding UserId}"
-                                Placeholder="{StaticResource UIDPlaceholderText}"
+                                Placeholder="{x:Static strings:AppResources.UIDPlaceholderText}"
                                 Style="{StaticResource TextInput}"
                                 Unfocused="UIDEntry_OnUnfocused"
                                 Focused="UIDEntry_OnFocused" />