From 5ee3c6d8ea864f5d7bfdeba80b9aefb59c3c6019 Mon Sep 17 00:00:00 2001
From: "Sergey V. Zhdanovskih" <serg.zhdanovskih@yandex.ru>
Date: Fri, 3 Nov 2023 00:31:01 +0300
Subject: [PATCH] Experimental development (30) (#182)

---
 .../GKCore/Controllers/FARDlgController.cs    | 10 +-
 .../FilePropertiesDlgController.cs            | 23 ++++-
 .../Controllers/LocationEditDlgController.cs  |  8 +-
 .../Controllers/SourceEditDlgController.cs    |  2 +-
 .../Controllers/TreeCompareController.cs      |  2 +-
 .../GKCore/Design/Views/IFilePropertiesDlg.cs | 11 +++
 .../GEDKeeperX/GKUI/Components/ArborViewer.cs |  2 +-
 .../GKUI/Components/ScrollablePanel.cs        |  1 +
 .../GKUI/Components/TreeChartBox.cs           |  4 +-
 .../GKUI/Components/TreeMapViewer.cs          |  8 ++
 .../GEDKeeperX/GKUI/Forms/AddressEditDlg.xaml | 29 +++---
 .../GKUI/Forms/AddressEditDlg.xaml.cs         |  4 -
 .../GKUI/Forms/AssociationEditDlg.xaml        |  4 +-
 .../GEDKeeperX/GKUI/Forms/BaseWinSDI.xaml.cs  |  8 +-
 .../GKUI/Forms/CommonFilterDlg.xaml.cs        |  5 +-
 .../GKvX/GEDKeeperX/GKUI/Forms/CommonForm.cs  |  2 +-
 .../GEDKeeperX/GKUI/Forms/EventEditDlg.xaml   |  5 +
 .../GKUI/Forms/FilePropertiesDlg.xaml         |  8 +-
 .../GKUI/Forms/FilePropertiesDlg.xaml.cs      | 13 ++-
 .../GKUI/Forms/FindAndReplaceDlg.xaml         | 24 ++---
 .../GKUI/Forms/FindAndReplaceDlg.xaml.cs      |  5 -
 .../GKUI/Forms/LocationEditDlg.xaml           | 29 +++---
 .../GKvX/GEDKeeperX/GKUI/Forms/MainPage.cs    |  8 --
 .../GEDKeeperX/GKUI/Forms/NoteEditDlg.xaml.cs |  4 -
 .../GEDKeeperX/GKUI/Forms/OptionsDlg.xaml     | 91 +++++++++----------
 .../GKUI/Forms/OrganizerWin.xaml.cs           |  4 -
 .../GEDKeeperX/GKUI/Forms/ParentsEditDlg.xaml |  7 ++
 .../GKUI/Forms/PatriarchsViewerWin.xaml.cs    |  4 -
 .../GEDKeeperX/GKUI/Forms/PersonEditDlg.xaml  |  7 ++
 .../GKUI/Forms/QuickSearchDlg.xaml.cs         |  4 -
 .../GKUI/Forms/RepositoryEditDlg.xaml.cs      |  4 -
 .../GKUI/Forms/SourceCitEditDlg.xaml          |  2 +-
 .../GKUI/Forms/SourceEditDlg.xaml.cs          |  4 -
 .../GKUI/Forms/TTFamilyGroupsDlg.xaml         |  6 +-
 .../GKUI/Forms/TTPlacesManagerDlg.xaml        |  2 +-
 .../GKUI/Forms/TTTreeCompareDlg.xaml          | 30 +++---
 .../GKUI/Forms/TreeChartWin.xaml.cs           |  9 +-
 .../GEDKeeperX/GKUI/Forms/UserRefEditDlg.xaml |  2 +
 .../GKUI/Forms/UserRefEditDlg.xaml.cs         |  4 -
 .../GEDKeeperX/GKUI/Platform/XFGfxRenderer.cs | 43 +++++++--
 40 files changed, 230 insertions(+), 212 deletions(-)

diff --git a/projects/GKCore/GKCore/Controllers/FARDlgController.cs b/projects/GKCore/GKCore/Controllers/FARDlgController.cs
index bd866741e..d3270e04d 100644
--- a/projects/GKCore/GKCore/Controllers/FARDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/FARDlgController.cs
@@ -21,12 +21,11 @@
 using System;
 using BSLib;
 using GDModel;
-using GKCore.Design.Controls;
 using GKCore.Design;
+using GKCore.Design.Controls;
 using GKCore.Design.Views;
 using GKCore.Options;
 using GKCore.Search;
-using GKCore.Types;
 
 namespace GKCore.Controllers
 {
@@ -53,12 +52,7 @@ public override void SetLocale()
             GetControl<ICheckBox>("chkMatchCase").Text = LangMan.LS(LSID.MatchCase);
             GetControl<ICheckBox>("chkMatchWildcards").Text = LangMan.LS(LSID.MatchWildcards);
             GetControl<ICheckBox>("chkWholeWord").Text = LangMan.LS(LSID.WholeWord);
-
-            if (!AppHost.Instance.HasFeatureSupport(Feature.Mobile)) {
-                GetControl<IGroupBox>("gbFilters").Text = LangMan.LS(LSID.MIFilter);
-            } else {
-                GetControl<ILabel>("gbFilters").Text = LangMan.LS(LSID.MIFilter);
-            }
+            GetControl<IGroupBox>("gbFilters").Text = LangMan.LS(LSID.MIFilter);
             GetControl<ILabel>("lblRecord").Text = LangMan.LS(LSID.Record);
             GetControl<ILabel>("lblProperty").Text = LangMan.LS(LSID.Property);
 
diff --git a/projects/GKCore/GKCore/Controllers/FilePropertiesDlgController.cs b/projects/GKCore/GKCore/Controllers/FilePropertiesDlgController.cs
index 6f772826c..f8a7c892a 100644
--- a/projects/GKCore/GKCore/Controllers/FilePropertiesDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/FilePropertiesDlgController.cs
@@ -36,12 +36,23 @@ public sealed class FilePropertiesDlgController : DialogController<IFileProperti
 
         public FilePropertiesDlgController(IFilePropertiesDlg view) : base(view)
         {
+            if (AppHost.Instance.HasFeatureSupport(Feature.Mobile)) {
+                var mobileView = view as IMobileFilePropertiesDlg;
+                for (var lid = GDMLanguageID.Unknown; lid < GDMLanguageID.Yiddish; lid++) {
+                    mobileView.LanguageCombo.AddItem(GEDCOMUtils.GetLanguageStr(lid), lid);
+                }
+            }
         }
 
         public override bool Accept()
         {
             try {
-                fBase.Context.Tree.Header.Language = GEDCOMUtils.GetLanguageVal(fView.Language.Text);
+                if (!AppHost.Instance.HasFeatureSupport(Feature.Mobile)) {
+                    fBase.Context.Tree.Header.Language = GEDCOMUtils.GetLanguageVal(fView.Language.Text);
+                } else {
+                    var mobileView = fView as IMobileFilePropertiesDlg;
+                    fBase.Context.Tree.Header.Language = mobileView.LanguageCombo.GetSelectedTag<GDMLanguageID>();
+                }
 
                 GDMSubmitterRecord submitter = fBase.Context.Tree.GetSubmitter();
                 submitter.Name = fView.Name.Text;
@@ -64,7 +75,12 @@ public override bool Accept()
 
         public override void UpdateView()
         {
-            fView.Language.Text = GEDCOMUtils.GetLanguageStr(fBase.Context.Tree.Header.Language);
+            if (!AppHost.Instance.HasFeatureSupport(Feature.Mobile)) {
+                fView.Language.Text = GEDCOMUtils.GetLanguageStr(fBase.Context.Tree.Header.Language);
+            } else {
+                var mobileView = fView as IMobileFilePropertiesDlg;
+                mobileView.LanguageCombo.Text = GEDCOMUtils.GetLanguageStr(fBase.Context.Tree.Header.Language);
+            }
 
             GDMSubmitterRecord submitter = fBase.Context.Tree.GetSubmitter();
             fView.Name.Text = submitter.Name;
@@ -84,6 +100,9 @@ public override void UpdateView()
 
         public void ChangeLanguage()
         {
+            if (AppHost.Instance.HasFeatureSupport(Feature.Mobile))
+                return;
+
             using (var dlg = AppHost.ResolveDialog<ILanguageEditDlg>()) {
                 dlg.LanguageID = fBase.Context.Tree.Header.Language;
 
diff --git a/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs b/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs
index 0165fe19f..6cd7e51a1 100644
--- a/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/LocationEditDlgController.cs
@@ -186,13 +186,7 @@ public override void SetLocale()
             GetControl<ILabel>("lblLatitude").Text = LangMan.LS(LSID.Latitude);
             GetControl<ILabel>("lblLongitude").Text = LangMan.LS(LSID.Longitude);
             GetControl<IButton>("btnShowOnMap").Text = LangMan.LS(LSID.Show);
-
-            if (!AppHost.Instance.HasFeatureSupport(Feature.Mobile)) {
-                GetControl<IGroupBox>("grpSearch").Text = LangMan.LS(LSID.SearchCoords);
-            } else {
-                GetControl<ILabel>("grpSearch").Text = LangMan.LS(LSID.SearchCoords);
-            }
-
+            GetControl<IGroupBox>("grpSearch").Text = LangMan.LS(LSID.SearchCoords);
             GetControl<IButton>("btnSearch").Text = LangMan.LS(LSID.Search);
             GetControl<IButton>("btnSelect").Text = LangMan.LS(LSID.SelectCoords);
             GetControl<IButton>("btnSelectName").Text = LangMan.LS(LSID.SelectName);
diff --git a/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs b/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs
index c7fa1c75f..75784b3ba 100644
--- a/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs
+++ b/projects/GKCore/GKCore/Controllers/SourceEditDlgController.cs
@@ -101,7 +101,7 @@ public override void UpdateView()
 
         public override void SetLocale()
         {
-            ((IView)fView).Title = LangMan.LS(LSID.Source);
+            fView.Title = LangMan.LS(LSID.Source);
 
             GetControl<IButton>("btnAccept").Text = LangMan.LS(LSID.DlgAccept);
             GetControl<IButton>("btnCancel").Text = LangMan.LS(LSID.DlgCancel);
diff --git a/projects/GKCore/GKCore/Controllers/TreeCompareController.cs b/projects/GKCore/GKCore/Controllers/TreeCompareController.cs
index 31b7b92f8..7461cab52 100644
--- a/projects/GKCore/GKCore/Controllers/TreeCompareController.cs
+++ b/projects/GKCore/GKCore/Controllers/TreeCompareController.cs
@@ -131,8 +131,8 @@ public override void SetLocale()
             if (!AppHost.Instance.HasFeatureSupport(Feature.Mobile)) {
                 GetControl<ITabPage>("pageTreeCompare").Text = LangMan.LS(LSID.ToolOp_1);
                 GetControl<IButton>("btnClose").Text = LangMan.LS(LSID.DlgClose);
-                GetControl<IGroupBox>("grpMatchType").Text = LangMan.LS(LSID.MatchType);
             }
+            GetControl<IGroupBox>("grpMatchType").Text = LangMan.LS(LSID.MatchType);
             GetControl<ILabel>("lblFile").Text = LangMan.LS(LSID.MIFile);
             GetControl<IButton>("btnFileChoose").Text = LangMan.LS(LSID.DlgSelect) + @"...";
             GetControl<IRadioButton>("radMatchInternal").Text = LangMan.LS(LSID.MatchInternal);
diff --git a/projects/GKCore/GKCore/Design/Views/IFilePropertiesDlg.cs b/projects/GKCore/GKCore/Design/Views/IFilePropertiesDlg.cs
index 2804fd995..cce6df3e3 100644
--- a/projects/GKCore/GKCore/Design/Views/IFilePropertiesDlg.cs
+++ b/projects/GKCore/GKCore/Design/Views/IFilePropertiesDlg.cs
@@ -32,4 +32,15 @@ public interface IFilePropertiesDlg : ICommonDialog, IBaseEditor
         ITextBox Address { get; }
         ITextBox Tel { get; }
     }
+
+
+    public interface IDesktopFilePropertiesDlg : IFilePropertiesDlg
+    {
+    }
+
+
+    public interface IMobileFilePropertiesDlg : IFilePropertiesDlg
+    {
+        IComboBox LanguageCombo { get; }
+    }
 }
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Components/ArborViewer.cs b/projects/GKvX/GEDKeeperX/GKUI/Components/ArborViewer.cs
index dcfb149b2..35648e8e7 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Components/ArborViewer.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Components/ArborViewer.cs
@@ -143,7 +143,7 @@ private void OnPaint(object sender, SKPaintSurfaceEventArgs args)
             try {
                 SKPaint textPaint = new SKPaint {
                     Color = SKColors.White,
-                    TextSize = 24.0f
+                    TextSize = (float)Device.GetNamedSize(NamedSize.Default, typeof(Label))
                 };
 
                 foreach (ArborNode node in fSys.Nodes) {
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Components/ScrollablePanel.cs b/projects/GKvX/GEDKeeperX/GKUI/Components/ScrollablePanel.cs
index 815dc9691..64377a008 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Components/ScrollablePanel.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Components/ScrollablePanel.cs
@@ -154,6 +154,7 @@ protected virtual void OnFontChanged(EventArgs e)
 
         private void PaintHandler(object sender, SKPaintSurfaceEventArgs e)
         {
+            e.Surface.Canvas.Clear();
             OnPaint(e);
 
             #if DEBUG_VIEWPORT
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Components/TreeChartBox.cs b/projects/GKvX/GEDKeeperX/GKUI/Components/TreeChartBox.cs
index e208c7772..7c97a064c 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Components/TreeChartBox.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Components/TreeChartBox.cs
@@ -187,8 +187,8 @@ public TreeChartBox()
             fTraceSelected = true;
 
             fTreeControls = new TreeControlsList<ITreeControl>();
-            fTreeControls.Add(new TCScaleControl(this));
-            fTreeControls.Add(new TCGenerationsControl(this, TreeChartKind.ckDescendants));
+            //fTreeControls.Add(new TCScaleControl(this));
+            //fTreeControls.Add(new TCGenerationsControl(this, TreeChartKind.ckDescendants));
             //fPersonControl = new PersonControl(this);
 
             InitTimer();
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Components/TreeMapViewer.cs b/projects/GKvX/GEDKeeperX/GKUI/Components/TreeMapViewer.cs
index d09a0ea23..9600f2193 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Components/TreeMapViewer.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Components/TreeMapViewer.cs
@@ -54,6 +54,9 @@ public PaintItemEventArgs(SKSurface surface, MapItem item)
 
     public delegate void PaintItemEventHandler(object sender, PaintItemEventArgs args);
 
+    /// <summary>
+    /// TreeMap Viewer's control.
+    /// </summary>
     public class TreeMapViewer : ContentView
     {
         private MapItem fCurrentItem;
@@ -150,6 +153,8 @@ public MapItem UpperItem
 
         public TreeMapViewer()
         {
+            fModel = new TreemapModel();
+            fModel.CreatingItem += CreateSimpleItem;
         }
 
         private MapItem CreateSimpleItem(MapItem parent, string name, double size)
@@ -164,6 +169,9 @@ private List<MapItem> GetRootList()
 
         public void UpdateView()
         {
+            try {
+            } catch {
+            }
         }
     }
 }
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/AddressEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/AddressEditDlg.xaml
index edf2b12f1..4fcff9b02 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/AddressEditDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/AddressEditDlg.xaml
@@ -18,24 +18,27 @@
                 <xp:TabItem x:Name="pageCommon">
                     <StackLayout Orientation="Vertical">
                         <Grid ColumnSpacing="4" RowSpacing="4">
-                            <Grid.Children>
-                                <Label x:Name="lblCountry" Grid.Column="0" Grid.Row="0" />
-                                <Entry x:Name="txtCountry" Grid.Column="1" Grid.Row="0" />
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
 
-                                <Label x:Name="lblState" Grid.Column="0" Grid.Row="1" />
-                                <Entry x:Name="txtState" Grid.Column="1" Grid.Row="1" />
+                            <Label x:Name="lblCountry" Grid.Column="0" Grid.Row="0" />
+                            <Entry x:Name="txtCountry" Grid.Column="1" Grid.Row="0" />
 
-                                <Label x:Name="lblCity" Grid.Column="0" Grid.Row="2" />
-                                <Entry x:Name="txtCity" Grid.Column="1" Grid.Row="2" />
+                            <Label x:Name="lblState" Grid.Column="0" Grid.Row="1" />
+                            <Entry x:Name="txtState" Grid.Column="1" Grid.Row="1" />
 
-                                <Label x:Name="lblPostalCode" Grid.Column="0" Grid.Row="3" />
-                                <Entry x:Name="txtPostalCode" Grid.Column="1" Grid.Row="3" />
+                            <Label x:Name="lblCity" Grid.Column="0" Grid.Row="2" />
+                            <Entry x:Name="txtCity" Grid.Column="1" Grid.Row="2" />
 
-                                <Label x:Name="lblAddress" Grid.Column="0" Grid.Row="4" />
-                                <Entry x:Name="txtAddress" Grid.Column="1" Grid.Row="4" />
-                            </Grid.Children>
+                            <Label x:Name="lblPostalCode" Grid.Column="0" Grid.Row="3" />
+                            <Entry x:Name="txtPostalCode" Grid.Column="1" Grid.Row="3" />
+
+                            <Label x:Name="lblAddress" Grid.Column="0" Grid.Row="4" />
+                            <Entry x:Name="txtAddress" Grid.Column="1" Grid.Row="4" />
                         </Grid>
-                        
+
                         <Label VerticalOptions="FillAndExpand" />
                     </StackLayout>
                 </xp:TabItem>
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/AddressEditDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/AddressEditDlg.xaml.cs
index bbf4201a4..3b2255782 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/AddressEditDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/AddressEditDlg.xaml.cs
@@ -81,10 +81,6 @@ ITextBox IAddressEditDlg.AddressLine
 
         #endregion
 
-        public AddressEditDlg() : this(null)
-        {
-        }
-
         public AddressEditDlg(IBaseWindow baseWin)
         {
             InitializeComponent();
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/AssociationEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/AssociationEditDlg.xaml
index 1c5cb2502..b52ae4fe9 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/AssociationEditDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/AssociationEditDlg.xaml
@@ -18,8 +18,8 @@
 
             <Label x:Name="lblPerson" Grid.Column="0" Grid.Row="1" />
             <StackLayout Orientation="Horizontal" Spacing="4" Grid.Column="1" Grid.Row="1">
-                <Entry x:Name="txtPerson" IsReadOnly="true" />
-                <Button x:Name="btnPersonAdd" Style="{StaticResource iconBtn}" ImageSource="{plat:ImageResourceExt Resources.btn_rec_new.gif}" Clicked="btnPersonAdd_Click" />
+                <Entry x:Name="txtPerson" IsReadOnly="true" HorizontalOptions="FillAndExpand" />
+                <Button x:Name="btnPersonAdd" Style="{StaticResource iconBtn}" ImageSource="{plat:ImageResourceExt Resources.btn_rec_new.gif}" Clicked="btnPersonAdd_Click" HorizontalOptions="End" />
             </StackLayout>
         </Grid>
 
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/BaseWinSDI.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/BaseWinSDI.xaml.cs
index 096c86e35..98bfa8347 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/BaseWinSDI.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/BaseWinSDI.xaml.cs
@@ -836,16 +836,16 @@ void IProgressController.Begin(string title, int maximum, bool cancelable)
 
         void IProgressController.End()
         {
-            /*Device.BeginInvokeOnMainThread(() => {
+            Device.BeginInvokeOnMainThread(() => {
                 progressBar.IsVisible = false;
-            });*/
+            });
         }
 
         void IProgressController.End(ThreadError threadError)
         {
-            /*Device.BeginInvokeOnMainThread(() => {
+            Device.BeginInvokeOnMainThread(() => {
                 progressBar.IsVisible = false;
-            });*/
+            });
         }
 
         void IProgressController.SetText(string text)
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/CommonFilterDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/CommonFilterDlg.xaml.cs
index ac1b329b7..2a503527f 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/CommonFilterDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/CommonFilterDlg.xaml.cs
@@ -50,13 +50,10 @@ public IFilterGridView FilterGrid
 
         #endregion
 
-        public CommonFilterDlg()
+        public CommonFilterDlg(IBaseWindow baseWin, IRecordsListModel listMan)
         {
             InitializeComponent();
-        }
 
-        public CommonFilterDlg(IBaseWindow baseWin, IRecordsListModel listMan) : this()
-        {
             if (baseWin == null)
                 throw new ArgumentNullException("baseWin");
 
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/CommonForm.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/CommonForm.cs
index eff4f71f0..e7121b9c4 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/CommonForm.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/CommonForm.cs
@@ -100,7 +100,7 @@ public class CommonWindow : CommonForm, IWindow
     {
         public virtual void Show(bool showInTaskbar)
         {
-            XFAppHost.GetMainPage().Navigate(this);
+            XFAppHost.GetMainPage().Navigation.PushAsync(this);
         }
 
         public virtual void SetLocale()
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml
index 81b70d38a..2e76b22be 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/EventEditDlg.xaml
@@ -18,6 +18,11 @@
                 <xp:TabItem x:Name="pageCommon">
                     <StackLayout Orientation="Vertical" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
                         <Grid ColumnSpacing="4" RowSpacing="4" VerticalOptions="Start" HorizontalOptions="FillAndExpand">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
                             <Label x:Name="lblEvent" Grid.Column="0" Grid.Row="0" />
                             <StackLayout Orientation="Horizontal" Spacing="4" Grid.Column="1" Grid.Row="0">
                                 <comcom:GKComboBox x:Name="cmbEventType" IsReadOnly="True" SelectedIndexChanged="EditEventType_SelectedIndexChanged" />
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/FilePropertiesDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/FilePropertiesDlg.xaml
index 8660f70a2..05c116ea1 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/FilePropertiesDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/FilePropertiesDlg.xaml
@@ -18,6 +18,11 @@
                 <xp:TabItem x:Name="pageAuthor">
                     <StackLayout Orientation="Vertical">
                         <Grid ColumnSpacing="4" RowSpacing="4" VerticalOptions="Start">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
                             <Label x:Name="lblName" Grid.Column="0" Grid.Row="0" />
                             <Entry x:Name="txtName" Grid.Column="1" Grid.Row="0" />
 
@@ -28,8 +33,7 @@
                             <Entry x:Name="txtTel" Grid.Column="1" Grid.Row="2" />
 
                             <Label x:Name="lblLanguage" Grid.Column="0" Grid.Row="3" />
-                            <Entry x:Name="txtLanguage" Grid.Column="1" Grid.Row="3" IsReadOnly="True" />
-                            <Button x:Name="btnLangEdit" Grid.Column="2" Grid.Row="3" Style="{StaticResource iconBtn}" ImageSource="{plat:ImageResourceExt Resources.btn_rec_edit.gif}" Clicked="btnLangEdit_Click" />
+                            <comcom:GKComboBox x:Name="txtLanguage" Grid.Column="1" Grid.Row="3" IsReadOnly="True" />
                         </Grid>
 
                         <Label VerticalOptions="FillAndExpand" />
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/FilePropertiesDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/FilePropertiesDlg.xaml.cs
index 886034583..a9eda819f 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/FilePropertiesDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/FilePropertiesDlg.xaml.cs
@@ -18,7 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using System;
 using GKCore.Controllers;
 using GKCore.Design.Controls;
 using GKCore.Design.Views;
@@ -26,7 +25,7 @@
 
 namespace GKUI.Forms
 {
-    public sealed partial class FilePropertiesDlg : CommonDialog<IFilePropertiesDlg, FilePropertiesDlgController>, IFilePropertiesDlg
+    public sealed partial class FilePropertiesDlg : CommonDialog<IFilePropertiesDlg, FilePropertiesDlgController>, IFilePropertiesDlg, IMobileFilePropertiesDlg
     {
         public IBaseWindow Base
         {
@@ -45,6 +44,11 @@ ITextBox IFilePropertiesDlg.Language
             get { return GetControlHandler<ITextBox>(txtLanguage); }
         }
 
+        IComboBox IMobileFilePropertiesDlg.LanguageCombo
+        {
+            get { return GetControlHandler<IComboBox>(txtLanguage); }
+        }
+
         ITextBox IFilePropertiesDlg.Name
         {
             get { return GetControlHandler<ITextBox>(txtName); }
@@ -70,10 +74,5 @@ public FilePropertiesDlg(IBaseWindow baseWin)
             fController.Init(baseWin);
             fController.UpdateView();
         }
-
-        private void btnLangEdit_Click(object sender, EventArgs e)
-        {
-            fController.ChangeLanguage();
-        }
     }
 }
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/FindAndReplaceDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/FindAndReplaceDlg.xaml
index 9fb2c7319..a00474fea 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/FindAndReplaceDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/FindAndReplaceDlg.xaml
@@ -29,22 +29,18 @@
                 <Label VerticalOptions="FillAndExpand" />
             </StackLayout>
 
-            <StackLayout Orientation="Vertical">
-                <Label x:Name="gbFilters" />
-                <Frame>
-                    <Grid ColumnSpacing="4" RowSpacing="4">
-                        <Label x:Name="lblRecord" Grid.Column="0" Grid.Row="0" />
-                        <comcom:GKComboBox x:Name="cmbRecord" Grid.Column="1" Grid.Row="0" />
-
-                        <Label x:Name="lblProperty" Grid.Column="0" Grid.Row="1" />
-                        <comcom:GKComboBox x:Name="cmbProperty" Grid.Column="1" Grid.Row="1" />
-                    </Grid>
-                </Frame>
-                <Label VerticalOptions="FillAndExpand" />
-            </StackLayout>
+            <comcom:GroupBox x:Name="gbFilters">
+                <Grid ColumnSpacing="4" RowSpacing="4">
+                    <Label x:Name="lblRecord" Grid.Column="0" Grid.Row="0" />
+                    <comcom:GKComboBox x:Name="cmbRecord" Grid.Column="1" Grid.Row="0" />
+
+                    <Label x:Name="lblProperty" Grid.Column="0" Grid.Row="1" />
+                    <comcom:GKComboBox x:Name="cmbProperty" Grid.Column="1" Grid.Row="1" />
+                </Grid>
+            </comcom:GroupBox>
         </StackLayout>
 
-        <Label HorizontalOptions="FillAndExpand" />
+        <Label VerticalOptions="FillAndExpand" />
 
         <StackLayout Style="{StaticResource dlgFooter}">
             <Button x:Name="btnPrev" Style="{StaticResource dlgBtn}" Clicked="btnPrev_Click" />
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/FindAndReplaceDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/FindAndReplaceDlg.xaml.cs
index dbf5f28d0..0a53a6606 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/FindAndReplaceDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/FindAndReplaceDlg.xaml.cs
@@ -32,11 +32,6 @@ public IWindow OwnerWindow
             get { return fController.Base; }
         }
 
-        public FindAndReplaceDlg()
-        {
-            InitializeComponent();
-        }
-
         public FindAndReplaceDlg(IBaseWindow baseWin)
         {
             InitializeComponent();
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/LocationEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/LocationEditDlg.xaml
index e0aca41da..d470d86c4 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/LocationEditDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/LocationEditDlg.xaml
@@ -27,25 +27,22 @@
                             <Entry x:Name="txtLongitude" Grid.Column="2" Grid.Row="1" />
                         </Grid>
 
-                        <StackLayout Orientation="Vertical" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
-                            <Label x:Name="grpSearch" VerticalOptions="Start" />
-                            <Frame>
-                                <StackLayout Orientation="Vertical" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
-                                    <StackLayout Orientation="Horizontal" VerticalOptions="Start" HorizontalOptions="FillAndExpand">
-                                        <comcom:GKListView x:Name="ListGeoCoords" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" />
+                        <comcom:GroupBox x:Name="grpSearch" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
+                            <StackLayout Orientation="Vertical" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
+                                <StackLayout Orientation="Horizontal" VerticalOptions="Start" HorizontalOptions="FillAndExpand">
+                                    <comcom:GKListView x:Name="ListGeoCoords" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" />
 
-                                        <StackLayout Orientation="Vertical" VerticalOptions="FillAndExpand" HorizontalOptions="End">
-                                            <Button x:Name="btnSearch" Style="{StaticResource funcBtn}" Clicked="btnSearch_Click" />
-                                            <Button x:Name="btnSelect" Style="{StaticResource funcBtn}" Clicked="btnSelect_Click" />
-                                            <Button x:Name="btnSelectName" Style="{StaticResource funcBtn}" Clicked="btnSelectName_Click" />
-                                            <Button x:Name="btnShowOnMap" Style="{StaticResource funcBtn}" Clicked="btnShowOnMap_Click" />
-                                        </StackLayout>
+                                    <StackLayout Orientation="Vertical" VerticalOptions="FillAndExpand" HorizontalOptions="End">
+                                        <Button x:Name="btnSearch" Style="{StaticResource funcBtn}" Clicked="btnSearch_Click" />
+                                        <Button x:Name="btnSelect" Style="{StaticResource funcBtn}" Clicked="btnSelect_Click" />
+                                        <Button x:Name="btnSelectName" Style="{StaticResource funcBtn}" Clicked="btnSelectName_Click" />
+                                        <Button x:Name="btnShowOnMap" Style="{StaticResource funcBtn}" Clicked="btnShowOnMap_Click" />
                                     </StackLayout>
-
-                                    <comcom:GKMapBrowser x:Name="fMapBrowser" ShowLines="False" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" />
                                 </StackLayout>
-                            </Frame>
-                        </StackLayout>
+
+                                <comcom:GKMapBrowser x:Name="fMapBrowser" ShowLines="False" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" />
+                            </StackLayout>
+                        </comcom:GroupBox>
                     </StackLayout>
                 </xp:TabItem>
 
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/MainPage.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/MainPage.cs
index 3e5a0dd57..622607fb6 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/MainPage.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/MainPage.cs
@@ -38,14 +38,6 @@ public MainPage()
             fMenuPages = new Dictionary<int, Page>();
         }
 
-        public void Navigate(Page page)
-        {
-            if (page == null) return;
-
-            //IsPresented = false;
-            Navigation.PushAsync(page);
-        }
-
         public async void NavigateAsync(Page page)
         {
             if (page == null) return;
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/NoteEditDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/NoteEditDlg.xaml.cs
index be9d735e1..a1e19d1cd 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/NoteEditDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/NoteEditDlg.xaml.cs
@@ -43,10 +43,6 @@ ITextBox INoteEdit.Note
 
         #endregion
 
-        public NoteEditDlg() : this(null)
-        {
-        }
-
         public NoteEditDlg(IBaseWindow baseWin)
         {
             InitializeComponent();
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
index 7332ac9dd..1db74f2a4 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/OptionsDlg.xaml
@@ -18,35 +18,59 @@
             <xp:TabViewControl.ItemSource>
 
                 <xp:TabItem x:Name="pageCommon">
-                    <StackLayout Orientation="Vertical">
-                        <StackLayout Orientation="Horizontal">
+                    <StackLayout Orientation="Horizontal">
 
-                            <comcom:GroupBox x:Name="grpOther">
-                                <StackLayout Orientation="Vertical">
+                        <comcom:GroupBox x:Name="grpOther">
+                            <StackLayout Orientation="Vertical">
 
-                                    <input:CheckBox x:Name="chkLoadRecentFiles" />
-                                    <input:CheckBox x:Name="chkShowOnStart" />
-                                    <input:CheckBox x:Name="chkAutoCheckUpdates" />
-                                    <input:CheckBox x:Name="chkCharsetDetection" />
-                                    <input:CheckBox x:Name="chkDialogClosingWarn" />
+                                <input:CheckBox x:Name="chkLoadRecentFiles" />
+                                <input:CheckBox x:Name="chkShowOnStart" />
+                                <input:CheckBox x:Name="chkAutoCheckUpdates" />
+                                <input:CheckBox x:Name="chkCharsetDetection" />
+                                <input:CheckBox x:Name="chkDialogClosingWarn" />
 
-                                    <Grid ColumnSpacing="4" RowSpacing="4">
+                                <Grid ColumnSpacing="4" RowSpacing="4">
 
-                                        <Label x:Name="lblLanguage" Grid.Column="0" Grid.Row="0" />
-                                        <comcom:GKComboBox x:Name="cmbLanguages" IsReadOnly="True" Grid.Column="1" Grid.Row="0" />
+                                    <Label x:Name="lblLanguage" Grid.Column="0" Grid.Row="0" />
+                                    <comcom:GKComboBox x:Name="cmbLanguages" IsReadOnly="True" Grid.Column="1" Grid.Row="0" />
 
-                                        <Label x:Name="lblGeocoder" Grid.Column="0" Grid.Row="1" />
-                                        <comcom:GKComboBox x:Name="cmbGeocoder" IsReadOnly="True" Grid.Column="1" Grid.Row="1" />
+                                    <Label x:Name="lblGeocoder" Grid.Column="0" Grid.Row="1" />
+                                    <comcom:GKComboBox x:Name="cmbGeocoder" IsReadOnly="True" Grid.Column="1" Grid.Row="1" />
 
-                                        <Label x:Name="lblGeoSearchCountry" Grid.Column="0" Grid.Row="2" />
-                                        <comcom:GKComboBox x:Name="cmbGeoSearchCountry" IsReadOnly="True" Grid.Column="1" Grid.Row="2" />
+                                    <Label x:Name="lblGeoSearchCountry" Grid.Column="0" Grid.Row="2" />
+                                    <comcom:GKComboBox x:Name="cmbGeoSearchCountry" IsReadOnly="True" Grid.Column="1" Grid.Row="2" />
 
-                                        <Label x:Name="lblCertaintyAlgorithm" Grid.Column="0" Grid.Row="3" />
-                                        <comcom:GKComboBox x:Name="cmbCertaintyAlgorithm" IsReadOnly="True" Grid.Column="1" Grid.Row="3" />
+                                    <Label x:Name="lblCertaintyAlgorithm" Grid.Column="0" Grid.Row="3" />
+                                    <comcom:GKComboBox x:Name="cmbCertaintyAlgorithm" IsReadOnly="True" Grid.Column="1" Grid.Row="3" />
 
-                                    </Grid>
+                                </Grid>
 
-                                    <Label VerticalOptions="FillAndExpand" />
+                            </StackLayout>
+                        </comcom:GroupBox>
+
+                        <StackLayout Orientation="Vertical">
+
+                            <comcom:GroupBox x:Name="groupBox1">
+                                <StackLayout Orientation="Vertical">
+
+                                    <comcom:GroupBox x:Name="grpFileBackup">
+                                        <input:RadioButtonGroupView>
+                                            <input:RadioButton x:Name="radFBNone" />
+                                            <input:RadioButton x:Name="radFBOnlyPrev" />
+                                            <input:RadioButton x:Name="radFBEachRevision" />
+                                        </input:RadioButtonGroupView>
+                                    </comcom:GroupBox>
+
+                                    <StackLayout Orientation="Horizontal" Spacing="4">
+                                        <input:CheckBox x:Name="chkAutosave" />
+                                        <comcom:NumericStepper x:Name="numASMin" MaxValue="120" MinValue="1" WidthRequest="60" Value="1" />
+                                        <Label x:Name="lblMinutes" />
+                                    </StackLayout>
+
+                                    <StackLayout Orientation="Horizontal" Spacing="4">
+                                        <Label x:Name="lblBackupRevisionsMaxCount" />
+                                        <comcom:NumericStepper x:Name="numBackupRevisionsMaxCount" MaxValue="1000" MinValue="0" WidthRequest="80" Value="0" />
+                                    </StackLayout>
 
                                 </StackLayout>
                             </comcom:GroupBox>
@@ -72,33 +96,6 @@
                             <Label VerticalOptions="FillAndExpand" />
 
                         </StackLayout>
-
-                        <comcom:GroupBox x:Name="groupBox1">
-                            <StackLayout Orientation="Vertical">
-
-                                <comcom:GroupBox x:Name="grpFileBackup">
-                                    <input:RadioButtonGroupView>
-                                        <input:RadioButton x:Name="radFBNone" />
-                                        <input:RadioButton x:Name="radFBOnlyPrev" />
-                                        <input:RadioButton x:Name="radFBEachRevision" />
-                                    </input:RadioButtonGroupView>
-                                </comcom:GroupBox>
-
-                                <StackLayout Orientation="Horizontal" Spacing="4">
-                                    <input:CheckBox x:Name="chkAutosave" />
-                                    <comcom:NumericStepper x:Name="numASMin" MaxValue="120" MinValue="1" WidthRequest="60" Value="1" />
-                                    <Label x:Name="lblMinutes" />
-                                </StackLayout>
-
-                                <StackLayout Orientation="Horizontal" Spacing="4">
-                                    <Label x:Name="lblBackupRevisionsMaxCount" />
-                                    <comcom:NumericStepper x:Name="numBackupRevisionsMaxCount" MaxValue="1000" MinValue="0" WidthRequest="80" Value="0" />
-                                </StackLayout>
-
-                            </StackLayout>
-                        </comcom:GroupBox>
-
-                        <Label VerticalOptions="FillAndExpand" />
                     </StackLayout>
                 </xp:TabItem>
 
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/OrganizerWin.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/OrganizerWin.xaml.cs
index 5486c2a64..84efb8ece 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/OrganizerWin.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/OrganizerWin.xaml.cs
@@ -52,10 +52,6 @@ ISheetList IOrganizerWin.WebsList
 
         #endregion
 
-        public OrganizerWin() : this(null)
-        {
-        }
-
         public OrganizerWin(IBaseWindow baseWin)
         {
             InitializeComponent();
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/ParentsEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/ParentsEditDlg.xaml
index ffa6d79d6..84efaf5fb 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/ParentsEditDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/ParentsEditDlg.xaml
@@ -23,6 +23,13 @@
         <Frame x:Name="panCtlParents" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
             <StackLayout Orientation="Vertical">
                 <Grid x:Name="parentsTab" ColumnSpacing="4" RowSpacing="4">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
                     <Label x:Name="lblParents" Grid.Column="0" Grid.Row="0" />
                     <Entry x:Name="txtFather" IsEnabled="False" Grid.Column="1" Grid.Row="0" />
                     <Entry x:Name="txtMother" IsEnabled="False" Grid.Column="2" Grid.Row="0" />
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/PatriarchsViewerWin.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/PatriarchsViewerWin.xaml.cs
index 226cb7a27..d74704671 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/PatriarchsViewerWin.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/PatriarchsViewerWin.xaml.cs
@@ -42,10 +42,6 @@ public IWindow OwnerWindow
             get { return fBase; }
         }
 
-        public PatriarchsViewerWin() : this(null, 0)
-        {
-        }
-
         public PatriarchsViewerWin(IBaseWindow baseWin, int minGens)
         {
             InitializeComponent();
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/PersonEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/PersonEditDlg.xaml
index 0a5fb179e..7c4040457 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/PersonEditDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/PersonEditDlg.xaml
@@ -57,6 +57,13 @@
 
         <Frame Padding="8">
             <Grid x:Name="parentsTab" ColumnSpacing="4" RowSpacing="4">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
                 <Label x:Name="lblParents" Grid.Column="0" Grid.Row="0" />
                 <Entry x:Name="txtFather" IsEnabled="False" WidthRequest="100" Grid.Column="1" Grid.Row="0" />
                 <Entry x:Name="txtMother" IsEnabled="False" WidthRequest="100" Grid.Column="2" Grid.Row="0" />
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/QuickSearchDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/QuickSearchDlg.xaml.cs
index 4d2356411..c145de476 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/QuickSearchDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/QuickSearchDlg.xaml.cs
@@ -44,10 +44,6 @@ ITextBox IQuickSearchDlg.SearchPattern
 
         #endregion
 
-        public QuickSearchDlg() : this(null)
-        {
-        }
-
         public QuickSearchDlg(IWorkWindow workWindow)
         {
             InitializeComponent();
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/RepositoryEditDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/RepositoryEditDlg.xaml.cs
index 1abef4145..a0bfa9513 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/RepositoryEditDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/RepositoryEditDlg.xaml.cs
@@ -50,10 +50,6 @@ ITextBox IRepositoryEditDlg.Name
 
         #endregion
 
-        public RepositoryEditDlg() : this(null)
-        {
-        }
-
         public RepositoryEditDlg(IBaseWindow baseWin)
         {
             InitializeComponent();
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceCitEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceCitEditDlg.xaml
index c8b3c1ee9..4e50da3cd 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceCitEditDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceCitEditDlg.xaml
@@ -21,7 +21,7 @@
                         <Grid ColumnSpacing="4" RowSpacing="4" VerticalOptions="Start" HorizontalOptions="FillAndExpand">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
 
                             <Label x:Name="lblSource" Grid.Column="0" Grid.Row="0" />
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml.cs
index 6e6278b3d..2ae652d7f 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/SourceEditDlg.xaml.cs
@@ -82,10 +82,6 @@ ITextBox ISourceEditDlg.Text
 
         #endregion
 
-        public SourceEditDlg() : this(null)
-        {
-        }
-
         public SourceEditDlg(IBaseWindow baseWin)
         {
             InitializeComponent();
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/TTFamilyGroupsDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/TTFamilyGroupsDlg.xaml
index ab188e56d..d6557a227 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/TTFamilyGroupsDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/TTFamilyGroupsDlg.xaml
@@ -17,8 +17,7 @@
             <xp:TabViewControl.ItemSource>
                 <xp:TabItem x:Name="pageFamilyGroups">
                     <StackLayout Orientation="Vertical">
-                        <comcom:TreeView x:Name="tvGroups" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
-                        </comcom:TreeView>
+                        <comcom:TreeView x:Name="tvGroups" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" />
 
                         <StackLayout Spacing="4" Orientation="Horizontal" VerticalOptions="End" HorizontalOptions="FillAndExpand">
                             <Button x:Name="btnAnalyseGroups" Clicked="btnAnalyseGroups_Click" />
@@ -28,8 +27,7 @@
                 </xp:TabItem>
 
                 <xp:TabItem x:Name="pageDataQuality">
-                    <comcom:TreeMapViewer x:Name="fDataMap">
-                    </comcom:TreeMapViewer>
+                    <comcom:TreeMapViewer x:Name="fDataMap" />
                 </xp:TabItem>
             </xp:TabViewControl.ItemSource>
         </xp:TabViewControl>
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/TTPlacesManagerDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/TTPlacesManagerDlg.xaml
index 17b079c15..ab3964d7a 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/TTPlacesManagerDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/TTPlacesManagerDlg.xaml
@@ -16,7 +16,7 @@
         <StackLayout Style="{StaticResource dlgFooter}">
             <Button x:Name="btnAnalysePlaces" Clicked="btnAnalysePlaces_Click" />
             <Label x:Name="lblFilter" />
-            <Entry x:Name="txtFilter" Text="*" />
+            <Entry x:Name="txtFilter" Text="*"  WidthRequest="200"/>
             <Label HorizontalOptions="FillAndExpand" />
             <Button x:Name="btnIntoList" Clicked="btnIntoList_Click" />
         </StackLayout>
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/TTTreeCompareDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/TTTreeCompareDlg.xaml
index d0719d628..d686cf81d 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/TTTreeCompareDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/TTTreeCompareDlg.xaml
@@ -12,23 +12,25 @@
 
     <StackLayout Style="{StaticResource paddedDlg88}">
 
-        <input:RadioButtonGroupView x:Name="groupView">
-            <input:RadioButton x:Name="radMatchInternal" LabelPosition="After" IsChecked="True" Checked="rbtnMatch_CheckedChanged" />
+        <comcom:GroupBox x:Name="grpMatchType">
+            <input:RadioButtonGroupView x:Name="groupView">
+                <input:RadioButton x:Name="radMatchInternal" LabelPosition="After" IsChecked="True" Checked="rbtnMatch_CheckedChanged" />
 
-            <StackLayout Spacing="4" Orientation="Vertical">
-                <input:RadioButton x:Name="radMathExternal" LabelPosition="After" Checked="rbtnMatch_CheckedChanged" />
-                <StackLayout Spacing="4" Orientation="Horizontal">
-                    <Label x:Name="lblFile" />
-                    <Entry x:Name="txtCompareFile" IsEnabled="False" IsReadOnly="True" HorizontalOptions="FillAndExpand" />
-                    <Button x:Name="btnFileChoose" Style="{StaticResource dlgBtn}" IsEnabled="False" Clicked="btnFileChoose_Click" />
+                <StackLayout Spacing="4" Orientation="Vertical">
+                    <input:RadioButton x:Name="radMathExternal" LabelPosition="After" Checked="rbtnMatch_CheckedChanged" />
+                    <StackLayout Spacing="4" Orientation="Horizontal">
+                        <Label x:Name="lblFile" />
+                        <Entry x:Name="txtCompareFile" IsEnabled="False" IsReadOnly="True" HorizontalOptions="FillAndExpand" />
+                        <Button x:Name="btnFileChoose" Style="{StaticResource dlgBtn}" IsEnabled="False" Clicked="btnFileChoose_Click" />
+                    </StackLayout>
                 </StackLayout>
-            </StackLayout>
 
-            <StackLayout Spacing="4" Orientation="Horizontal">
-                <input:RadioButton x:Name="radAnalysis" LabelPosition="After" Checked="rbtnMatch_CheckedChanged" />
-                <Button x:Name="btnMatch" Style="{StaticResource dlgBtn}" Clicked="btnMatch_Click" />
-            </StackLayout>
-        </input:RadioButtonGroupView>
+                <StackLayout Spacing="4" Orientation="Horizontal">
+                    <input:RadioButton x:Name="radAnalysis" LabelPosition="After" Checked="rbtnMatch_CheckedChanged" />
+                    <Button x:Name="btnMatch" Style="{StaticResource dlgBtn}" Clicked="btnMatch_Click" />
+                </StackLayout>
+            </input:RadioButtonGroupView>
+        </comcom:GroupBox>
 
         <Editor x:Name="ListCompare" IsReadOnly="True" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" />
 
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/TreeChartWin.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/TreeChartWin.xaml.cs
index a414020a6..688aa15da 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/TreeChartWin.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/TreeChartWin.xaml.cs
@@ -93,10 +93,7 @@ public TreeChartWin(IBaseWindow baseWin)
 
             PopulateContextMenus();
 
-            /*miGensInfCommon.Checked = true;
-            miGensInfAncestors.Checked = true;
-            miGensInfDescendants.Checked = true;
-
+            /*
             miCertaintyIndex.Checked = fTreeBox.Options.CertaintyIndexVisible;
             fTreeBox.CertaintyIndex = fTreeBox.Options.CertaintyIndexVisible;
 
@@ -362,7 +359,6 @@ private async void miGensX_Click(object sender, EventArgs e)
         {
             var depthItem = await UIHelper.SelectItem(this, fGenItems);
             if (depthItem != null) {
-                //AppHost.StdDialogs.ShowMessage(depthItem.ToString());
                 fTreeBox.DepthLimitAncestors = depthItem.Tag;
                 fTreeBox.DepthLimitDescendants = depthItem.Tag;
                 GenChart();
@@ -373,7 +369,6 @@ private async void miGensXAncestors_Click(object sender, EventArgs e)
         {
             var depthItem = await UIHelper.SelectItem(this, fGenItems);
             if (depthItem != null) {
-                //AppHost.StdDialogs.ShowMessage(depthItem.ToString());
                 fTreeBox.DepthLimitAncestors = depthItem.Tag;
                 GenChart();
             }
@@ -383,7 +378,6 @@ private async void miGensXDescendants_Click(object sender, EventArgs e)
         {
             var depthItem = await UIHelper.SelectItem(this, fGenItems);
             if (depthItem != null) {
-                //AppHost.StdDialogs.ShowMessage(depthItem.ToString());
                 fTreeBox.DepthLimitDescendants = depthItem.Tag;
                 GenChart();
             }
@@ -409,7 +403,6 @@ private async void miBorderX_Click(object sender, EventArgs e)
         {
             var borderItem = await UIHelper.SelectItem(this, fBorderItems);
             if (borderItem != null) {
-                //AppHost.StdDialogs.ShowMessage(borderItem.ToString());
                 GlobalOptions.Instance.TreeChartOptions.BorderStyle = borderItem.Tag;
                 fTreeBox.Invalidate();
             }
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/UserRefEditDlg.xaml b/projects/GKvX/GEDKeeperX/GKUI/Forms/UserRefEditDlg.xaml
index 642bf52a7..9e84262d7 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/UserRefEditDlg.xaml
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/UserRefEditDlg.xaml
@@ -22,6 +22,8 @@
             </Grid.Children>
         </Grid>
 
+        <Label VerticalOptions="FillAndExpand" />
+
         <StackLayout Style="{StaticResource dlgFooter}">
             <Label HorizontalOptions="FillAndExpand" />
             <Button x:Name="btnAccept" Style="{StaticResource dlgBtn}" ImageSource="{plat:ImageResourceExt Resources.btn_accept.gif}" Clicked="AcceptClickHandler" />
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Forms/UserRefEditDlg.xaml.cs b/projects/GKvX/GEDKeeperX/GKUI/Forms/UserRefEditDlg.xaml.cs
index a268f530f..e5d74a164 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Forms/UserRefEditDlg.xaml.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Forms/UserRefEditDlg.xaml.cs
@@ -48,10 +48,6 @@ IComboBox IUserRefEditDlg.RefType
 
         #endregion
 
-        public UserRefEditDlg() : this(null)
-        {
-        }
-
         public UserRefEditDlg(IBaseWindow baseWin)
         {
             InitializeComponent();
diff --git a/projects/GKvX/GEDKeeperX/GKUI/Platform/XFGfxRenderer.cs b/projects/GKvX/GEDKeeperX/GKUI/Platform/XFGfxRenderer.cs
index 02b3d6494..6eb1cbb3a 100644
--- a/projects/GKvX/GEDKeeperX/GKUI/Platform/XFGfxRenderer.cs
+++ b/projects/GKvX/GEDKeeperX/GKUI/Platform/XFGfxRenderer.cs
@@ -61,9 +61,10 @@ public override void SetSmoothing(bool value)
 
         public override void DrawArc(IPen pen, float x, float y, float width, float height, float startAngle, float sweepAngle)
         {
-            /*Pen sdPen = ((PenHandler)pen).Handle;
-
-            fCanvas.DrawArc(sdPen, x, y, width, height, startAngle, sweepAngle);*/
+            if (pen != null) {
+                var skPaint = ((PenHandler)pen).Handle;
+                fCanvas.DrawArc(SKRect.Create(x, y, width, height), startAngle, sweepAngle, false, skPaint);
+            }
         }
 
         public override IImage LoadImage(string fileName)
@@ -240,15 +241,15 @@ public override IBrush CreateBrush(IColor color)
         public override IGfxPath CreateCirclePath(float x, float y, float width, float height)
         {
             var path = new SKPath();
-            var result = new GfxCirclePathHandler(path);
 
+            var result = new GfxCirclePathHandler(path);
             result.X = x;
             result.Y = y;
             result.Width = width;
             result.Height = height;
 
             path.Reset();
-            path.AddOval(new SKRect(x, y, width, height));
+            path.AddOval(SKRect.Create(x, y, width, height));
             path.Close();
 
             return result;
@@ -257,15 +258,43 @@ public override IGfxPath CreateCirclePath(float x, float y, float width, float h
         public override IGfxPath CreateCircleSegmentPath(int ctX, int ctY, float inRad, float extRad, float wedgeAngle, float ang1, float ang2)
         {
             var path = new SKPath();
-            var result = new GfxCircleSegmentPathHandler(path);
 
+            var result = new GfxCircleSegmentPathHandler(path);
             result.InRad = inRad;
             result.ExtRad = extRad;
             result.WedgeAngle = wedgeAngle;
             result.Ang1 = ang1;
             result.Ang2 = ang2;
 
-            //UIHelper.CreateCircleSegment(path, ctX, ctY, inRad, extRad, wedgeAngle, ang1, ang2);
+            float angCos, angSin;
+
+            float angval1 = (float)(ang1 * Math.PI / 180.0f);
+            angCos = (float)Math.Cos(angval1);
+            angSin = (float)Math.Sin(angval1);
+            float px1 = ctX + (inRad * angCos);
+            float py1 = ctY + (inRad * angSin);
+            float px2 = ctX + (extRad * angCos);
+            float py2 = ctY + (extRad * angSin);
+
+            float angval2 = (float)(ang2 * Math.PI / 180.0f);
+            angCos = (float)Math.Cos(angval2);
+            angSin = (float)Math.Sin(angval2);
+            float nx1 = ctX + (inRad * angCos);
+            float ny1 = ctY + (inRad * angSin);
+            float nx2 = ctX + (extRad * angCos);
+            float ny2 = ctY + (extRad * angSin);
+
+            float ir2 = inRad * 2.0f;
+            float er2 = extRad * 2.0f;
+
+            path.Reset();
+            path.MoveTo(px2, py2);
+            path.LineTo(px1, py1);
+            if (ir2 > 0) path.AddArc(SKRect.Create(ctX - inRad, ctY - inRad, ir2, ir2), ang1, wedgeAngle);
+            path.MoveTo(nx1, ny1);
+            path.LineTo(nx2, ny2);
+            path.AddArc(SKRect.Create(ctX - extRad, ctY - extRad, er2, er2), ang2, -wedgeAngle);
+            path.Close();
 
             return result;
         }