From 0e281a35790e5c0e19555d9a99928bd4a189b75a Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Thu, 29 Sep 2016 04:54:14 +0200
Subject: [PATCH] WIP

---
 .../BookAStar.Droid/BookAStar.Droid.csproj    |  14 +-
 BookAStar/BookAStar.Droid/MainActivity.cs     |  28 ++--
 BookAStar/BookAStar.Droid/packages.config     |   3 +-
 BookAStar/BookAStar/App.xaml                  |   3 +-
 BookAStar/BookAStar/App.xaml.cs               | 126 ++++++++++------
 BookAStar/BookAStar/BookAStar.csproj          |  76 +++++++---
 BookAStar/BookAStar/Constants.cs              |  26 ----
 .../BookAStar/Helpers/AvatarImageSource.cs    |  30 ----
 BookAStar/BookAStar/Helpers/DataManager.cs    |   6 +-
 BookAStar/BookAStar/Helpers/MainSettings.cs   |  39 ++++-
 BookAStar/BookAStar/Helpers/PageHelpers.cs    |  20 +++
 BookAStar/BookAStar/Helpers/UserHelpers.cs    |  28 ++++
 BookAStar/BookAStar/Images/icon_add_user.png  | Bin 0 -> 4702 bytes
 BookAStar/BookAStar/Images/icon_anon_user.png | Bin 0 -> 5372 bytes
 .../BookAStar/Images/icon_block_user.png      | Bin 0 -> 7195 bytes
 .../BookAStar/Images/icon_remove_user.png     | Bin 0 -> 4628 bytes
 BookAStar/BookAStar/Images/icon_user.png      | Bin 0 -> 4535 bytes
 .../BookAStar/Images/icon_user_settings.png   | Bin 0 -> 8437 bytes
 .../BookAStar/Interfaces/IBillingLine.cs      |  12 ++
 .../BookAStar/Interfaces/IBookQueryData.cs    |  15 ++
 BookAStar/BookAStar/Interfaces/IEstimate.cs   |  20 +++
 BookAStar/BookAStar/Model/Auth/User.cs        |  12 +-
 BookAStar/BookAStar/Model/BookQueryData.cs    |   5 +-
 .../BookAStar/Model/ClientProviderInfo.cs     |   9 +-
 .../{CommandLine.cs => BillingLine.cs}        |   5 +-
 .../BookAStar/Model/Workflow/Estimate.cs      |   5 +-
 .../BookAStar/Pages/AccountChooserPage.xaml   |  53 +++++++
 ...age.xaml.cs => AccountChooserPage.xaml.cs} |  45 +++---
 .../BookAStar/Pages/BookQueriesPage.xaml      |  12 +-
 .../BookAStar/Pages/BookQueriesPage.xaml.cs   |   4 +-
 BookAStar/BookAStar/Pages/BookQueryPage.xaml  |   3 +-
 .../BookAStar/Pages/BookQueryPage.xaml.cs     |   5 +-
 BookAStar/BookAStar/Pages/DashboardPage.xaml  |  53 +++++++
 .../BookAStar/Pages/DashboardPage.xaml.cs     |  45 ++++++
 ...itorPage.xaml => EditBillingLinePage.xaml} |  12 +-
 ...ge.xaml.cs => EditBillingLinePage.xaml.cs} |   5 +-
 .../BookAStar/Pages/EditEstimatePage.xaml     |  13 +-
 .../BookAStar/Pages/EditEstimatePage.xaml.cs  |   2 +-
 BookAStar/BookAStar/Pages/EventDetail.xaml    |  12 +-
 BookAStar/BookAStar/Pages/HomePage.xaml       |  17 +++
 BookAStar/BookAStar/Pages/HomePage.xaml.cs    |  18 +++
 BookAStar/BookAStar/Pages/SearchPage.xaml     |  12 +-
 BookAStar/BookAStar/Pages/SettingsPage.xaml   |  63 --------
 .../ViewModels/BillingLineViewModel.cs        |  78 ++++++++++
 .../ViewModels/BookQueryViewModel.cs          |   5 +-
 .../ViewModels/DashboardViewModel.cs          | 137 ++++++++++++++++++
 .../BookAStar/ViewModels/EstimateViewModel.cs |  91 ++++++++++++
 .../BookAStar/ViewModels/SettingsViewModel.cs |  11 --
 .../ViewModels/UserLoginViewModel.cs          |  14 ++
 .../BookAStar/ViewModels/ViewModelBase.cs     |   1 +
 BookAStar/BookAStar/icon-anon.png             | Bin 1031 -> 0 bytes
 BookAStar/BookAStar/packages.config           |   6 +-
 52 files changed, 919 insertions(+), 280 deletions(-)
 delete mode 100644 BookAStar/BookAStar/Helpers/AvatarImageSource.cs
 create mode 100644 BookAStar/BookAStar/Helpers/PageHelpers.cs
 create mode 100644 BookAStar/BookAStar/Helpers/UserHelpers.cs
 create mode 100644 BookAStar/BookAStar/Images/icon_add_user.png
 create mode 100644 BookAStar/BookAStar/Images/icon_anon_user.png
 create mode 100644 BookAStar/BookAStar/Images/icon_block_user.png
 create mode 100644 BookAStar/BookAStar/Images/icon_remove_user.png
 create mode 100644 BookAStar/BookAStar/Images/icon_user.png
 create mode 100644 BookAStar/BookAStar/Images/icon_user_settings.png
 create mode 100644 BookAStar/BookAStar/Interfaces/IBillingLine.cs
 create mode 100644 BookAStar/BookAStar/Interfaces/IBookQueryData.cs
 create mode 100644 BookAStar/BookAStar/Interfaces/IEstimate.cs
 rename BookAStar/BookAStar/Model/Workflow/{CommandLine.cs => BillingLine.cs} (64%)
 create mode 100644 BookAStar/BookAStar/Pages/AccountChooserPage.xaml
 rename BookAStar/BookAStar/Pages/{SettingsPage.xaml.cs => AccountChooserPage.xaml.cs} (67%)
 create mode 100644 BookAStar/BookAStar/Pages/DashboardPage.xaml
 create mode 100644 BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
 rename BookAStar/BookAStar/Pages/{CommandLineEditorPage.xaml => EditBillingLinePage.xaml} (80%)
 rename BookAStar/BookAStar/Pages/{CommandLineEditorPage.xaml.cs => EditBillingLinePage.xaml.cs} (67%)
 create mode 100644 BookAStar/BookAStar/Pages/HomePage.xaml
 create mode 100644 BookAStar/BookAStar/Pages/HomePage.xaml.cs
 delete mode 100644 BookAStar/BookAStar/Pages/SettingsPage.xaml
 create mode 100644 BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
 create mode 100644 BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
 create mode 100644 BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
 delete mode 100644 BookAStar/BookAStar/ViewModels/SettingsViewModel.cs
 create mode 100644 BookAStar/BookAStar/ViewModels/UserLoginViewModel.cs
 delete mode 100644 BookAStar/BookAStar/icon-anon.png

diff --git a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
index 52765a5e..cf995dc5 100644
--- a/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
+++ b/BookAStar/BookAStar.Droid/BookAStar.Droid.csproj
@@ -71,7 +71,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="GoogleMediaFramework">
@@ -202,7 +202,7 @@
       <HintPath>..\..\Components\xamarin.auth-1.2.3.1\lib\android\Xamarin.Auth.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Labs, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
@@ -218,15 +218,15 @@
       <HintPath>..\..\..\..\Visual Studio 2015\Projects\App2\packages\Xamarin.Forms.Maps.2.3.0.107\lib\MonoAndroid10\Xamarin.Forms.Maps.Android.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.GooglePlayServices.Ads, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -444,11 +444,11 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets'))" />
     <Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
   </Target>
   <Import Project="..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\build\Xamarin.GooglePlayServices.Basement.targets')" />
   <Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
      Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/BookAStar/BookAStar.Droid/MainActivity.cs b/BookAStar/BookAStar.Droid/MainActivity.cs
