diff --git a/Softeq.XToolkit.WhiteLabel.Droid/ActivityBase.cs b/Softeq.XToolkit.WhiteLabel.Droid/ActivityBase.cs
index f00944122..0225f1ef1 100644
--- a/Softeq.XToolkit.WhiteLabel.Droid/ActivityBase.cs
+++ b/Softeq.XToolkit.WhiteLabel.Droid/ActivityBase.cs
@@ -12,7 +12,6 @@
 using Softeq.XToolkit.Bindings;
 using Softeq.XToolkit.Bindings.Extensions;
 using Softeq.XToolkit.Common.Interfaces;
-using Softeq.XToolkit.Permissions;
 using Softeq.XToolkit.WhiteLabel.Droid.Navigation;
 using Softeq.XToolkit.WhiteLabel.Droid.ViewComponents;
 using Softeq.XToolkit.WhiteLabel.Mvvm;
@@ -75,18 +74,32 @@ public abstract class ActivityBase<TViewModel> : ActivityBase
     {
         private const string ShouldRestoreStateKey = "shouldRestore";
         private readonly IJsonSerializer _jsonSerializer;
-        private Lazy<TViewModel> _viewModel;
+        private Lazy<TViewModel> _viewModelLazy;
 
         protected ActivityBase()
         {
             Bindings = new List<Binding>();
             _jsonSerializer = Dependencies.JsonSerializer;
-            _viewModel = new Lazy<TViewModel>(() => Dependencies.IocContainer.Resolve<IBackStackManager>()
-                .GetExistingOrCreateViewModel<TViewModel>());
+            _viewModelLazy = new Lazy<TViewModel>(() =>
+            {
+                var backStack = Dependencies.IocContainer.Resolve<IBackStackManager>();
+                return backStack.GetExistingOrCreateViewModel<TViewModel>();
+            });
         }
 
         protected List<Binding> Bindings { get; }
-        protected virtual TViewModel ViewModel => _viewModel.Value;
+
+        protected virtual TViewModel ViewModel
+        {
+            get
+            {
+                if (Handle == IntPtr.Zero)
+                {
+                    throw new Exception("Don't forget to detach last ViewModel bindings.");
+                }
+                return _viewModelLazy.Value;
+            }
+        }
 
         protected override void OnCreate(Bundle savedInstanceState)
         {
@@ -128,7 +141,7 @@ protected override void OnDestroy()
         {
             if (IsFinishing)
             {
-                _viewModel = null;
+                _viewModelLazy = null;
                 base.OnDestroy();
                 Dispose();
             }
@@ -197,6 +210,6 @@ public abstract class ActivityBase<TViewModel, TInterface> : ActivityBase<TViewM
         private TViewModel _viewModel;
 
         protected override TViewModel ViewModel =>
-            _viewModel ?? (_viewModel = (TViewModel) Dependencies.IocContainer.Resolve<TInterface>());
+            _viewModel ?? (_viewModel = (TViewModel)Dependencies.IocContainer.Resolve<TInterface>());
     }
 }
\ No newline at end of file
diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Controls/AvatarPlaceholderDrawable.cs b/Softeq.XToolkit.WhiteLabel.Droid/Controls/AvatarPlaceholderDrawable.cs
index 7439928b9..b0588b151 100644
--- a/Softeq.XToolkit.WhiteLabel.Droid/Controls/AvatarPlaceholderDrawable.cs
+++ b/Softeq.XToolkit.WhiteLabel.Droid/Controls/AvatarPlaceholderDrawable.cs
@@ -1,9 +1,12 @@
 // Developed by Softeq Development Corporation
 // http://www.softeq.com
 
+using System;
 using System.Drawing;
 using Android.Graphics;
 using Android.Graphics.Drawables;
+using Plugin.CurrentActivity;
+using Softeq.XToolkit.Common.Droid.Extensions;
 using Softeq.XToolkit.WhiteLabel.Helpers;
 using Color = Android.Graphics.Color;
 
@@ -16,7 +19,8 @@ public class AvatarPlaceholderDrawable : Drawable
         private readonly Paint _textPaint;
         private readonly Paint _backgroundPaint;
         private readonly string _avatarText;
-        
+        private readonly int _size;
+
         private RectF _placeholderBounds;
         private float _textStartXPoint;
         private float _textStartYPoint;
@@ -42,21 +46,35 @@ public AvatarPlaceholderDrawable(string name, AvatarStyles styles)
             };
             _backgroundPaint.SetStyle(Paint.Style.Fill);
             _backgroundPaint.Color = Color.ParseColor(info.Color);
+            _size = Math.Min(styles.Size.Width, styles.Size.Height);
         }
 
         public override void Draw(Canvas canvas)
         {
             if (_placeholderBounds == null)
             {
-                _placeholderBounds = new RectF(0, 0, canvas.Width, canvas.Height);
+                var centerPoint = new Android.Graphics.PointF(canvas.Width / 2f, canvas.Height / 2f);
+                var context = CrossCurrentActivity.Current.AppContext;
+                var width = context.ToPixels(_size);
+                var sizeInPixels = new SizeF(width, width);
+                var x = centerPoint.X - sizeInPixels.Width / 2f;
+                var y = centerPoint.Y - sizeInPixels.Height / 2f;
+
+                _placeholderBounds = new RectF(
+                    x,
+                    y,
+                    x + sizeInPixels.Width,
+                    y + sizeInPixels.Height); 
+
                 SetAvatarTextValues();
             }
 
             canvas.DrawCircle(
-                _placeholderBounds.CenterX(),
-                _placeholderBounds.CenterY(),
-                _placeholderBounds.Width() / 2,
+                canvas.Width / 2f,
+                canvas.Height / 2f,
+                _placeholderBounds.Width() / 2f,
                 _backgroundPaint);
+
             canvas.DrawText(_avatarText, _textStartXPoint, _textStartYPoint, _textPaint);
         }
 
@@ -92,7 +110,7 @@ private float CalculateTextStartYPoint()
 
         private float CalculateTextSize()
         {
-            return Bounds.Height() * TextSizePercentage / 100;
+            return _placeholderBounds.Height() * TextSizePercentage / 100;
         }
 
         public class AvatarStyles
diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Controls/NavigationBarView.cs b/Softeq.XToolkit.WhiteLabel.Droid/Controls/NavigationBarView.cs
index ade74daa4..b84fb564b 100644
--- a/Softeq.XToolkit.WhiteLabel.Droid/Controls/NavigationBarView.cs
+++ b/Softeq.XToolkit.WhiteLabel.Droid/Controls/NavigationBarView.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows.Input;
 using Android.Content;
+using Android.Graphics.Drawables;
 using Android.Runtime;
 using Android.Util;
 using Android.Views;
@@ -69,6 +70,17 @@ public void SetRightButton(int resourceId, ICommand command)
             }
         }
 
+        public void SetRightButton(Drawable drawable, ICommand command)
+        {
+            _rightButton.SetImageDrawable(drawable);
+            _rightButton.Visibility = ViewStates.Visible;
+
+            if (command != null)
+            {
+                _rightButton.SetCommand(nameof(_rightButton.Click), command);
+            }
+        }
+
         public void SetRightButton(string label, ICommand command)
         {
             RightTextButton.Text = label;
diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Navigation/Constants.cs b/Softeq.XToolkit.WhiteLabel.Droid/Navigation/Constants.cs
index 9536a9291..58df6c199 100644
--- a/Softeq.XToolkit.WhiteLabel.Droid/Navigation/Constants.cs
+++ b/Softeq.XToolkit.WhiteLabel.Droid/Navigation/Constants.cs
@@ -1,3 +1,6 @@
+// Developed by Softeq Development Corporation
+// http://www.softeq.com
+
 namespace Softeq.XToolkit.WhiteLabel.Droid.Navigation
 {
     public static class Constants
diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Navigation/RootFrameFragmentBase.cs b/Softeq.XToolkit.WhiteLabel.Droid/Navigation/RootFrameFragmentBase.cs
index 9b26c42a8..9e43d5b80 100644
--- a/Softeq.XToolkit.WhiteLabel.Droid/Navigation/RootFrameFragmentBase.cs
+++ b/Softeq.XToolkit.WhiteLabel.Droid/Navigation/RootFrameFragmentBase.cs
@@ -1,7 +1,6 @@
 // Developed by Softeq Development Corporation
 // http://www.softeq.com
 
-using System;
 using Android.OS;
 using Android.Views;
 using Softeq.XToolkit.WhiteLabel.Mvvm;
diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Navigation/ViewLocator.cs b/Softeq.XToolkit.WhiteLabel.Droid/Navigation/ViewLocator.cs
index 69b6c7a2b..80f9b072d 100644
--- a/Softeq.XToolkit.WhiteLabel.Droid/Navigation/ViewLocator.cs
+++ b/Softeq.XToolkit.WhiteLabel.Droid/Navigation/ViewLocator.cs
@@ -28,7 +28,7 @@ public object GetView(ViewModelBase viewModel, ViewType viewType)
             var targetType = GetTargetType(viewModel.GetType(), viewType);
             var inst = Activator.CreateInstance(targetType);
             var method = inst.GetType().GetMethod("SetExistingViewModel");
-            method.Invoke(inst, new[] {viewModel});
+            method.Invoke(inst, new[] { viewModel });
             return inst;
         }
 
@@ -37,7 +37,7 @@ public object GetView(IViewModelBase viewModel, ViewType viewType)
             var targetType = GetTargetType(viewModel.GetType(), viewType);
             var inst = Activator.CreateInstance(targetType);
             var method = inst.GetType().GetMethod("SetExistingViewModel");
-            method.Invoke(inst, new[] {viewModel});
+            method.Invoke(inst, new[] { viewModel });
             return inst;
         }
 