index 2f049a1a..ebbab814 100644
--- a/BookAStar/BookAStar.Droid/MainActivity.cs
+++ b/BookAStar/BookAStar.Droid/MainActivity.cs
@@ -41,7 +41,7 @@ using XLabs.Caching;
 
 namespace BookAStar.Droid
 {
-    [Activity(Name="fr.pschneider.bas.MainActivity", Label = "BookAStar", Icon = "@drawable/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+    [Activity(Name="fr.pschneider.bas.MainActivity", Label = "BookAStar", Theme = "@style/MainTheme", Icon = "@drawable/icon", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
     public class MainActivity :
         XFormsApplicationDroid,
         // was global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity,
@@ -51,23 +51,23 @@ namespace BookAStar.Droid
         {
             base.OnCreate(bundle);
 
-           // Window.RequestFeature(Android.Views.WindowFeatures.ActionBar);
-
             if (Build.VERSION.SdkInt >= BuildVersionCodes.Kitkat)
             {
                 Android.Webkit.WebView.SetWebContentsDebuggingEnabled(true);
             }
 
-            // no Resolver.IsSet
+            IXFormsApp<XFormsApplicationDroid> app =null;
             if (!Resolver.IsSet)
             {
                 this.SetIoc();
             }
             else
             {
-                var app = Resolver.Resolve<IXFormsApp>() as IXFormsApp<XFormsApplicationDroid>;
-                if (app != null) app.AppContext = this;
+                app = Resolver.Resolve<IXFormsApp>() as IXFormsApp<XFormsApplicationDroid>;
+                if (app != null)
+                    app.AppContext = this;
             }
+
             global::Xamarin.Forms.Forms.Init(this, bundle);
             global::Xamarin.FormsMaps.Init(this, bundle);
 
@@ -86,14 +86,14 @@ namespace BookAStar.Droid
             // Theme.ApplyStyle(Resource.Style.MainTheme, false);
 
             // XmlREader tb = Resources.GetLayout(Resource.Layout.Toolbar);
-            var tb = new Toolbar(this.BaseContext);
-
-            this.SetActionBar(tb);
+            // FIXME Why does Forms try to theme this toolbar?
+             var tb = new Toolbar(this.BaseContext);
+             this.SetActionBar(tb);
             
             LoadApplication(new BookAStar.App(this));
-            /*
             // TabLayoutResource = Resource.Layout.Tabbar;
             // ToolbarResource = Resource.Layout.Toolbar;
+            /*
             base.OnCreate(bundle);
             global::Xamarin.Forms.Forms.Init(this, bundle);
             global::Xamarin.FormsMaps.Init(this, bundle);
@@ -112,8 +112,8 @@ namespace BookAStar.Droid
 
             app.Init(this);
 
-            var documents = app.AppDataDirectory;
-            var pathToDatabase = Path.Combine(documents, "xforms.db");
+           var documents = app.AppDataDirectory;
+           var pathToDatabase = Path.Combine(documents, "xforms.db");
 
             resolverContainer.Register<IDevice>(t => AndroidDevice.CurrentDevice)
                 .Register<IDisplay>(t => t.Resolve<IDevice>().Display)
@@ -127,8 +127,6 @@ namespace BookAStar.Droid
                 .Register<ICacheProvider>(
                     t => new SQLiteSimpleCache(new SQLitePlatformAndroid(),
                         new SQLiteConnectionString(pathToDatabase, true), t.Resolve<IJsonSerializer>()));
-
-
             Resolver.SetResolver(resolverContainer.GetResolver());
         }
 
@@ -199,7 +197,7 @@ namespace BookAStar.Droid
             {
                 Task.Run(async () =>
                 {
-                    App.CurrentApp.ShowBookQuery(
+                    App.ShowBookQuery(
                        await DataManager.Current.BookQueries.Get(queryId));
                 });
             }
diff --git a/BookAStar/BookAStar.Droid/packages.config b/BookAStar/BookAStar.Droid/packages.config
index b25e9b63..44911c6e 100644
--- a/BookAStar/BookAStar.Droid/packages.config
+++ b/BookAStar/BookAStar.Droid/packages.config
@@ -5,7 +5,6 @@
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
   <package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid70" />
   <package id="Plugin.Permissions" version="1.1.7" targetFramework="monoandroid70" />
-  <package id="Scorchio.NinjaCoder.Xamarin.Forms.Labs" version="2.0.0" targetFramework="monoandroid70" />
   <package id="SQLite.Net.Async-PCL" version="3.1.1" targetFramework="monoandroid70" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="monoandroid70" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="monoandroid70" />
@@ -23,7 +22,7 @@
   <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Controls.SignaturePad" version="1.4.0" targetFramework="monoandroid70" />
-  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="monoandroid70" />
+  <package id="Xamarin.Forms" version="2.3.0.34-pre1" targetFramework="monoandroid70" />
   <package id="Xamarin.Forms.Labs" version="1.0.1.0" targetFramework="monoandroid70" />
   <package id="Xamarin.GooglePlayServices.Ads" version="29.0.0.2" targetFramework="monoandroid41" />
   <package id="Xamarin.GooglePlayServices.Analytics" version="29.0.0.2" targetFramework="monoandroid41" />
diff --git a/BookAStar/BookAStar/App.xaml b/BookAStar/BookAStar/App.xaml
index 9b6d74a0..23898b58 100644
--- a/BookAStar/BookAStar/App.xaml
+++ b/BookAStar/BookAStar/App.xaml
@@ -40,14 +40,13 @@
         <Setter Property="FontAttributes" Value="Italic" />
         <Setter Property="HorizontalOptions" Value="Center" />
         <Setter Property="TextColor" Value="{StaticResource GroupingTextColor}" />
+        <Setter Property="VerticalOptions" Value="Start" />
       </Style>
       
       <Style x:Key="LabelStyle" TargetType="Label">
         <Setter Property="TextColor" Value="{StaticResource TextColor}" />
         <Setter Property="FontAttributes" Value="Bold" />
         <Setter Property="FontSize" Value="{StaticResource MediumFontSize}" />
-        <Setter Property="VerticalOptions" Value="Start" />
-        <Setter Property="HorizontalOptions" Value="Start" />
         <Setter Property="LineBreakMode" Value="WordWrap" />
       </Style>
 
diff --git a/BookAStar/BookAStar/App.xaml.cs b/BookAStar/BookAStar/App.xaml.cs
index 40882687..b8de6756 100644
--- a/BookAStar/BookAStar/App.xaml.cs
+++ b/BookAStar/BookAStar/App.xaml.cs
@@ -11,7 +11,9 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Xamarin.Forms;
+using XLabs.Forms.Controls;
 using XLabs.Forms.Mvvm;
+using XLabs.Forms.Pages;
 using XLabs.Forms.Services;
 using XLabs.Ioc;
 using XLabs.Platform.Mvvm;
@@ -30,16 +32,30 @@ namespace BookAStar
     {
         public static IPlatform PlatformSpecificInstance { get; set; }
         public static string AppName { get; set; }
+
+        public void ShowQueries()
+        {
+            masterDetail.Detail = bQueriesPage;
+            masterDetail.SendBackButtonPressed();
+        }
+        public void ShowAccounts()
+        {
+            masterDetail.Detail = accChooserPage;
+            masterDetail.SendBackButtonPressed();
+        }
+        // Exists in order to dispose of a static instance strongly typed
+        // TODO : replace all references to this field
+        // by Views resolution, and then, drop it
         public static App CurrentApp { get { return Current as App; } }
-        public DataManager DataManager { get; set; } = new DataManager();
+
         public static void Init()
         {
             var app = Resolver.Resolve<IXFormsApp>();
+            
             if (app == null)
             {
                 return;
             }
-            // navigation registration
 
             app.Closing += (o, e) => Debug.WriteLine("Application Closing");
             app.Error += (o, e) => Debug.WriteLine("Application Error");
@@ -48,42 +64,56 @@ namespace BookAStar
             app.Rotation += (o, e) => Debug.WriteLine("Application Rotated");
             app.Startup += (o, e) => Debug.WriteLine("Application Startup");
             app.Suspended += (o, e) => Debug.WriteLine("Application Suspended");
-            
+
         }
+        public void Configure(IXFormsApp app)
+        {
+            ViewFactory.EnableCache = true;
+            ViewFactory.Register<DashboardPage, DashboardViewModel>(
+                 resolver => new DashboardViewModel());
+            ViewFactory.Register<BookQueryPage, BookQueryViewModel>();
+            ViewFactory.Register<EditBillingLinePage, BillingLineViewModel>();
+            ViewFactory.Register<EditEstimatePage, EstimateViewModel>();
+        }
+
+
+        ExtendedMasterDetailPage masterDetail;
 
         public App(IPlatform instance)
         {
             PlatformSpecificInstance = instance;
             InitializeComponent();
             Init();
-            MainPage = GetMainPage();
+            BuildMainPage();
         }
+        BookQueriesPage bQueriesPage;
+        AccountChooserPage accChooserPage;
+        HomePage home;
 
-        public static Page GetMainPage()
+        private void BuildMainPage()
         {
-            ViewFactory.Register<SettingsPage,SettingsViewModel>();
-            ViewFactory.Register<BookQueryPage, BookQueryViewModel>(
-                resolver => new BookQueryViewModel ()
-                );
-           
-            var bQueriesPage = new BookQueriesPage
+            accChooserPage = new AccountChooserPage();
+
+            bQueriesPage = new BookQueriesPage
             {
                 BindingContext = DataManager.Current.BookQueries,
                 Title = "Demandes"
             };
 
-            //  var mainPage = new NavigationPage(bQueriesPage);
+            home = new HomePage() { Title = "Accueil" };
 
-            var mainPage = new XLabs.Forms.Pages.ExtendedMasterDetailPage() {
+            // var mainPage = new NavigationPage(bQueriesPage);
+            /*
+            masterDetail = new ExtendedMasterDetailPage() {
                 Title="MainPAge"
             };
 
-            mainPage.Master = bQueriesPage;
-            mainPage.Detail = new SettingsPage();
-            
-            Resolver.Resolve<IDependencyContainer>()
-                .Register<INavigationService>(t => new NavigationService(mainPage.Navigation));
+            masterDetail.Master = new DashboardPage {
+                Title = "Bookingstar",
+                BindingContext = new DashboardViewModel() };
+            masterDetail.Detail = new HomePage { Title = "Accueil" };
 
+            */
             ToolbarItem tiSetts = new ToolbarItem()
             {
                 Text = "Paramètres",
@@ -95,9 +125,11 @@ namespace BookAStar
                 Text = "Accueil",
                 Icon = "icon.png"
             };
-            mainPage.ToolbarItems.Add(tiHome);
-            mainPage.ToolbarItems.Add(tiSetts);
-            return mainPage;
+
+          
+
+
+
 
             /*     searchPage = new SearchPage
                  {
@@ -161,13 +193,33 @@ namespace BookAStar
                  };
                  MainPage = Navigation;
                  */
+            var mainTab = new ExtendedTabbedPage()
+            {
+                Title = "XLabs",
+                SwipeEnabled = true,
+                TintColor = Color.White,
+                BarTintColor = Color.Blue,
+                Badges = { "1", "2", "3" },
+                TabBarBackgroundImage = "visuel_sexion.png",
+                TabBarSelectedImage = "icon.png",
+            };
+
+            var navPage = new NavigationPage(bQueriesPage);
+            //var navPage = new NavigationPage(mainTab);
+            
+            navPage.ToolbarItems.Add(tiHome);
+            navPage.ToolbarItems.Add(tiSetts);
 
+            this.MainPage = navPage;
 
+            Resolver.Resolve<IDependencyContainer>()
+                .Register<INavigationService>(t => new NavigationService(navPage.Navigation))
+                ;
         }
 
-        internal void EditCommandLine(Page parentPage, CommandLine com)
+        internal void EditCommandLine(Page parentPage, BillingLine com)
         {
-            CommandLineEditorPage editCommandLine = new CommandLineEditorPage
+            EditBillingLinePage editCommandLine = new EditBillingLinePage
             {
                 Title = "Edition d'une ligne de facture",
                 BindingContext = com
@@ -181,26 +233,12 @@ namespace BookAStar
                 "gcm/register",
                 PlatformSpecificInstance.GetDeviceInfo());
         }
-
-        public void ShowBookQuery(BookQueryData data)
-        {
-            BookQueryPage bookQueryPage = new BookQueryPage
-            {
-                Title = "Demande de devis",
-                BindingContext = data
-            };
-           ShowPage(bookQueryPage);
-        }
-
-        public void EditEstimate(Estimate data)
+        
+        public static void ShowBookQuery (BookQueryData query)
         {
-            throw new NotImplementedException();
-            EditEstimatePage editEstimate = new EditEstimatePage
-            {
-                Title = "Création d'un devis"
-            };
-            editEstimate.Estimate = data;
-            // ShowPage(editEstimate);
+           var page = ViewFactory.CreatePage<BookQueryViewModel
+                , BookQueryPage>(null, new BookQueryViewModel(query));
+           App.Current.MainPage.Navigation.PushAsync(page as Page);
         }
 
         // TODO système de persistance de l'état de l'appli
@@ -212,12 +250,12 @@ namespace BookAStar
         /// <param name="parentPage">Parent Page</param>
         /// <param name="pageType">Type of page to show</param>
         /// <returns></returns>
-        private static async Task ShowPage(VisualElement parentPage, Type pageType)
+        public static async Task ShowPage(VisualElement parentPage, Type pageType)
         {
             // Get all the constructors of the page type.
             var constructors = pageType.GetTypeInfo().DeclaredConstructors;
 
-            foreach ( var page in
+            foreach (var page in
                     from constructor in constructors
                     where constructor.GetParameters().Length == 0
                     select (Page)constructor.Invoke(null))
diff --git a/BookAStar/BookAStar/BookAStar.csproj b/BookAStar/BookAStar/BookAStar.csproj
index b2216ffc..f75de879 100644
--- a/BookAStar/BookAStar/BookAStar.csproj
+++ b/BookAStar/BookAStar/BookAStar.csproj
@@ -42,16 +42,20 @@
     </Compile>
     <Compile Include="Constants.cs" />
     <Compile Include="Factories\ViewFactory.cs" />
-    <Compile Include="Helpers\AvatarImageSource.cs" />
     <Compile Include="Helpers\DataManager.cs" />
+    <Compile Include="Helpers\PageHelpers.cs" />
     <Compile Include="Helpers\PropertySupport.cs" />
     <Compile Include="Helpers\RemoteEntityRO.cs" />
     <Compile Include="Helpers\Settings.cs" />
+    <Compile Include="Helpers\UserHelpers.cs" />
     <Compile Include="Interfaces\IComponentContext.cs" />
     <Compile Include="Interfaces\IMDEditor.cs" />
     <Compile Include="Interfaces\IModelViewModel.cs" />
     <Compile Include="Interfaces\IViewFactory.cs" />
     <Compile Include="Model\ClientProviderInfo.cs" />
+    <Compile Include="Interfaces\IBookQueryData.cs" />
+    <Compile Include="Interfaces\IBillingLine.cs" />
+    <Compile Include="Interfaces\IEstimate.cs" />
     <Compile Include="Pages\BlogPage.cs" />
     <Compile Include="Pages\BookQueriesPage.xaml.cs">
       <DependentUpon>BookQueriesPage.xaml</DependentUpon>
@@ -59,8 +63,11 @@
     <Compile Include="Pages\BookQueryPage.xaml.cs">
       <DependentUpon>BookQueryPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\CommandLineEditorPage.xaml.cs">
-      <DependentUpon>CommandLineEditorPage.xaml</DependentUpon>
+    <Compile Include="Pages\EditBillingLinePage.xaml.cs">
+      <DependentUpon>EditBillingLinePage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Pages\DashboardPage.xaml.cs">
+      <DependentUpon>DashboardPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Pages\EventDetail.xaml.cs">
       <DependentUpon>EventDetail.xaml</DependentUpon>
@@ -72,7 +79,7 @@
     <Compile Include="Model\Blog\BlogTag.cs" />
     <Compile Include="Model\BookQueryData.cs" />
     <Compile Include="Model\Market\BaseProduct.cs" />
-    <Compile Include="Model\Workflow\CommandLine.cs" />
+    <Compile Include="Model\Workflow\BillingLine.cs" />
     <Compile Include="Model\Manager.cs" />
     <Compile Include="Model\Auth\MobileAppDeclaration.cs" />
     <Compile Include="Model\Auth\passwrecovery.cs" />
@@ -110,10 +117,16 @@
     <Compile Include="Pages\EditEstimatePage.xaml.cs">
       <DependentUpon>EditEstimatePage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\HomePage.xaml.cs">
+      <DependentUpon>HomePage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\PinPage.cs" />
     <Compile Include="ViewModels\BookQueriesViewModel.cs" />
     <Compile Include="ViewModels\BookQueryViewModel.cs" />
-    <Compile Include="ViewModels\SettingsViewModel.cs" />
+    <Compile Include="ViewModels\BillingLineViewModel.cs" />
+    <Compile Include="ViewModels\DashboardViewModel.cs" />
+    <Compile Include="ViewModels\EstimateViewModel.cs" />
+    <Compile Include="ViewModels\UserLoginViewModel.cs" />
     <Compile Include="ViewModels\ViewModelBase.cs" />
     <Compile Include="Views\CommandLineEditor.xaml.cs">
       <DependentUpon>CommandLineEditor.xaml</DependentUpon>
@@ -123,8 +136,8 @@
     <Compile Include="Pages\SearchPage.xaml.cs">
       <DependentUpon>SearchPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\SettingsPage.xaml.cs">
-      <DependentUpon>SettingsPage.xaml</DependentUpon>
+    <Compile Include="Pages\AccountChooserPage.xaml.cs">
+      <DependentUpon>AccountChooserPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Model\Tag.cs" />
   </ItemGroup>
@@ -137,7 +150,9 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="GettingStarted.Xamarin" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\EventDetail.xaml">
@@ -148,7 +163,7 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Pages\SettingsPage.xaml">
+    <EmbeddedResource Include="Pages\AccountChooserPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -186,19 +201,23 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Maps, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.Maps.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Maps.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Xamarin.Forms.2.3.0.34-pre1\lib\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="XLabs.Caching, Version=2.2.0.38182, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Caching.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Caching.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="XLabs.Core, Version=2.2.0.38178, Culture=neutral, processorArchitecture=MSIL">
@@ -221,6 +240,10 @@
       <HintPath>..\..\packages\XLabs.Serialization.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="XLabs.Serialization.Json.NET, Version=2.2.0.38187, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XLabs.Serialization.JSON.2.2.0-pre05\lib\portable-net45+netcore45+wpa81+wp8+monoandroid+monotouch+xamarinios10+xamarinmac\XLabs.Serialization.Json.NET.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\BookQueryPage.xaml">
@@ -247,27 +270,44 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="icon-anon.png" />
+    <EmbeddedResource Include="Views\CommandLineEditor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Views\CommandLineEditor.xaml">
+    <EmbeddedResource Include="Pages\EditBillingLinePage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\DashboardPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Pages\CommandLineEditorPage.xaml">
+    <EmbeddedResource Include="Images\icon_add_user.png" />
+    <EmbeddedResource Include="Images\icon_anon_user.png" />
+    <EmbeddedResource Include="Images\icon_block_user.png" />
+    <EmbeddedResource Include="Images\icon_remove_user.png" />
+    <EmbeddedResource Include="Images\icon_user.png" />
+    <EmbeddedResource Include="Images\icon_user_settings.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pages\HomePage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-  <Import Project="..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
+  <Import Project="..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.0.34-pre1\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BookAStar/BookAStar/Constants.cs b/BookAStar/BookAStar/Constants.cs
index 078b40f3..c0f23f2c 100644
--- a/BookAStar/BookAStar/Constants.cs
+++ b/BookAStar/BookAStar/Constants.cs
@@ -21,31 +21,5 @@ namespace BookAStar
 
         #endregion
 
-        #region Colors & sizes
-        [Obsolete]
-        public static readonly Thickness PagePadding =
-            new Thickness(5, Device.OnPlatform(20, 20, 20), 5, 5);
-
-        [Obsolete]
-        public static readonly Thickness DefaultPadding =
-            new Thickness(5, Device.OnPlatform(20, 20, 20), 3, 3);
-
-        [Obsolete]
-        public static readonly Font TitleFont =
-            Font.SystemFontOfSize(Device.OnPlatform(50, 50, 50), FontAttributes.Bold);
-
-        [Obsolete]
-        public static readonly Color OddBackgroundColor =
-            Device.OnPlatform(Color.Aqua, Color.Aqua, Color.Aqua);
-
-        [Obsolete]
-        public static readonly Color ForegroundColor =
-            Device.OnPlatform(Color.White, Color.White, Color.White);
-
-        [Obsolete]
-        public static readonly Color BackgroundColor =
-            Device.OnPlatform(Color.Black, Color.White, Color.White);
-
-        #endregion
     }
 }
diff --git a/BookAStar/BookAStar/Helpers/AvatarImageSource.cs b/BookAStar/BookAStar/Helpers/AvatarImageSource.cs
deleted file mode 100644
index 6b511b87..00000000
--- a/BookAStar/BookAStar/Helpers/AvatarImageSource.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-
-namespace BookAStar
-{
-    [ContentProperty("Source")]
-    public class MyExtension : IMarkupExtension
-    {
-        public string Source { get; set; }
-
-        public object ProvideValue(IServiceProvider serviceProvider)
-        {
-            
-            // Do your translation lookup here, using whatever method you require
-            
-            if (Source != null)
-            {
-                if (Source.StartsWith("res://"))
-                    return ImageSource.FromResource(Source.Substring(6));
-                return ImageSource.FromUri(new Uri(Source));
-            }
-            return ImageSource.FromResource("BookAStar.icon-anon.png");
-        }
-    }
-}
diff --git a/BookAStar/BookAStar/Helpers/DataManager.cs b/BookAStar/BookAStar/Helpers/DataManager.cs
index 66a73427..14c7f9ca 100644
--- a/BookAStar/BookAStar/Helpers/DataManager.cs
+++ b/BookAStar/BookAStar/Helpers/DataManager.cs
@@ -17,12 +17,12 @@ namespace BookAStar.Helpers
         public RemoteEntity<Estimate, long> Estimates { get; set; }
         public RemoteEntity<Blog, long> Blogspot { get; set; }
         public LocalEntity<ClientProviderInfo,string> Contacts { get; set; }
-        
-        public static DataManager Current
+        protected static DataManager current = new DataManager();
+        public static DataManager Current 
         {
             get
             {
-                return App.CurrentApp.DataManager;
+                return current;
             }
         }
 
diff --git a/BookAStar/BookAStar/Helpers/MainSettings.cs b/BookAStar/BookAStar/Helpers/MainSettings.cs
index 974f33ee..63151925 100644
--- a/BookAStar/BookAStar/Helpers/MainSettings.cs
+++ b/BookAStar/BookAStar/Helpers/MainSettings.cs
@@ -31,9 +31,10 @@ namespace BookAStar
 
 		private const string userNameKey = "user_id";
 		private const string PushNotificationsKey = "pushNotifs";
+        private const string AllowGPSUsageKey = "allowGPSUsage";
         private const string UserListsKey = "userList";
         private const string GoogleRegIdKey = "googleRedId";
-
+        private const string AllowProBookingOnlyKey = "allowProBookingOnly";
         
 
         private static readonly string UserIdDefault = 
@@ -149,7 +150,7 @@ namespace BookAStar
                         App.CurrentApp.PostDeviceInfo();
                     }
                 }
-                // TODO else Unregister the device
+                // TODO else Unregister this device
             }
         }
 
@@ -175,13 +176,45 @@ namespace BookAStar
 					PushNotificationsDefault);
 			}
 			set { 
+                // TODO Stop Broadcast receiver
 				AppSettings.AddOrUpdateValue<bool> (
 					PushNotificationsKey,
 					value);
             }
 		}
 
-		public static void SetMusical (string key, double value)
+        public static bool AllowGPSUsage
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault<bool>(
+                    AllowGPSUsageKey,
+                    PushNotificationsDefault);
+            }
+            set
+            {
+                AppSettings.AddOrUpdateValue<bool>(
+                    AllowGPSUsageKey,
+                    value);
+            }
+        }
+        // TODO make it a server side user's parameter
+        public static bool AllowProBookingOnly
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault<bool>(
+                    AllowProBookingOnlyKey,
+                    PushNotificationsDefault);
+            }
+            set
+            {
+                AppSettings.AddOrUpdateValue<bool>(
+                    AllowProBookingOnlyKey,
+                    value);
+            }
+        }
+        public static void SetMusical (string key, double value)
 		{
 			AppSettings.AddOrUpdateValue <double> (MusicalKey + key, value);
 		}
diff --git a/BookAStar/BookAStar/Helpers/PageHelpers.cs b/BookAStar/BookAStar/Helpers/PageHelpers.cs
new file mode 100644
index 00000000..194dbac8
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/PageHelpers.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace BookAStar.Helpers
+{
+    public  static class PageHelpers
+    {
+        public static async Task<bool> Confirm(this Page page, string title, string procedure)
+        {
+            string yes = "Oui", no = "Non";
+            var answer = await page.DisplayAlert(title,
+               procedure, yes, no);
+            return answer;
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/Helpers/UserHelpers.cs b/BookAStar/BookAStar/Helpers/UserHelpers.cs
new file mode 100644
index 00000000..f1d43366
--- /dev/null
+++ b/BookAStar/BookAStar/Helpers/UserHelpers.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace BookAStar.Helpers
+{
+    public static class UserHelpers
+    {
+        public static ImageSource Avatar(string avatarPath)
+        {
+            /*foreach (var r in App.Current.Resources)
+            {
+                Debug.WriteLine($"#R# {r.Key} : {r.GetType().Name}");
+            }*/
+            var result = avatarPath == null ?
+                ImageSource.FromResource(/* "BookAStar.icon_user.png" */ "BookAStar.Images.icon_user.png") :
+                avatarPath.StartsWith("res://") ?
+                 ImageSource.FromResource(avatarPath.Substring(6)) :
+                 ImageSource.FromUri(new Uri(avatarPath));
+            var test = ImageSource.FromResource("none.resource.png");
+            return result;
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/Images/icon_add_user.png b/BookAStar/BookAStar/Images/icon_add_user.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c0a43cc5f5f66a6cdfd530610c4ef75d05a264c
GIT binary patch
literal 4702
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

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/icon_anon_user.png b/BookAStar/BookAStar/Images/icon_anon_user.png
new file mode 100644
index 0000000000000000000000000000000000000000..43ce1300377cb3c676f57dc4005e0d4a339e30ef
GIT binary patch
literal 5372
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
a>i+>#D-De}v*$+u0000<MNUMnLSTYUGInPG

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/icon_block_user.png b/BookAStar/BookAStar/Images/icon_block_user.png
new file mode 100644
index 0000000000000000000000000000000000000000..50566f2be19a6a42490dc7c60313d1839f4fc130
GIT binary patch
literal 7195
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
Q-*_M;d3Cum8KWQn16mvtfB*mh

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/icon_remove_user.png b/BookAStar/BookAStar/Images/icon_remove_user.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb463901d261ff525da28b83cd1fc3695ef23b9c
GIT binary patch
literal 4628
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
KMNUMnLSTZ;<i|z;

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/icon_user.png b/BookAStar/BookAStar/Images/icon_user.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1ffbf1e7b544fdebf707a0507a85d821d9afdce
GIT binary patch
literal 4535
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
Vv73JOc_sh=002ovPDHLkV1kSl$1eZ?

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Images/icon_user_settings.png b/BookAStar/BookAStar/Images/icon_user_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..3de9e7cfe078e39e29655ea47843b099357f0aa2
GIT binary patch
literal 8437
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
WMMSWb!tn}R0R*9<q5MJ7GVFgBaa@l8

literal 0
HcmV?d00001

diff --git a/BookAStar/BookAStar/Interfaces/IBillingLine.cs b/BookAStar/BookAStar/Interfaces/IBillingLine.cs
new file mode 100644
index 00000000..929a7f67
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/IBillingLine.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace BookAStar.Interfaces
+{
+    public interface IBillingLine
+    {
+        int Count { get; set; }
+        string Description { get; set; }
+        TimeSpan Duration { get; set; }
+        decimal UnitaryCost { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Interfaces/IBookQueryData.cs b/BookAStar/BookAStar/Interfaces/IBookQueryData.cs
new file mode 100644
index 00000000..8728fa36
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/IBookQueryData.cs
@@ -0,0 +1,15 @@
+using System;
+using BookAStar.Model.Social;
+using BookAStar.Model;
+
+namespace BookAStar.Interfaces
+{
+    public interface IBookQueryData
+    {
+        ClientProviderInfo Client { get; set; }
+        DateTime EventDate { get; set; }
+        long Id { get; set; }
+        Location Location { get; set; }
+        decimal? Previsionnal { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Interfaces/IEstimate.cs b/BookAStar/BookAStar/Interfaces/IEstimate.cs
new file mode 100644
index 00000000..23726fdc
--- /dev/null
+++ b/BookAStar/BookAStar/Interfaces/IEstimate.cs
@@ -0,0 +1,20 @@
+using BookAStar.Model.Workflow;
+using System.Collections.Generic;
+
+namespace BookAStar.Model.Interfaces
+{
+    public interface IEstimate
+    {
+        List<string> AttachedFiles { get; set; }
+        List<string> AttachedGraphicList { get; }
+        List<BillingLine> Bill { get; set; }
+        string ClientId { get; set; }
+        long? CommandId { get; set; }
+        string CommandType { get; set; }
+        string Description { get; set; }
+        long Id { get; set; }
+        string OwnerId { get; set; }
+        int? Status { get; set; }
+        string Title { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Model/Auth/User.cs b/BookAStar/BookAStar/Model/Auth/User.cs
index a22ef519..78de9113 100644
--- a/BookAStar/BookAStar/Model/Auth/User.cs
+++ b/BookAStar/BookAStar/Model/Auth/User.cs
@@ -1,11 +1,12 @@
-using System;
+using BookAStar.Helpers;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using Xamarin.Forms;
 
 namespace BookAStar.Model.Auth.Account
 { 
@@ -79,6 +80,13 @@ namespace BookAStar.Model.Auth.Account
                 OnPropertyChanged("Avatar");
             }
         }
+        public ImageSource AvatarSource
+        {
+            get
+            {
+                return UserHelpers.Avatar(avatar);
+            }
+        }
         private Tokens yavscTokens;
         public Tokens YavscTokens
         {
diff --git a/BookAStar/BookAStar/Model/BookQueryData.cs b/BookAStar/BookAStar/Model/BookQueryData.cs
index 37d43a02..6f5ee97b 100644
--- a/BookAStar/BookAStar/Model/BookQueryData.cs
+++ b/BookAStar/BookAStar/Model/BookQueryData.cs
@@ -1,9 +1,10 @@
-using BookAStar.Model.Social;
+using BookAStar.Interfaces;
+using BookAStar.Model.Social;
 using System;
 
 namespace BookAStar.Model
 {
-    public class BookQueryData
+    public class BookQueryData : IBookQueryData
     {
         public ClientProviderInfo Client { get; set; }
         public Location Location { get; set; }
diff --git a/BookAStar/BookAStar/Model/ClientProviderInfo.cs b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
index a684dc65..604beaae 100644
--- a/BookAStar/BookAStar/Model/ClientProviderInfo.cs
+++ b/BookAStar/BookAStar/Model/ClientProviderInfo.cs
@@ -1,4 +1,5 @@
-using BookAStar.Model.Social;
+using BookAStar.Helpers;
+using BookAStar.Model.Social;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,18 +14,18 @@ namespace BookAStar.Model
         public string UserName { get; set; }
         
         public string Avatar { get; set; }
-        // private string avatar;
-        //  public string Avatar { get { return avatar ?? "icon-anon.png"; }  set { avatar = value; } }
         public string UserId { get; set; }
         public int Rate { get; set; }
         public string EMail { get; set; }
         public string Phone { get; set; }
         public Location BillingAddress { get; set; }
+        // TODO Get User Professional status existence as a boolean
+        // And hack the avatar with
         public ImageSource AvatarOrNot
         {
             get
             {
-                return Avatar ?? ImageSource.FromResource("BookAStar.icon-anon.png");
+                return UserHelpers.Avatar(Avatar);
             }
         }
     }
diff --git a/BookAStar/BookAStar/Model/Workflow/CommandLine.cs b/BookAStar/BookAStar/Model/Workflow/BillingLine.cs
similarity index 64%
rename from BookAStar/BookAStar/Model/Workflow/CommandLine.cs
rename to BookAStar/BookAStar/Model/Workflow/BillingLine.cs
index 65ef4cdd..ee47feed 100644
--- a/BookAStar/BookAStar/Model/Workflow/CommandLine.cs
+++ b/BookAStar/BookAStar/Model/Workflow/BillingLine.cs
@@ -1,13 +1,14 @@
 
+using BookAStar.Interfaces;
 using System;
 
 namespace BookAStar.Model.Workflow
 {
-    public class CommandLine
+    public class BillingLine : IBillingLine
     {
         public string Description { get; set; }
         public TimeSpan Duration { get; set; }
-        public int Count { get; set; }
+        public int Count { get; set; } = 1;
         public decimal UnitaryCost { get; set; }
     }
 }
diff --git a/BookAStar/BookAStar/Model/Workflow/Estimate.cs b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
index d9bb5f3b..58b8cffc 100644
--- a/BookAStar/BookAStar/Model/Workflow/Estimate.cs
+++ b/BookAStar/BookAStar/Model/Workflow/Estimate.cs
@@ -1,4 +1,5 @@
 using BookAStar.Helpers;
+using BookAStar.Model.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +8,7 @@ using Xamarin.Forms;
 
 namespace BookAStar.Model.Workflow
 {
-    public partial class Estimate
+    public partial class Estimate : IEstimate
     {
         public long Id { get; set; }
         public long? CommandId { get; set; }
@@ -16,7 +17,7 @@ namespace BookAStar.Model.Workflow
         public string Description { get; set; }
         public int? Status { get; set; }
         public string Title { get; set; }
-        public List<CommandLine> Bill { get; set; }
+        public List<BillingLine> Bill { get; set; }
         /// <summary>
         /// List of attached graphic files
         /// to this estimate, as relative pathes to
diff --git a/BookAStar/BookAStar/Pages/AccountChooserPage.xaml b/BookAStar/BookAStar/Pages/AccountChooserPage.xaml
new file mode 100644
index 00000000..48608c3e
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/AccountChooserPage.xaml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="BookAStar.Pages.AccountChooserPage"
+             Title="Paramètres Booking star" Style="{StaticResource PageStyle}"
+             xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
+             xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms">
+
+  <StackLayout>
+    <Label Text="Compte utilisateur" StyleClass="Header"/>
+
+    <ListView x:Name="AccountListView"
+              SeparatorVisibility="Default"
+              VerticalOptions="FillAndExpand"
+        >
+      <ListView.Header>
+        <StackLayout Orientation="Horizontal">
+
+          <Button x:Name="AddAccountBtn" Text="Connection, ou création d'un compte" />
+        </StackLayout>
+      </ListView.Header>
+
+      <ListView.ItemTemplate HeightRequest="60" VerticalOptions="StartAndExpand">
+        <DataTemplate>
+          <ViewCell>
+            <lc:GesturesContentView>
+              <Grid Padding="5"
+                        ColumnSpacing="10"
+                        RowSpacing="2" >
+                <Image Source="{Binding AvatarSource}" HeightRequest="80"
+                       x:Name="avatarImage"/>
+                <Label Grid.Column="0" Text="{Binding UserName}" >
+
+                </Label>
+              </Grid>
+              <lb:Gestures.Interests>
+                <lb:GestureCollection>
+                  <lb:GestureInterest GestureType="Swipe" Direction="Left" GestureCommand="{Binding DumpParam}" GestureParameter="{Binding UserName}"/>
+                </lb:GestureCollection>
+              </lb:Gestures.Interests>
+            </lc:GesturesContentView>
+          </ViewCell>
+        </DataTemplate>
+      </ListView.ItemTemplate>
+      <ListView.Footer>
+        <StackLayout></StackLayout>
+      </ListView.Footer>
+
+    </ListView>
+
+  </StackLayout>
+</ContentPage>
diff --git a/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs b/BookAStar/BookAStar/Pages/AccountChooserPage.xaml.cs
similarity index 67%
rename from BookAStar/BookAStar/Pages/SettingsPage.xaml.cs
rename to BookAStar/BookAStar/Pages/AccountChooserPage.xaml.cs
index 1a47a79b..b41e7be6 100644
--- a/BookAStar/BookAStar/Pages/SettingsPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/AccountChooserPage.xaml.cs
@@ -6,17 +6,19 @@ using System.Windows.Input;
 using System.Collections.ObjectModel;
 using System.Collections.Generic;
 using System.ComponentModel;
+using BookAStar.Helpers;
+using XLabs.Forms.Behaviors;
+using System.Diagnostics;
+using XLabs.Forms.Controls;
 
-namespace BookAStar
+namespace BookAStar.Pages
 {
    
-    public partial class SettingsPage : ContentPage
+    public partial class AccountChooserPage : ContentPage
 	{
-        
-
         public ICommand RemoteSettingsRefreshCommand { get; private set; }
 
-        public SettingsPage ()
+        public AccountChooserPage ()
 		{
 			InitializeComponent ();
 
@@ -28,19 +30,20 @@ namespace BookAStar
 
             AddAccountBtn.Clicked += AddAccountBtn_Clicked;
 
-            RemoveAccountBouton.Clicked += RemoveAccountBouton_Clicked;
+             // avatarImage.
+            //RemoveAccountBouton.Clicked += RemoveAccountBouton_Clicked;
 
             AccountListView.ItemSelected += Accounts_ItemSelected;
-           
-            pushstatus.Toggled += Pushstatus_Toggled;
-            
-        }
-
-        protected void Pushstatus_Toggled(object sender, ToggledEventArgs e)
-        {
-            MainSettings.PushNotifications = pushstatus.IsToggled;
+            DumpParam = new RelayGesture((g, x) =>
+            {
+                if (g.GestureType == GestureType.Swipe && g.Direction == Directionality.Left)
+                {
+                    RemoveAccount();
+                }
+            }); 
         }
 
+        public RelayGesture DumpParam { get; set; }
         public ObservableCollection<User> Accounts { get; private set; }
         public Dictionary<string, double> Musical { get; private set; }
         public Dictionary<string, double> Environ { get; private set; }
@@ -49,31 +52,25 @@ namespace BookAStar
         {
             var user = e.SelectedItem as User;
             // should later invoke IdentificationChanged
+            // FIXME don't do it when it's not from the user action
             MainSettings.CurrentUser = user;
         }
 
-        private async void RemoveAccountBouton_Clicked(object sender, EventArgs e)
+        private async void RemoveAccount()
         {
             User user = AccountListView.SelectedItem as User;
-            var doIt = await Confirm("Suppression de l'identification",
+            var doIt = await this.Confirm("Suppression de l'identification",
                 $"Vous êtes sur le point de supprimer votre identification pour ce compte : {user.UserName}\nContinuer ?");
             if (doIt)
                 App.PlatformSpecificInstance.RevokeAccount(user.UserName);
         }
 
-        async Task<bool> Confirm(string title, string procedure)
-        {
-            string yes = "Oui", no = "Non";
-            var answer = await DisplayAlert(title,
-               procedure, yes, no);
-            return answer;
-        }
+        
 
         protected override void OnAppearing()
         {
             base.OnAppearing();
             AccountListView.SelectedItem = MainSettings.CurrentUser;
-            pushstatus.IsToggled = MainSettings.PushNotifications;
         }
 
         private void AddAccountBtn_Clicked(object sender, EventArgs e)
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
index bda36a88..30388796 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml
@@ -3,8 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              x:Class="BookAStar.Pages.BookQueriesPage"
-             Padding="{x:Static local:Constants.PagePadding}"
-             BackgroundColor="{x:Static local:Constants.BackgroundColor}"
+             Style="{StaticResource PageStyle}"
              >
   <ContentPage.Resources>
     <ResourceDictionary>
@@ -17,7 +16,12 @@
         <Setter Property="LineBreakMode" Value="WordWrap" />
 
       </Style>
-
+          <Style TargetType="Label">
+            <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+          </Style>
+          <Style TargetType="Button">
+            <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+          </Style>
     </ResourceDictionary> 
   </ContentPage.Resources>
 
@@ -29,7 +33,7 @@
         <ViewCell>
           <ViewCell.View>
             <StackLayout Orientation="Horizontal" Padding="10,10,10,10" VerticalOptions="StartAndExpand">
-                <StackLayout Orientation="Vertical" BackgroundColor="{x:Static local:Constants.OddBackgroundColor}"
+                <StackLayout Orientation="Vertical" 
                              HeightRequest="80" VerticalOptions="StartAndExpand">
 
                   <StackLayout Orientation="Vertical" >
diff --git a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
index c5df63c8..55c6868c 100644
--- a/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueriesPage.xaml.cs
@@ -8,6 +8,8 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 using Xamarin.Forms;
+using XLabs.Ioc;
+using XLabs.Platform.Services;
 
 namespace BookAStar.Pages
 {
@@ -42,7 +44,7 @@ namespace BookAStar.Pages
         private void OnViewDetail(object sender, ItemTappedEventArgs e)
         {
             BookQueryData data = e.Item as BookQueryData;
-            App.CurrentApp.ShowBookQuery(data);
+            Resolver.Resolve<INavigationService>().NavigateTo<BookQueryPage>(true,data);
         }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
index b5c538c9..89181fd6 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml
@@ -4,8 +4,7 @@
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              xmlns:maps="clr-namespace:Xamarin.Forms.Maps;assembly=Xamarin.Forms.Maps.dll"
              x:Class="BookAStar.Pages.BookQueryPage"
-             BackgroundColor="{x:Static local:Constants.BackgroundColor}"
-             Padding="{x:Static local:Constants.PagePadding}"
+             Style ="{StaticResource PageStyle}"
              >
   <ContentPage.Resources>
     <ResourceDictionary>
diff --git a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
index d7078eb4..c271dc91 100644
--- a/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/BookQueryPage.xaml.cs
@@ -10,6 +10,9 @@ namespace BookAStar.Pages
     using Model;
     using Model.Workflow;
     using System.Threading.Tasks;
+    using XLabs.Forms.Mvvm;
+    using XLabs.Ioc;
+    using XLabs.Platform.Services;
 
     public partial class BookQueryPage : ContentPage
     {
@@ -70,7 +73,7 @@ namespace BookAStar.Pages
                 Id = 0,
                 Description = "# **Hello Estimate!**"
             };
-            App.CurrentApp.EditEstimate(e);
+            Resolver.Resolve<INavigationService>().NavigateTo<EditEstimatePage>(true, e);
         }
         
     }
diff --git a/BookAStar/BookAStar/Pages/DashboardPage.xaml b/BookAStar/BookAStar/Pages/DashboardPage.xaml
new file mode 100644
index 00000000..7baa4393
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/DashboardPage.xaml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="BookAStar.Pages.DashboardPage"
+             xmlns:lc="clr-namespace:XLabs.Forms.Controls;assembly=XLabs.Forms"
+             xmlns:lb="clr-namespace:XLabs.Forms.Behaviors;assembly=XLabs.Forms"
+             Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
+  <ScrollView>
+  <StackLayout Orientation="Vertical" >
+    <lc:GesturesContentView>
+    <Frame>
+    <Label Text="Compte utilisateur" StyleClass="Header">
+    </Label>
+    <lb:Gestures.Interests>
+      <lb:GestureCollection>
+      <lb:GestureInterest GestureType="LongPress" GestureCommand="{Binding UserNameGesture}" GestureParameter="LongPress" />
+      </lb:GestureCollection>
+    </lb:Gestures.Interests>
+      <Image Source="{Binding Avatar}" Aspect="AspectFit" VisualElement.HeightRequest="{StaticResource BigUserAvatarSize}" />
+    </Frame>
+    </lc:GesturesContentView>
+    <Label Text="{Binding UserName}" Style="{StaticResource LabelPageHeadingStyle}" 
+           HorizontalTextAlignment="Center"
+           LineBreakMode="WordWrap" XAlign="Center" 
+           ></Label>
+    <Button Text="{Binding PerformerStatus}" Clicked="OnViewPerformerStatus" />
+    <Button Text="{Binding UserQueries}" Clicked="OnViewUserQueries" />
+    <StackLayout Orientation="Horizontal" >
+      <Label Text="Recevoir les notifications push" StyleClass="Header" />
+      <Switch IsToggled="{Binding ReceivePushNotifications, Mode=TwoWay}" 
+              HorizontalOptions="End" />
+    </StackLayout>
+    <StackLayout Orientation="Horizontal">
+      <Label Text="Utiliser ma position" StyleClass="Header" />
+      <Switch HorizontalOptions="End" IsToggled="{Binding AllowUseMyPosition, Mode=TwoWay}"/>
+    </StackLayout>
+    <StackLayout Orientation="Horizontal" VerticalOptions="Start">
+      <Label Text="Ne recevoir de demande de devis que de la part de professionnels uniquement" StyleClass="Header"/>
+      <Switch HorizontalOptions="End" IsToggled="{Binding AllowProBookingOnly, Mode=TwoWay}"/>
+    </StackLayout>
+  </StackLayout>
+  </ScrollView>
+</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
new file mode 100644
index 00000000..658e2384
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/DashboardPage.xaml.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using XLabs.Forms.Behaviors;
+using XLabs.Forms.Controls;
+using XLabs.Forms.Mvvm;
+using XLabs.Ioc;
+using XLabs.Platform.Services;
+
+namespace BookAStar.Pages
+{
+    public partial class DashboardPage : ContentPage
+    {
+        public RelayGesture UserNameGesture { get; set; }
+
+        public DashboardPage()
+        {
+            InitializeComponent();
+            UserNameGesture = new RelayGesture((g, x) =>
+            {
+                if (g.GestureType == GestureType.LongPress)
+                {
+                    Resolver.Resolve<INavigationService>().NavigateTo<AccountChooserPage>(true);
+                }
+            });
+        }
+
+        public void OnViewPerformerStatus(object sender, EventArgs e)
+        {
+            App.CurrentApp.ShowAccounts();
+        }
+
+        public void OnViewUserQueries(object sender, EventArgs e)
+        {
+            App.CurrentApp.ShowQueries();
+
+        }
+
+
+    }
+}
diff --git a/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml
similarity index 80%
rename from BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml
rename to BookAStar/BookAStar/Pages/EditBillingLinePage.xaml
index 2b476be5..21ebbb68 100644
--- a/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml
+++ b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml
@@ -3,8 +3,18 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
              xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
-             x:Class="BookAStar.Pages.CommandLineEditorPage"
+             x:Class="BookAStar.Pages.EditBillingLinePage"
              Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
   <StackLayout>
     <Label Text="Description de la ligne de facture" Style="{StaticResource InputLabelStyle}"></Label>
     <Editor VerticalOptions="FillAndExpand"></Editor>
diff --git a/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml.cs b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
similarity index 67%
rename from BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml.cs
rename to BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
index 53ce3842..5c9e8915 100644
--- a/BookAStar/BookAStar/Pages/CommandLineEditorPage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditBillingLinePage.xaml.cs
@@ -8,12 +8,11 @@ using Xamarin.Forms;
 
 namespace BookAStar.Pages
 {
-    public partial class CommandLineEditorPage : ContentPage
+    public partial class EditBillingLinePage : ContentPage
     {
-        public CommandLineEditorPage()
+        public EditBillingLinePage()
         {
             InitializeComponent();
-            
         }
     }
 }
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
index f9f790cf..8de41415 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml
@@ -3,7 +3,18 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="BookAStar.Pages.EditEstimatePage"
              xmlns:views="clr-namespace:BookAStar.Views;assembly=BookAStar"
-             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar">
+             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
+             Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
   <StackLayout Padding="10,10,10,10" BindingContext="{Binding .}">
     <StackLayout Orientation="Horizontal" Padding="10,10,10,10">
       <Label Text="{Binding Client.UserName}" LineBreakMode="WordWrap"></Label>
diff --git a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
index 48449d0a..00ea16bc 100644
--- a/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
+++ b/BookAStar/BookAStar/Pages/EditEstimatePage.xaml.cs
@@ -51,7 +51,7 @@ namespace BookAStar.Pages
         }
         protected void OnNewCommanLine(object sender, EventArgs e)
         {
-            var com = new CommandLine();
+            var com = new BillingLine();
             App.CurrentApp.EditCommandLine(this,com);
         }
        
diff --git a/BookAStar/BookAStar/Pages/EventDetail.xaml b/BookAStar/BookAStar/Pages/EventDetail.xaml
index 030d6fae..edcda6cf 100644
--- a/BookAStar/BookAStar/Pages/EventDetail.xaml
+++ b/BookAStar/BookAStar/Pages/EventDetail.xaml
@@ -2,7 +2,17 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms" 
 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
 xmlns:local="clr-namespace:BookAStar;Assembly:BookAStar"
- x:Class="BookAStar.Pages.EventDetail">
+ x:Class="BookAStar.Pages.EventDetail" Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
 	<ContentPage.Content>
 	<ScrollView>
 	<StackLayout>
diff --git a/BookAStar/BookAStar/Pages/HomePage.xaml b/BookAStar/BookAStar/Pages/HomePage.xaml
new file mode 100644
index 00000000..0e0badb7
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/HomePage.xaml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="BookAStar.Pages.HomePage"
+             Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
+  <Label Text="Blah" VerticalOptions="Center" HorizontalOptions="Center" />
+</ContentPage>
\ No newline at end of file
diff --git a/BookAStar/BookAStar/Pages/HomePage.xaml.cs b/BookAStar/BookAStar/Pages/HomePage.xaml.cs
new file mode 100644
index 00000000..d55d3c16
--- /dev/null
+++ b/BookAStar/BookAStar/Pages/HomePage.xaml.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+
+namespace BookAStar.Pages
+{
+    public partial class HomePage : ContentPage
+    {
+        public HomePage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/Pages/SearchPage.xaml b/BookAStar/BookAStar/Pages/SearchPage.xaml
index 7a9cfccb..3ca1d71e 100644
--- a/BookAStar/BookAStar/Pages/SearchPage.xaml
+++ b/BookAStar/BookAStar/Pages/SearchPage.xaml
@@ -3,7 +3,17 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:BookAStar;Assembly:BookAStar"
              x:Class="BookAStar.SearchPage" Title="Page de recherche"
-             Padding="10,40,10,10" >
+             Style="{StaticResource PageStyle}">
+  <ContentPage.Resources>
+    <ResourceDictionary>
+      <Style TargetType="Label">
+        <Setter Property="Style" Value="{StaticResource ContentLabelStyle}" />
+      </Style>
+      <Style TargetType="Button">
+        <Setter Property="Style" Value="{StaticResource ButtonStyle}" />
+      </Style>
+    </ResourceDictionary>
+  </ContentPage.Resources>
 	<ContentPage.Content>
 	<StackLayout>
 
diff --git a/BookAStar/BookAStar/Pages/SettingsPage.xaml b/BookAStar/BookAStar/Pages/SettingsPage.xaml
deleted file mode 100644
index 1489e944..00000000
--- a/BookAStar/BookAStar/Pages/SettingsPage.xaml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:local="clr-namespace:BookAStar;assembly=BookAStar"
-xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-x:Class="BookAStar.SettingsPage"
-Title="Paramètres Booking star"
-             Style="{StaticResource PageStyle}">
-
-  <StackLayout>
-    <Label Text="Compte utilisateur" StyleClass="Header"/>
-
-    <ListView x:Name="AccountListView"
-              SeparatorVisibility="Default"
-              VerticalOptions="FillAndExpand"
-        >
-      <ListView.Header>
-        <StackLayout Orientation="Horizontal">
-          <Button x:Name="RemoveAccountBouton"
-          Text="Supprimer cette identité" />
-          <Button x:Name="AddAccountBtn" Text="s'inscrire ou se connecter avec un nouveau compte" />
-
-        </StackLayout>
-      </ListView.Header>
-
-      <ListView.ItemTemplate HeightRequest="60" VerticalOptions="StartAndExpand">
-        <DataTemplate>
-          <ViewCell>
-            <Grid Padding="5"
-                      ColumnSpacing="10"
-                      RowSpacing="2">
-              <Image Source="{Binding Avatar}" HeightRequest="80" />
-              <Label Grid.Column="0" Text="{Binding UserName}" />
-            </Grid>
-          </ViewCell>
-        </DataTemplate>
-      </ListView.ItemTemplate>
-      <ListView.Footer>
-        <StackLayout></StackLayout>
-      </ListView.Footer>
-
-    </ListView>
-
-
-
-    <StackLayout Orientation="Horizontal" VerticalOptions="Start">
-      <Label Text="Recevoir les notifications push" />
-      <Switch x:Name="pushstatus" />
-    </StackLayout>
-
-    <StackLayout Orientation="Horizontal">
-      <Label Text="Utiliser ma position" />
-      <Switch x:Name="use_my_pos" HorizontalOptions="End" />
-    </StackLayout>
-
-
-    <StackLayout Orientation="Horizontal" VerticalOptions="Start">
-      <Label Text="Recevoir les demandes de devis de la part de professionnels uniquement"
-             StyleClass="Header"/>
-      <Switch x:Name="restrictToPro" />
-    </StackLayout>
-
-  </StackLayout>
-</ContentPage>
diff --git a/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs b/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
new file mode 100644
index 00000000..1512b559
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/BillingLineViewModel.cs
@@ -0,0 +1,78 @@
+using BookAStar.Interfaces;
+using BookAStar.Model.Workflow;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XLabs.Forms.Mvvm;
+
+namespace BookAStar.ViewModels
+{
+    class BillingLineViewModel : ViewModel, IBillingLine
+    {
+        public BillingLineViewModel(BillingLine data)
+        {
+            if (data == null) data = new BillingLine();
+            count = data.Count;
+            description = data.Description;
+            unitaryCost = data.UnitaryCost;
+            duration = data.Duration;
+        }
+
+        protected int count;
+        public int Count
+        {
+            get
+            {
+                return count;
+            }
+
+            set
+            {
+                SetProperty<int>(ref count, value, "Count");
+            }
+        }
+        protected string description;
+        public string Description
+        {
+            get
+            {
+                return description;
+            }
+
+            set
+            {
+                SetProperty<string>(ref description, value, "Description");
+            }
+        }
+        protected TimeSpan duration;
+        public TimeSpan Duration
+        {
+            get
+            {
+                return duration;
+            }
+
+            set
+            {
+                SetProperty<TimeSpan>(ref duration, value, "Duration");
+            }
+        }
+
+        protected decimal unitaryCost;
+        public decimal UnitaryCost
+        {
+            get
+            {
+                return unitaryCost;
+            }
+
+            set
+            {
+                SetProperty<decimal>(ref unitaryCost, value, "UnitaryCost");
+            }
+        }
+    }
+}
diff --git a/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs b/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs
index daf82519..d59f904f 100644
--- a/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs
+++ b/BookAStar/BookAStar/ViewModels/BookQueryViewModel.cs
@@ -1,4 +1,5 @@
-using BookAStar.Model;
+using BookAStar.Interfaces;
+using BookAStar.Model;
 using BookAStar.Model.Social;
 using System;
 using System.Collections.Generic;
@@ -9,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace BookAStar.ViewModels
 {
-    class BookQueryViewModel : XLabs.Forms.Mvvm.ViewModel
+    class BookQueryViewModel : XLabs.Forms.Mvvm.ViewModel, IBookQueryData
     {
         public BookQueryViewModel()
         {
diff --git a/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs b/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
new file mode 100644
index 00000000..03d1abf4
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/DashboardViewModel.cs
@@ -0,0 +1,137 @@
+using BookAStar.Helpers;
+using BookAStar.Model.Auth.Account;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Xamarin.Forms;
+using XLabs.Forms.Mvvm;
+
+namespace BookAStar.ViewModels
+{
+    internal class DashboardViewModel : ViewModel
+    {
+        public string UserId
+        {
+            get
+            {
+                return User?.Id;
+            }
+        }
+
+        public bool AllowUseMyPosition
+        {
+            get
+            {
+                return MainSettings.AllowGPSUsage;
+            }
+            set
+            {
+                MainSettings.AllowGPSUsage = value;
+            }
+        }
+
+        public bool AllowProBookingOnly
+        {
+            get
+            {
+                return MainSettings.AllowProBookingOnly;
+            }
+            set
+            {
+                MainSettings.AllowProBookingOnly = value;
+            }
+        }
+
+        private long queryCount;
+        private User user;
+
+        public long QueryCount
+        {
+            get
+            {
+                return queryCount;
+            }
+        }
+
+        public User User
+        {
+            get { return user; }
+            protected set
+            {
+                SetProperty<User>(ref user, value, "User");
+                if (user!=null)
+                {
+                    user.PropertyChanged += User_PropertyChanged;
+
+                }
+
+                UpdateUserMeta();
+
+            }
+        }
+        private ImageSource avatar;
+        public ImageSource Avatar {  get {
+                return avatar;
+            } }
+
+        public ObservableCollection<User> Accounts { get; protected set; }
+        private string performerStatus;
+        public string PerformerStatus
+        {
+            get
+            {
+                return performerStatus;
+            }
+        }
+
+        public string UserName
+        {
+            get
+            {
+                return User?.UserName;
+            }
+        }
+
+        private bool userIsPro = false;
+
+        public DashboardViewModel()
+        {
+            Accounts = MainSettings.AccountList;
+            User = MainSettings.CurrentUser;
+            UpdateUserMeta();
+        }
+
+        private void UpdateUserMeta ()
+        {
+            string newStatusString;
+            long newQueryCount;
+            bool newUserIsPro;
+            ImageSource newAvatar;
+            if (user==null)
+            {
+                newQueryCount = 0;
+                newUserIsPro = false;
+                newStatusString = null;
+                newAvatar = null;
+            }
+            else
+            {
+                newUserIsPro = User.Roles?.Contains("Performer") ?? false;
+
+                newQueryCount = userIsPro ? DataManager.Current.BookQueries.Count : 0;
+
+                newStatusString = userIsPro ?
+                     $"Profile professionel renseigné,\n{newQueryCount} demandes valides en cours" :
+                    "Profile professionel non renseigné";
+                newAvatar = UserHelpers.Avatar(user.Avatar);
+            }
+            SetProperty<string>(ref performerStatus, newStatusString, "PerformerStatus");
+            SetProperty<long>(ref queryCount, newQueryCount, "QueryCount");
+            SetProperty<ImageSource>(ref avatar, newAvatar, "Avatar");
+        }
+
+        private void User_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            UpdateUserMeta();
+        }
+    }
+}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs b/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
new file mode 100644
index 00000000..ef2a5162
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/EstimateViewModel.cs
@@ -0,0 +1,91 @@
+using BookAStar.Model.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XLabs.Forms.Mvvm;
+using BookAStar.Model.Workflow;
+using System.Collections.ObjectModel;
+using BookAStar.Model;
+
+namespace BookAStar.ViewModels
+{
+    class EstimateViewModel : ViewModel
+    {
+        public EstimateViewModel(Estimate data)
+        {
+            estimate = data;
+            AttachedFiles = new ObservableCollection<string>(data.AttachedFiles);
+            AttachedGraphicList = new ObservableCollection<string>(data.AttachedGraphicList);
+            Bill = new ObservableCollection<BillingLine>(data.Bill);
+            description = data.Description;
+            title = data.Title;
+            status = data.Status;
+        }
+
+        Estimate estimate;
+        
+        public ObservableCollection<string> AttachedFiles
+        {
+            get; protected set;
+        }
+
+        public ObservableCollection<string> AttachedGraphicList
+        {
+            get; protected set;
+        }
+
+        public ObservableCollection<BillingLine> Bill
+        {
+            get; protected set;
+        }
+
+
+        private string description;
+        public string Description
+        {
+            get
+            {
+                return description;
+            }
+
+            set
+            {
+                SetProperty<string>(ref description, value, "Description");
+            }
+        }
+
+        private int? status;
+        public int? Status
+        {
+            get
+            {
+                return status;
+            }
+
+            set
+            {
+                SetProperty<int?>(ref status, value, "Status");
+            }
+        }
+        private string title;
+        public string Title
+        {
+            get
+            {
+                return title;
+            }
+
+            set
+            {
+                SetProperty<string>(ref title, value, "Title");
+            }
+        }
+
+        public ClientProviderInfo Client {  get { return estimate.Client; } }
+
+        public BookQueryData Query { get { return estimate.Query; } }
+
+    }
+}
diff --git a/BookAStar/BookAStar/ViewModels/SettingsViewModel.cs b/BookAStar/BookAStar/ViewModels/SettingsViewModel.cs
deleted file mode 100644
index 4941d6c1..00000000
--- a/BookAStar/BookAStar/ViewModels/SettingsViewModel.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using XLabs.Forms.Mvvm;
-using XLabs.Platform.Services;
-
-namespace BookAStar.ViewModels
-{
-    internal class SettingsViewModel : XLabs.Forms.Mvvm.ViewModel
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/BookAStar/BookAStar/ViewModels/UserLoginViewModel.cs b/BookAStar/BookAStar/ViewModels/UserLoginViewModel.cs
new file mode 100644
index 00000000..a38ec1a6
--- /dev/null
+++ b/BookAStar/BookAStar/ViewModels/UserLoginViewModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XLabs.Forms.Mvvm;
+
+namespace BookAStar.ViewModels
+{
+    class UserLoginViewModel : ViewModel
+    {
+
+    }
+}
diff --git a/BookAStar/BookAStar/ViewModels/ViewModelBase.cs b/BookAStar/BookAStar/ViewModels/ViewModelBase.cs
index d9902e2b..bc17cb71 100644
--- a/BookAStar/BookAStar/ViewModels/ViewModelBase.cs
+++ b/BookAStar/BookAStar/ViewModels/ViewModelBase.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 
 namespace BookAStar.ViewModels
 {
+    [Obsolete("Use legacy XLabs ViewModel")]
     public class ViewModelBase : IModelViewModel
     {
         public string Title { get; set; }
diff --git a/BookAStar/BookAStar/icon-anon.png b/BookAStar/BookAStar/icon-anon.png
deleted file mode 100644
index 38d6db946724a8c9a2bac8cd7d2a08d7e1bacaac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1031
zcmV+i1o-=jP)<h;3K|Lk000e1NJLTq001BW0018d1ONa4EMEr)00002VoOIv0RM-N
z%)bBt010qNS#tmY3J3rI3J3vb2*g<c000McNliru;0YA~85}=GfvErh1DHufK~y-)
zg_T=qTvZf?zkknUCUIg~k~C>*YZ{1Bi=>U_!P|?qRLwLcD)yli#Gs-tQVEEt2#O%0
zNCd$f7Fw(LWWh8=TT+Bl+otJD2-Gw}bFq<FJ7zLYbD5d5d^nTL$xO8C<#1U4`uDo+
ze~VIcY@&v0w$Mx!kYbcyNpPJ>JZ@@RIl_LLs3nHW6UL~eiT!-d)?&C;{H@^yV!Vz0
z2f5=d(tOFx>h4y0sk>>0b@bA@nxlnJg1?Ufu*W?XS_RufOKIhYg5`7okMHO>6h9Nc
z5I-J&6`(y>_+jn}_MnQ-*casMDEHn~x8>ai<F@zsz;2EeAm8#Lvr7aobCk(~FOD5m
zCzcPFJmg)|y?wt2&e+70d<+g~W<xL>><;b3lOUr-<&ca}9q+6tW0LhW`xzYOCDK8H
z_GfiaHZQT=$~DcfRbxnV75(!8*e!g@GhrGyzcL(Lml5G9dq8PH1(P~R%8clJ{2YMY
zV1R}&)toLKiQNg6YUB%k!(%5q=(Nuj!y1c#r>SwQAyG1Ci6kE|L>A)+Gi*@>2E{w^
zH&u>GG9~e&Mh-_52b8g%zbpgTl_KCGw>oZPp`?WG0Aygm0a6@O$V6_i2)MuoN98J4
zbQolkvA{lB_>mF9@)9RfML3U2N0QQQAK_2K%;O2}<{SFWVW_7B7b5AnN~Gl0Ub8VI
zMXi}>hN(av8Gb4uh;Y@BChD(m!Fn_L9x$gEQNKcQxo@C=*zJF!q{AesVd81huD#5K
zZ7tii%UZM<AZsV(EwyN4{1j(7p-c7;S+aOQ4N0+%=Xfvv1`pFjJ+b90YC_rwOd6Qs
zmSrl*w8rdI-}}7AR{}oV)g8f1hVw6<A<U$Ry`mgFWD5f}VPGa{fs-H6?SMB&<}iU1
zLNb%TjF_&I2neK^ge086F3<D2znt03)Vj_HAPh;%%9LS{i+Fi)&XeX<BBjyiGZ&Wx
zr7ZT#BW<3U1;edWybYO|NlyJ2(hrg;$a;9~)cv)gWw=Sj>y7*d2+MIcF;h>@S9;&F
zGuzIOI|=jq=(lP)6GNCVL!LA+G1KCQuY6cSWrGiGi}`_m29kk)t{Em!nlnR-ZH2+O
z06{Ku&$+Il*|aNPYJef~Nnz#Oa6_qcU5l-OxuVscjmAAq_2G(;90ClFoMq>(OppJ-
zf&YISm#iv$d-djUgSA-$(v$|Xe<a4T6U>%E{{_x7U>*AxW0e2^002ovPDHLkV1oC>
B*){+G

diff --git a/BookAStar/BookAStar/packages.config b/BookAStar/BookAStar/packages.config
index 1577477c..25d993d0 100644
--- a/BookAStar/BookAStar/packages.config
+++ b/BookAStar/BookAStar/packages.config
@@ -7,11 +7,13 @@
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="portable45-net45+win8+wpa81" />
   <package id="Xam.Plugins.Settings" version="2.5.1.0" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
-  <package id="Xamarin.Forms.Maps" version="2.3.2.127" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms" version="2.3.0.34-pre1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="Xamarin.Forms.Maps" version="2.3.0.34-pre1" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Caching" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.Core" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.Forms" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.IoC" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.Platform" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
   <package id="XLabs.Serialization" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
+  <package id="XLabs.Serialization.JSON" version="2.2.0-pre05" targetFramework="portable45-net45+win8+wpa81" />
 </packages>
\ No newline at end of file