@@ -47,11 +47,11 @@ public Type GetTargetType(string viewModelTypeName, ViewType viewType)
             targetTypeName = targetTypeName.Replace("ViewModel", viewType.ToString());
 
             var targeType = Type.GetType(targetTypeName)
-                            ?? AssemblySource.FindTypeByNames(new[] {targetTypeName});
+                            ?? AssemblySource.FindTypeByNames(new[] { targetTypeName });
 
             if (targeType == null)
             {
-                throw new DllNotFoundException("can't find target type");
+                throw new DllNotFoundException($"Can't find target type: {targetTypeName}");
             }
 
             return targeType;
@@ -76,7 +76,7 @@ public void TryInjectParameters(object viewModel, object parameter, string param
         private PropertyInfo GetPropertyCaseInsensitive(Type type, string propertyName)
         {
             var typeInfo = type.GetTypeInfo();
-            var typeList = new List<Type> {type};
+            var typeList = new List<Type> { type };
 
             if (typeInfo.IsInterface)
             {
diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Resources/layout/control_busy_overlay.xml b/Softeq.XToolkit.WhiteLabel.Droid/Resources/layout/control_busy_overlay.xml
index 12ffb81c4..868ecd0ea 100644
--- a/Softeq.XToolkit.WhiteLabel.Droid/Resources/layout/control_busy_overlay.xml
+++ b/Softeq.XToolkit.WhiteLabel.Droid/Resources/layout/control_busy_overlay.xml
@@ -12,6 +12,7 @@
             android:minHeight="50dp"
             android:minWidth="50dp"
             android:indeterminate="true"
-            android:layout_centerInParent="true" />
+            android:layout_centerInParent="true"
+            android:theme="@style/ProgressBarStyle" />
     </RelativeLayout>
 </merge>
\ No newline at end of file
diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Resources/layout/control_navigation_bar.xml b/Softeq.XToolkit.WhiteLabel.Droid/Resources/layout/control_navigation_bar.xml
index 12aea126f..03702d259 100644
--- a/Softeq.XToolkit.WhiteLabel.Droid/Resources/layout/control_navigation_bar.xml
+++ b/Softeq.XToolkit.WhiteLabel.Droid/Resources/layout/control_navigation_bar.xml
@@ -1,68 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:local="http://schemas.android.com/apk/res-auto"
-    android:minWidth="25px"
-    android:minHeight="25px"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
     android:id="@+id/control_navigation_bar_container"
-    android:background="@drawable/core_nav_bar_background">
-    <ImageButton
-        android:layout_width="54dp"
-        android:layout_height="match_parent"
-        android:scaleType="center"
-        android:layout_gravity="center_vertical"
-        android:layout_centerVertical="true"
-        android:id="@+id/control_navigation_bar_left_button"
-        android:background="@android:color/transparent" />
-    <RelativeLayout
-        android:minWidth="25px"
-        android:minHeight="25px"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-        <TextView
-            android:text="Text"
-            android:ellipsize="end" 
-            android:maxLines="1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/CoreNavigationBarTextStyle"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="20dp"
-            android:id="@+id/control_navigation_bar_title" />
-        <ImageView
-            android:minWidth="25px"
-            android:minHeight="25px"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@android:color/transparent"
-            android:id="@+id/control_navigation_bar_center_image" />
-    </RelativeLayout>
-    <LinearLayout
+    android:background="@drawable/core_nav_bar_background"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout 
         android:orientation="horizontal"
-        android:minWidth="25px"
-        android:minHeight="25px"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="match_parent">
         <ImageButton
             android:layout_width="54dp"
             android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
             android:scaleType="center"
             android:layout_gravity="center_vertical"
             android:layout_centerVertical="true"
-            android:background="@android:color/transparent"
-            android:id="@+id/control_navigation_bar_right_button" />
-        <Button
-            android:layout_width="wrap_content"
+            android:id="@+id/control_navigation_bar_left_button"
+            android:background="@android:color/transparent" />
+        <RelativeLayout
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_weight="1">
+            <TextView
+                android:text="Text"
+                android:ellipsize="end" 
+                android:maxLines="1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CoreNavigationBarTextStyle"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="20dp"
+                android:id="@+id/control_navigation_bar_title" />
+        </RelativeLayout>
+        <LinearLayout
+            android:orientation="horizontal"
             android:minWidth="25px"
             android:minHeight="25px"
-            android:layout_marginRight="12dp"
-            android:id="@+id/control_navigation_bar_right_text_button"
-            style="@style/CoreNavigationButtonStyle"/>
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent">
+            <ImageButton
+                android:layout_width="54dp"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:scaleType="center"
+                android:layout_gravity="center_vertical"
+                android:layout_centerVertical="true"
+                android:background="@android:color/transparent"
+                android:id="@+id/control_navigation_bar_right_button" />
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:minWidth="25px"
+                android:minHeight="25px"
+                android:layout_marginRight="12dp"
+                android:id="@+id/control_navigation_bar_right_text_button"
+                style="@style/CoreNavigationButtonStyle"/>
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
\ No newline at end of file
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:background="@android:color/transparent"
+        android:id="@+id/control_navigation_bar_center_image" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Resources/values/styles.xml b/Softeq.XToolkit.WhiteLabel.Droid/Resources/values/styles.xml
index 93469db9e..67c8b7481 100644
--- a/Softeq.XToolkit.WhiteLabel.Droid/Resources/values/styles.xml
+++ b/Softeq.XToolkit.WhiteLabel.Droid/Resources/values/styles.xml
@@ -3,6 +3,7 @@
   <color name="core_navigation_bar_text_color">#000000</color>
   <color name="core_notification_bg_color">#000000</color>
   <color name="core_notification_text_color">#000000</color>
+  <color name="core_progress_indicator_color">#000000</color>
   
   <style name="CoreNavigationBarTextStyle">
     <item name="android:textSize">20sp</item>
@@ -22,4 +23,8 @@
     <item name="android:windowAnimationStyle">@null</item>
   </style>
     
+  <style name="ProgressBarStyle" parent="@style/Theme.AppCompat.Light.NoActionBar">
+    <item name="colorAccent">@color/core_progress_indicator_color</item>
+  </style>
+    
 </resources>
\ No newline at end of file
diff --git a/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj b/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj
index f452f9fc9..13fe9087e 100644
--- a/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj
+++ b/Softeq.XToolkit.WhiteLabel.Droid/Softeq.XToolkit.WhiteLabel.Droid.csproj
@@ -57,7 +57,7 @@
       <Version>27.0.2.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.FFImageLoading">
-      <Version>2.4.3.840</Version>
+      <Version>2.4.4.859</Version>
     </PackageReference>
     <PackageReference Include="Plugin.CurrentActivity">
       <Version>2.1.0.4</Version>
@@ -108,14 +108,6 @@
     <Compile Include="Views\FullScreenImageDialogFragment.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\XToolkit\Softeq.XToolkit.Bindings.Droid\Softeq.XToolkit.Bindings.Droid.csproj">
-      <Project>{2B4A678B-63B4-49DB-99B1-BFE7793110C4}</Project>
-      <Name>Softeq.XToolkit.Bindings.Droid</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\XToolkit\Softeq.XToolkit.Bindings\Softeq.XToolkit.Bindings.csproj">
-      <Project>{AE01FC6D-43B3-41ED-ABC6-941AF07E6C3A}</Project>
-      <Name>Softeq.XToolkit.Bindings</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\XToolkit\Softeq.XToolkit.Common.Droid\Softeq.XToolkit.Common.Droid.csproj">
       <Project>{18d3fdc1-b0a1-401e-87f2-1c43034e610c}</Project>
       <Name>Softeq.XToolkit.Common.Droid</Name>
@@ -132,6 +124,14 @@
       <Project>{424EABDC-DCC0-4616-B603-93582D9A9AD4}</Project>
       <Name>Softeq.XToolkit.Permissions</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\XToolkit\Softeq.XToolkit.Bindings\Softeq.XToolkit.Bindings.csproj">
+      <Project>{78833174-8D1D-4C67-AD54-4C9EEEDFBBDB}</Project>
+      <Name>Softeq.XToolkit.Bindings</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\XToolkit\Softeq.XToolkit.Bindings.Droid\Softeq.XToolkit.Bindings.Droid.csproj">
+      <Project>{2B4A678B-63B4-49DB-99B1-BFE7793110C4}</Project>
+      <Name>Softeq.XToolkit.Bindings.Droid</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Services\Logger\" />
diff --git a/Softeq.XToolkit.WhiteLabel.iOS/ImagePicker/SimpleImagePicker.cs b/Softeq.XToolkit.WhiteLabel.iOS/ImagePicker/SimpleImagePicker.cs
index 7e740c147..0fde9f3f4 100644
--- a/Softeq.XToolkit.WhiteLabel.iOS/ImagePicker/SimpleImagePicker.cs
+++ b/Softeq.XToolkit.WhiteLabel.iOS/ImagePicker/SimpleImagePicker.cs
@@ -25,6 +25,8 @@ public class SimpleImagePicker
         private UIImagePickerController _imagePicker;
         private Size _calculatedImageSize;
 
+        public event EventHandler PickerWillOpen;
+
         public SimpleImagePicker(
             UIViewController parentViewController,
             IPermissionsManager permissionsManager,
@@ -104,6 +106,8 @@ public async void OpenCameraAsync()
 
         private void OpenSelector()
         {
+            PickerWillOpen?.Invoke(this, EventArgs.Empty);
+
             _imagePicker.FinishedPickingMedia += OnFinishedPickingMedia;
             _imagePicker.Canceled += OnCanceled;
 
diff --git a/Softeq.XToolkit.WhiteLabel.iOS/Navigation/StoryboardNavigation.cs b/Softeq.XToolkit.WhiteLabel.iOS/Navigation/StoryboardNavigation.cs
index 5b69959af..893354d35 100644
--- a/Softeq.XToolkit.WhiteLabel.iOS/Navigation/StoryboardNavigation.cs
+++ b/Softeq.XToolkit.WhiteLabel.iOS/Navigation/StoryboardNavigation.cs
@@ -48,13 +48,16 @@ public void NavigateToViewModel(ViewModelBase viewModelBase, bool clearBackStack
 
         protected void Navigate(UIViewController controller, bool clearBackStack)
         {
-            if (clearBackStack)
+            Execute.BeginOnUIThread(() =>
             {
-                NavigationController.SetViewControllers(new[] {controller}, false);
-                return;
-            }
-
-            NavigationController.PushViewController(controller, true);
+                if (clearBackStack)
+                {
+                    NavigationController.SetViewControllers(new[] { controller }, false);
+                    return;
+                }
+
+                NavigationController.PushViewController(controller, true);
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/Softeq.XToolkit.WhiteLabel.iOS/Services/StoryboardViewLocator.cs b/Softeq.XToolkit.WhiteLabel.iOS/Services/StoryboardViewLocator.cs
index e79c55b46..de22945c8 100644
--- a/Softeq.XToolkit.WhiteLabel.iOS/Services/StoryboardViewLocator.cs
+++ b/Softeq.XToolkit.WhiteLabel.iOS/Services/StoryboardViewLocator.cs
@@ -12,6 +12,7 @@
 using Softeq.XToolkit.WhiteLabel.Mvvm;
 using Softeq.XToolkit.WhiteLabel.Navigation;
 using UIKit;
+using Softeq.XToolkit.WhiteLabel.Threading;
 
 namespace Softeq.XToolkit.WhiteLabel.iOS.Services
 {
@@ -102,8 +103,13 @@ private bool TryCreateViewControllerFromStoryboard(string storyBoardName, string
             var result = false;
             try
             {
-                var storyboard = UIStoryboard.FromName(storyBoardName, null);
-                viewController = storyboard.InstantiateViewController(targetTypeName);
+                var newViewController = default(UIViewController);
+                Execute.OnUIThread(() =>
+                {
+                    var storyboard = UIStoryboard.FromName(storyBoardName, null);
+                    newViewController = storyboard.InstantiateViewController(targetTypeName);
+                });
+                viewController = newViewController;
                 result = true;
             }
             catch (Exception ex)
@@ -124,7 +130,7 @@ private static UIViewController CreateWithActivator(string viewModelType)
 
             if (targeType == null)
             {
-                throw new DllNotFoundException("can't find target type");
+                throw new DllNotFoundException($"Can't find target type: {targetTypeName}");
             }
 
             return (UIViewController)Activator.CreateInstance(targeType);
diff --git a/Softeq.XToolkit.WhiteLabel/Helpers/AvatarPlaceholderBuilder.cs b/Softeq.XToolkit.WhiteLabel/Helpers/AvatarPlaceholderBuilder.cs
index a778bf6c7..3989d5bc5 100644
--- a/Softeq.XToolkit.WhiteLabel/Helpers/AvatarPlaceholderBuilder.cs
+++ b/Softeq.XToolkit.WhiteLabel/Helpers/AvatarPlaceholderBuilder.cs
@@ -44,13 +44,13 @@ public static (string Text, string Color) Build(string name, string[] colors = n
 
         private static string GetAbbreviation(string data)
         {
-            var trimedData = data.Trim();
-
-            if (trimedData.Length == 0)
+            if (string.IsNullOrWhiteSpace(data))
             {
                 return string.Empty;
             }
 
+            var trimedData = data.Trim();
+
             if (trimedData.Contains(' '))
             {
                 var splited = trimedData.Split(' ');
diff --git a/Softeq.XToolkit.WhiteLabel/Navigation/IPlatformNavigationService.cs b/Softeq.XToolkit.WhiteLabel/Navigation/IPlatformNavigationService.cs
index b77cbd2fc..7a0fa8691 100644
--- a/Softeq.XToolkit.WhiteLabel/Navigation/IPlatformNavigationService.cs
+++ b/Softeq.XToolkit.WhiteLabel/Navigation/IPlatformNavigationService.cs
@@ -1,4 +1,7 @@
-using System.Collections.Generic;
+// Developed by Softeq Development Corporation
+// http://www.softeq.com
+
+using System.Collections.Generic;
 using Softeq.XToolkit.WhiteLabel.Mvvm;
 
 namespace Softeq.XToolkit.WhiteLabel.Navigation
@@ -7,11 +10,11 @@ public interface IPlatformNavigationService
     {
         void NavigateToViewModel(ViewModelBase viewModelBase, bool clearBackStack,
             IReadOnlyList<NavigationParameterModel> parameters);
-        
+
         bool CanGoBack { get; }
-        
+
         void Initialize(object navigation);
-        
+
         void GoBack();
     }
 }
\ No newline at end of file
diff --git a/Softeq.XToolkit.WhiteLabel/Navigation/NavigateHelper.cs b/Softeq.XToolkit.WhiteLabel/Navigation/NavigateHelper.cs
index 99da3fad6..01f408d4e 100644
--- a/Softeq.XToolkit.WhiteLabel/Navigation/NavigateHelper.cs
+++ b/Softeq.XToolkit.WhiteLabel/Navigation/NavigateHelper.cs
@@ -1,4 +1,7 @@
-using System;
+// Developed by Softeq Development Corporation
+// http://www.softeq.com
+
+using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -20,9 +23,9 @@ public NavigateHelper(PageNavigationService navigationService)
 
         public NavigateHelper<TViewModel> WithParam<TValue>(Expression<Func<TViewModel, TValue>> property, TValue value)
         {
-            var parameter = new NavigationParameterModel {Value = value};
+            var parameter = new NavigationParameterModel { Value = value };
 
-            var propertyInfo = (PropertyInfo) property.GetMemberInfo();
+            var propertyInfo = (PropertyInfo)property.GetMemberInfo();
             parameter.PropertyInfo = PropertyInfoModel.FromProperty(propertyInfo);
 
             _parameters.Add(parameter);
diff --git a/Softeq.XToolkit.WhiteLabel/Navigation/NavigationParameterModel.cs b/Softeq.XToolkit.WhiteLabel/Navigation/NavigationParameterModel.cs
index ea4102f67..1fc1d6788 100644
--- a/Softeq.XToolkit.WhiteLabel/Navigation/NavigationParameterModel.cs
+++ b/Softeq.XToolkit.WhiteLabel/Navigation/NavigationParameterModel.cs
@@ -1,4 +1,7 @@
-namespace Softeq.XToolkit.WhiteLabel.Navigation
+// Developed by Softeq Development Corporation
+// http://www.softeq.com
+
+namespace Softeq.XToolkit.WhiteLabel.Navigation
 {
     public class NavigationParameterModel
     {
diff --git a/Softeq.XToolkit.WhiteLabel/Navigation/PageNavigation.cs b/Softeq.XToolkit.WhiteLabel/Navigation/PageNavigation.cs
index 4949f7035..8a0e06240 100644
--- a/Softeq.XToolkit.WhiteLabel/Navigation/PageNavigation.cs
+++ b/Softeq.XToolkit.WhiteLabel/Navigation/PageNavigation.cs
@@ -1,7 +1,8 @@
+// Developed by Softeq Development Corporation
+// http://www.softeq.com
+
 using System.Collections.Generic;
-using Softeq.XToolkit.WhiteLabel.Interfaces;
 using Softeq.XToolkit.WhiteLabel.Mvvm;
-using Softeq.XToolkit.WhiteLabel.Threading;
 
 namespace Softeq.XToolkit.WhiteLabel.Navigation
 {
diff --git a/Softeq.XToolkit.WhiteLabel/Navigation/PropertyInfoModel.cs b/Softeq.XToolkit.WhiteLabel/Navigation/PropertyInfoModel.cs
index 4f16f583d..46e0651a7 100644
--- a/Softeq.XToolkit.WhiteLabel/Navigation/PropertyInfoModel.cs
+++ b/Softeq.XToolkit.WhiteLabel/Navigation/PropertyInfoModel.cs
@@ -1,4 +1,7 @@
-using System;
+// Developed by Softeq Development Corporation
+// http://www.softeq.com
+
+using System;
 using System.Reflection;
 
 namespace Softeq.XToolkit.WhiteLabel.Navigation
diff --git a/Softeq.XToolkit.WhiteLabel/Softeq.XToolkit.WhiteLabel.csproj b/Softeq.XToolkit.WhiteLabel/Softeq.XToolkit.WhiteLabel.csproj
index ac1fa3c5d..b01474f81 100644
--- a/Softeq.XToolkit.WhiteLabel/Softeq.XToolkit.WhiteLabel.csproj
+++ b/Softeq.XToolkit.WhiteLabel/Softeq.XToolkit.WhiteLabel.csproj
@@ -25,7 +25,6 @@
     <Folder Include="ImagePicker\" />
     <Folder Include="Messenger\" />
     <Folder Include="Extensions\" />
-    <Folder Include="Shared\" />
     <Folder Include="ViewModels\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Softeq.XToolkit.WhiteLabel/ViewModels/FullScreenImageViewModel.cs b/Softeq.XToolkit.WhiteLabel/ViewModels/FullScreenImageViewModel.cs
index bb7becbdd..fbc276116 100644
--- a/Softeq.XToolkit.WhiteLabel/ViewModels/FullScreenImageViewModel.cs
+++ b/Softeq.XToolkit.WhiteLabel/ViewModels/FullScreenImageViewModel.cs
@@ -5,19 +5,19 @@
 using Softeq.XToolkit.WhiteLabel.Mvvm;
 
 namespace Softeq.XToolkit.WhiteLabel.ViewModels
-{
-    public class FullScreenImageOptions
-    {
-        public string IosCloseButtonImageBoundleName { get; set; }
-        public int DroidCloseButtonImageResId { get; set; }
-        public string CloseButtonTintColor { get; set; }
-        public string ImageUrl { get; set; }
-    }
+{
+    public class FullScreenImageOptions
+    {
+        public string IosCloseButtonImageBoundleName { get; set; }
+        public int DroidCloseButtonImageResId { get; set; }
+        public string CloseButtonTintColor { get; set; }
+        public string ImageUrl { get; set; }
+    }
 
     public class FullScreenImageViewModel : DialogViewModelBase, IViewModelParameter<FullScreenImageOptions>
     {
-        public string ImageUrl => FullScreenImageOptions.ImageUrl;
-
+        public string ImageUrl => FullScreenImageOptions.ImageUrl;
+
         public FullScreenImageOptions FullScreenImageOptions { get; set; }
 
         public FullScreenImageOptions Parameter