diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
index 0cbb211..caf2534 100644
--- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
+++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.369" android:versionCode="369">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.370" android:versionCode="370">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs b/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs
index dcce7bf..b759dc0 100644
--- a/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs
+++ b/LastenradBayern/TINK.Android/Resources/Resource.Designer.cs
@@ -14,7 +14,7 @@ namespace TINK.Droid
 {
 	
 	
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.93")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
 	public partial class Resource
 	{
 		
diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist
index 8fe5a6d..a093c07 100644
--- a/LastenradBayern/TINK.iOS/Info.plist
+++ b/LastenradBayern/TINK.iOS/Info.plist
@@ -56,8 +56,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>LastenradBayern</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>370</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.369</string>
+	<string>3.0.370</string>
 </dict>
 </plist>
diff --git a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj
index 08eabf4..a5053fd 100644
--- a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj
+++ b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj
@@ -270,9 +270,6 @@
       <HintPath>..\..\..\..\.nuget\packages\xamarin.google.ios.maps\2.5.0\lib\Xamarin.iOS10\Google.Maps.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\tink2.png" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\LockItBLE\LockItBLE.csproj">
       <Project>{bde9ce26-15cf-47da-a4f6-b6956d02d0fc}</Project>
diff --git a/LastenradBayern/TINK.iOS/Resources/LaunchScreen.storyboard b/LastenradBayern/TINK.iOS/Resources/LaunchScreen.storyboard
index 454fa2f..7f46988 100644
--- a/LastenradBayern/TINK.iOS/Resources/LaunchScreen.storyboard
+++ b/LastenradBayern/TINK.iOS/Resources/LaunchScreen.storyboard
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="X5k-f2-b5h">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
@@ -42,6 +42,5 @@
         <image name="Icon-76.png" width="76" height="76"/>
         <image name="Icon-Small-40.png" width="40" height="40"/>
         <image name="Icon-Small.png" width="29" height="29"/>
-        <image name="tink2.png" width="208" height="208"/>
     </resources>
-</document>
\ No newline at end of file
+</document>
diff --git a/LastenradBayern/TINK.iOS/Resources/tink2.png b/LastenradBayern/TINK.iOS/Resources/tink2.png
deleted file mode 100644
index b33b28b..0000000
Binary files a/LastenradBayern/TINK.iOS/Resources/tink2.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/Konrad.png b/LastenradBayern/TINK/Images/Konrad.png
deleted file mode 100644
index 4b5658a..0000000
Binary files a/LastenradBayern/TINK/Images/Konrad.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/Tink2.png b/LastenradBayern/TINK/Images/Tink2.png
deleted file mode 100644
index 0388177..0000000
Binary files a/LastenradBayern/TINK/Images/Tink2.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/belt1_image.4XWCQY_679_382.png b/LastenradBayern/TINK/Images/belt1_image.4XWCQY_679_382.png
deleted file mode 100644
index 6433405..0000000
Binary files a/LastenradBayern/TINK/Images/belt1_image.4XWCQY_679_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/belt1_image.4XWCQY_793_446.png b/LastenradBayern/TINK/Images/belt1_image.4XWCQY_793_446.png
deleted file mode 100644
index 0b6827f..0000000
Binary files a/LastenradBayern/TINK/Images/belt1_image.4XWCQY_793_446.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/belt2_image.X3F1PY_1280_720.png b/LastenradBayern/TINK/Images/belt2_image.X3F1PY_1280_720.png
deleted file mode 100644
index 5713063..0000000
Binary files a/LastenradBayern/TINK/Images/belt2_image.X3F1PY_1280_720.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/belt2_image.X3F1PY_679_382.png b/LastenradBayern/TINK/Images/belt2_image.X3F1PY_679_382.png
deleted file mode 100644
index 186c8ff..0000000
Binary files a/LastenradBayern/TINK/Images/belt2_image.X3F1PY_679_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/belt3_image.DYOXPY_1280_720.png b/LastenradBayern/TINK/Images/belt3_image.DYOXPY_1280_720.png
deleted file mode 100644
index 220e362..0000000
Binary files a/LastenradBayern/TINK/Images/belt3_image.DYOXPY_1280_720.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/belt3_image.DYOXPY_679_382.png b/LastenradBayern/TINK/Images/belt3_image.DYOXPY_679_382.png
deleted file mode 100644
index c92b7af..0000000
Binary files a/LastenradBayern/TINK/Images/belt3_image.DYOXPY_679_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/seat1_image.ZQ65PY_680_382.png b/LastenradBayern/TINK/Images/seat1_image.ZQ65PY_680_382.png
deleted file mode 100644
index efb9c09..0000000
Binary files a/LastenradBayern/TINK/Images/seat1_image.ZQ65PY_680_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/seat1_image.ZQ65PY_797_448.png b/LastenradBayern/TINK/Images/seat1_image.ZQ65PY_797_448.png
deleted file mode 100644
index 8e74cf7..0000000
Binary files a/LastenradBayern/TINK/Images/seat1_image.ZQ65PY_797_448.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/seat2_image.QQZCQY_1280_720.png b/LastenradBayern/TINK/Images/seat2_image.QQZCQY_1280_720.png
deleted file mode 100644
index 3b82fc6..0000000
Binary files a/LastenradBayern/TINK/Images/seat2_image.QQZCQY_1280_720.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/seat2_image.QQZCQY_679_382.png b/LastenradBayern/TINK/Images/seat2_image.QQZCQY_679_382.png
deleted file mode 100644
index 689de9d..0000000
Binary files a/LastenradBayern/TINK/Images/seat2_image.QQZCQY_679_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/seat3_image.NQ5FQY_1280_720.png b/LastenradBayern/TINK/Images/seat3_image.NQ5FQY_1280_720.png
deleted file mode 100644
index 4eb4530..0000000
Binary files a/LastenradBayern/TINK/Images/seat3_image.NQ5FQY_1280_720.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/seat3_image.NQ5FQY_679_382.png b/LastenradBayern/TINK/Images/seat3_image.NQ5FQY_679_382.png
deleted file mode 100644
index 699e3b8..0000000
Binary files a/LastenradBayern/TINK/Images/seat3_image.NQ5FQY_679_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/trike_brake1_image.HZ17PY_678_382.png b/LastenradBayern/TINK/Images/trike_brake1_image.HZ17PY_678_382.png
deleted file mode 100644
index a6e112a..0000000
Binary files a/LastenradBayern/TINK/Images/trike_brake1_image.HZ17PY_678_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/trike_brake2_image.1YBAQY_1280_720.png b/LastenradBayern/TINK/Images/trike_brake2_image.1YBAQY_1280_720.png
deleted file mode 100644
index c68c373..0000000
Binary files a/LastenradBayern/TINK/Images/trike_brake2_image.1YBAQY_1280_720.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/trike_brake2_image.1YBAQY_679_382.png b/LastenradBayern/TINK/Images/trike_brake2_image.1YBAQY_679_382.png
deleted file mode 100644
index c389545..0000000
Binary files a/LastenradBayern/TINK/Images/trike_brake2_image.1YBAQY_679_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/trike_brake3_image.FJM2PY_1280_720.png b/LastenradBayern/TINK/Images/trike_brake3_image.FJM2PY_1280_720.png
deleted file mode 100644
index 7c68a90..0000000
Binary files a/LastenradBayern/TINK/Images/trike_brake3_image.FJM2PY_1280_720.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/trike_brake3_image.FJM2PY_679_382.png b/LastenradBayern/TINK/Images/trike_brake3_image.FJM2PY_679_382.png
deleted file mode 100644
index 3e6bace..0000000
Binary files a/LastenradBayern/TINK/Images/trike_brake3_image.FJM2PY_679_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/trike_stand1_image.4HJ5PY_679_382.png b/LastenradBayern/TINK/Images/trike_stand1_image.4HJ5PY_679_382.png
deleted file mode 100644
index dc648b2..0000000
Binary files a/LastenradBayern/TINK/Images/trike_stand1_image.4HJ5PY_679_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/trike_stand1_image.4HJ5PY_800_450.png b/LastenradBayern/TINK/Images/trike_stand1_image.4HJ5PY_800_450.png
deleted file mode 100644
index f2ac458..0000000
Binary files a/LastenradBayern/TINK/Images/trike_stand1_image.4HJ5PY_800_450.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/trike_stand2_image.RIX2PY_1280_720.png b/LastenradBayern/TINK/Images/trike_stand2_image.RIX2PY_1280_720.png
deleted file mode 100644
index 5a8041f..0000000
Binary files a/LastenradBayern/TINK/Images/trike_stand2_image.RIX2PY_1280_720.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/trike_stand2_image.RIX2PY_679_382.png b/LastenradBayern/TINK/Images/trike_stand2_image.RIX2PY_679_382.png
deleted file mode 100644
index d8c493b..0000000
Binary files a/LastenradBayern/TINK/Images/trike_stand2_image.RIX2PY_679_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/trike_stand3_image.FDR7PY_1280_720.png b/LastenradBayern/TINK/Images/trike_stand3_image.FDR7PY_1280_720.png
deleted file mode 100644
index b47d5f1..0000000
Binary files a/LastenradBayern/TINK/Images/trike_stand3_image.FDR7PY_1280_720.png and /dev/null differ
diff --git a/LastenradBayern/TINK/Images/trike_stand3_image.FDR7PY_679_382.png b/LastenradBayern/TINK/Images/trike_stand3_image.FDR7PY_679_382.png
deleted file mode 100644
index 5f769d5..0000000
Binary files a/LastenradBayern/TINK/Images/trike_stand3_image.FDR7PY_679_382.png and /dev/null differ
diff --git a/LastenradBayern/TINK/View/Account/AccountPage.xaml b/LastenradBayern/TINK/View/Account/AccountPage.xaml
index 324cfc8..07b1e3a 100644
--- a/LastenradBayern/TINK/View/Account/AccountPage.xaml
+++ b/LastenradBayern/TINK/View/Account/AccountPage.xaml
@@ -20,11 +20,11 @@
                         <Label Text="{Binding LoggedInInfo}" />
                         <Label IsVisible="{Binding IsBookingStateInfoVisible}"
                                 Text="{Binding BookingStateInfo}" />
-                        <Button Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}" 
+                        <Button Text="{x:Static resources:AppResources.MarkingAccountPageManagePersonalData}" 
                                 Command="{Binding OnManageAccount}"
                                 IsEnabled="{Binding IsLogoutPossible}"/>
 						<Button
-                                Text="{x:Static resources:AppResources.MessageAccountPageManageLogout}" 
+                                Text="{x:Static resources:AppResources.MarkingAccountPageManageLogout}" 
                                 Command="{Binding OnLogoutRequest}"
                                 IsEnabled="{Binding IsLogoutPossible}"/>
 					</StackLayout>
diff --git a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
index 45e207d..e8b8131 100644
--- a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
+++ b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
@@ -24,6 +24,7 @@ namespace TINK.View.BikesAtStation
 	using TINK.ViewModel.Bikes;
 	using Xamarin.CommunityToolkit.Extensions;
 	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.MultilingualResources;
 
 	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
@@ -110,7 +111,12 @@ namespace TINK.View.BikesAtStation
 			catch (Exception exception)
 			{
 				Log.ForContext<BikesAtStationPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+
+				await DisplayAlert(
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					AppResources.MessageAnswerOk);
+
 				isInitializationStarted = false;
 				return;
 			}
diff --git a/LastenradBayern/TINK/View/Contact/ContactPage.xaml b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
index fbb0623..6537717 100644
--- a/LastenradBayern/TINK/View/Contact/ContactPage.xaml
+++ b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
@@ -58,7 +58,7 @@
 
 					</StackLayout>
 
-					<!--Contact operator of selected station-->
+					<!--contact customer support of selected station-->
 					<StackLayout
 							IsVisible="{Binding IsOperatorInfoAvaliable}">
 
diff --git a/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml b/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml
index 5dcfa87..d85eba6 100644
--- a/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml
+++ b/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml
@@ -6,7 +6,7 @@
 	<Shell.TitleView>
 		<Grid ColumnDefinitions="Auto, 1*">
 			<Label Style="{StaticResource Label-Navbar}"
-                   Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}"/>
+                   Text="{x:Static resources:AppResources.MarkingAccountPageManagePersonalData}"/>
 		</Grid>
 	</Shell.TitleView>
 	<ContentPage.Content>
diff --git a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
index c436941..ba9d70e 100644
--- a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
+++ b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
@@ -5,6 +5,7 @@ using Serilog;
 using TINK.Model;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 using TINK.Model.Device;
+using TINK.MultilingualResources;
 using TINK.ViewModel.FindBike;
 using Xamarin.CommunityToolkit.Extensions;
 using Xamarin.Forms;
@@ -65,7 +66,10 @@ namespace TINK.View.FindBike
 			catch (Exception exception)
 			{
 				Log.ForContext<FindBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-				await DisplayAlert("Fehler", $"Seite Fahrrad Wählen kann nicht angezeigt werden. ${exception.Message}", "OK");
+				await DisplayAlert(
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					AppResources.MessageAnswerOk);
 				return;
 
 			}
diff --git a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
index 75c265c..fca7a06 100644
--- a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
+++ b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
@@ -14,6 +14,7 @@ namespace TINK.View.MyBikes
 	using TINK.Model;
 	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 	using TINK.Model.Device;
+	using TINK.MultilingualResources;
 	using TINK.ViewModel.MyBikes;
 	using Xamarin.CommunityToolkit.Extensions;
 
@@ -78,7 +79,10 @@ namespace TINK.View.MyBikes
 			catch (Exception exception)
 			{
 				Log.ForContext<MyBikesPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+				await DisplayAlert(
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					AppResources.MessageAnswerOk);
 				isInitializationStarted = false;
 				return;
 			}
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
index 8c30478..acb2220 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
@@ -20,7 +20,7 @@ namespace TINK.Services.BluetoothLock.BLE
 	/// <summary> Manages a single lock.</summary>
 	public abstract class LockItBase : ILockService
 	{
-		/// <summary> Lenght of seed in bytes.</summary>
+		/// <summary> Length of seed in bytes.</summary>
 		private const int SEEDLENGTH = 16;
 
 		/// <summary> Timeout for open/ close operations.</summary>
@@ -160,7 +160,7 @@ namespace TINK.Services.BluetoothLock.BLE
 			}
 			catch (System.Exception exception)
 			{
-				Log.ForContext<LockItBase>().Error("Getting activate lock charcteristic failed. {Exception}", exception);
+				Log.ForContext<LockItBase>().Error("Getting activate lock characteristic failed. {Exception}", exception);
 				throw new System.Exception($"Can not get activate characteristic. {exception.Message}", exception);
 			}
 
@@ -184,7 +184,7 @@ namespace TINK.Services.BluetoothLock.BLE
 			}
 			catch (System.Exception exception)
 			{
-				Log.ForContext<LockItBase>().Error("Getting alarm-charcteristic failed. {Exception}", exception);
+				Log.ForContext<LockItBase>().Error("Getting alarm-characteristic failed. {Exception}", exception);
 				throw new System.Exception($"Can not get alarm characteristic. {exception.Message}", exception);
 			}
 
@@ -207,7 +207,7 @@ namespace TINK.Services.BluetoothLock.BLE
 			}
 			catch (System.Exception exception)
 			{
-				Log.ForContext<LockItBase>().Error("Getting alarm settings charcteristic failed. {Exception}", exception);
+				Log.ForContext<LockItBase>().Error("Getting alarm settings characteristic failed. {Exception}", exception);
 				throw new System.Exception($"Can not get alarm settings characteristic. {exception.Message}", exception);
 			}
 
@@ -229,7 +229,7 @@ namespace TINK.Services.BluetoothLock.BLE
 			}
 			catch (System.Exception exception)
 			{
-				Log.ForContext<LockItBase>().Error("Getting auth-charcteristic failed. {Exception}", exception);
+				Log.ForContext<LockItBase>().Error("Getting auth-characteristic failed. {Exception}", exception);
 				throw new System.Exception(string.Format("Can not get auth characteristic. {0}", exception.Message), exception);
 			}
 
@@ -251,7 +251,7 @@ namespace TINK.Services.BluetoothLock.BLE
 			}
 			catch (System.Exception exception)
 			{
-				Log.ForContext<LockItBase>().Error("Getting state charcteristic failed. {Exception}", exception);
+				Log.ForContext<LockItBase>().Error("Getting state characteristic failed. {Exception}", exception);
 				throw new System.Exception(string.Format("Can not get state characteristic. {0}", exception.Message), exception);
 			}
 
@@ -273,7 +273,7 @@ namespace TINK.Services.BluetoothLock.BLE
 			}
 			catch (System.Exception exception)
 			{
-				Log.ForContext<LockItBase>().Error("Getting sound charcteristic failed. {Exception}", exception);
+				Log.ForContext<LockItBase>().Error("Getting sound characteristic failed. {Exception}", exception);
 				throw new System.Exception($"Can not get sound characteristic. {exception.Message}", exception);
 			}
 
@@ -295,7 +295,7 @@ namespace TINK.Services.BluetoothLock.BLE
 			}
 			catch (System.Exception exception)
 			{
-				Log.ForContext<LockItBase>().Error("Getting battery charcteristic failed. {Exception}", exception);
+				Log.ForContext<LockItBase>().Error("Getting battery characteristic failed. {Exception}", exception);
 				throw new System.Exception($"Can not get battery characteristic. {exception.Message}", exception);
 			}
 
@@ -317,7 +317,7 @@ namespace TINK.Services.BluetoothLock.BLE
 			}
 			catch (System.Exception exception)
 			{
-				Log.ForContext<LockItBase>().Error("Getting versions info charcteristic failed. {Exception}", exception);
+				Log.ForContext<LockItBase>().Error("Getting versions info characteristic failed. {Exception}", exception);
 				throw new System.Exception(string.Format("Can not get versions info characteristic. {0}", exception.Message), exception);
 			}
 
@@ -349,10 +349,10 @@ namespace TINK.Services.BluetoothLock.BLE
 			return;
 		}
 
-		/// <summary> Full idvertisement name.</summary>
+		/// <summary> Full advertisement name.</summary>
 		public string Name { get; private set; } = string.Empty;
 
-		/// <summary> Id part of idvertisement name.</summary>
+		/// <summary> Id part of advertisement name.</summary>
 		public int Id { get; private set; }
 
 		/// <summary> Query GUID of lock.</summary>
@@ -603,12 +603,12 @@ namespace TINK.Services.BluetoothLock.BLE
 			LockInfoAuthTdo lockInfo,
 			ICipher cipher)
 		{
-			Log.ForContext<LockItBase>().Debug($"Request to autenticate for {lockIt.Name}.");
+			Log.ForContext<LockItBase>().Debug($"Request to authenticate for {lockIt.Name}.");
 
 			var authCharacteristic = await lockIt.GetAuthCharacteristicAsync();
 			if (authCharacteristic == null)
 			{
-				Log.ForContext<LockItBase>().Debug("Getting auth-charcteristic failed.");
+				Log.ForContext<LockItBase>().Debug("Getting auth-characteristic failed.");
 				throw new CoundntGetCharacteristicException("Authentication failed. Auth characteristic must not be null.");
 			}
 
@@ -687,14 +687,14 @@ namespace TINK.Services.BluetoothLock.BLE
 		/// <summary> Gets the lock state like locking state (open/ close). </summary>
 		/// <param name="doWaitRetry">True if to wait and retry in case of failures. </param>
 		/// <remarks> 
-		/// Lock state is first byte of of value read from state characteristic ("0000baaa-1212-efde-1523-785fef13d123").
+		/// Lock state is first byte of value read from state characteristic ("0000baaa-1212-efde-1523-785fef13d123").
 		/// Values are as follows
 		/// Open = 0x00,
 		/// Closed = 0x01,
 		/// Unknown = 0x02,
 		/// CouldntCloseMoving = 0x03,
-		/// CouldntOpenBoldBlocked = 0x04,
-		/// CouldntCloseBoldBlocked = 0x05
+		/// CouldntOpenBoltBlocked = 0x04,
+		/// CouldntCloseBoltBlocked = 0x05
 		/// TINK.Services.BluetoothLock.Tdo.LockitLockingState.
 		/// </remarks>
 		/// <returns> Lock state.</returns>
@@ -750,6 +750,8 @@ namespace TINK.Services.BluetoothLock.BLE
 			}
 
 			byte[] state;
+
+			// Reads the lock state from characteristic
 			async Task<byte[]> readAsyncDelegate()
 			{
 				var cts = new CancellationTokenSource();
@@ -786,11 +788,12 @@ namespace TINK.Services.BluetoothLock.BLE
 				throw new System.Exception("Can not get lock state. No data read");
 			}
 
+			int lockingState = state[0];
 			var lockInfoTdo = new LockInfoTdo.Builder
 			{
 				Id = Id,
 				Guid = Guid,
-				State = (LockitLockingState?)state[0]
+				State = Enum.IsDefined(typeof(LockitLockingState), lockingState) ? (LockitLockingState?) lockingState : null
 			}.Build();
 
 			Log.ForContext<LockItBase>().Debug("Retrieving lock state (ReadAsync-call) succeeded. {@LockInfoTdo}{StateCharacteristic}{Reading}",
@@ -1251,6 +1254,6 @@ namespace TINK.Services.BluetoothLock.BLE
 			=> charcteristic.Id.ToString();
 
 		private static string ToSerilogString(byte[] byteArray)
-			=> "***"; // For debugging purposes it might be required to return string.Join(",", byteArray); Do not log any confidental value in production context.
+			=> "***"; // For debugging purposes it might be required to return string.Join(",", byteArray); Do not log any confidential value in production context.
 	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
index c7c1c23..6dbeeaa 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
@@ -147,7 +147,7 @@ namespace TINK.Services.BluetoothLock.BLE
 					Log.ForContext<LockItEventBased>().Information($"Lock was opened successfully.");
 					return lockingState.Value;
 
-				case LockitLockingState.CouldntOpenBoldBlocked:
+				case LockitLockingState.CouldntOpenBoltBlocked:
 					// Expected error. ILockIt count not be opened (Spoke blocks lock, ....)
 					Log.ForContext<LockItEventBased>().Debug($"Opening lock failed. Bold is blocked.");
 					throw new CouldntOpenBoldIsBlockedException();
@@ -161,7 +161,7 @@ namespace TINK.Services.BluetoothLock.BLE
 					// Comprises values
 					// - LockitLockingState.Closed 
 					// - LockitLockingState.Unknown
-					// - LockitLockingState.CouldntOpenBoldBlocked
+					// - LockitLockingState.CouldntOpenBoltBlocked
 					// Internal error which should never occur. Lock refuses to open but connection is ok.
 					Log.ForContext<LockItEventBased>().Debug($"Opening lock failed. Unexpected lock state {lockingState.Value.GetLockingState()} detected.");
 					throw new CouldntOpenInconsistentStateExecption(lockingState.Value.GetLockingState());
@@ -256,10 +256,10 @@ namespace TINK.Services.BluetoothLock.BLE
 
 			switch (lockingState.Value)
 			{
-				case LockitLockingState.CouldntCloseBoldBlocked:
+				case LockitLockingState.CouldntCloseBoltBlocked:
 					// Expected error. ILockIt could not be closed (Spoke blocks lock, ....)
 					Log.ForContext<LockItEventBased>().Debug($"Closing lock failed. Bold is blocked.");
-					throw new CouldntCloseBoldBlockedException();
+					throw new CouldntCloseBoltBlockedException();
 
 				case LockitLockingState.CouldntCloseMoving:
 					// Expected error. ILockIt could not be closed (bike is moving)
@@ -273,13 +273,13 @@ namespace TINK.Services.BluetoothLock.BLE
 				case LockitLockingState.Open:
 					// Expected error. ILockIt could not be closed. Bolt was blocked but was opened again.
 					Log.ForContext<LockItPolling>().Debug($"Closing lock failed. Bold is blocked but was reopened again.");
-					throw new CouldntCloseBoldBlockedException(LockingState.Open);
+					throw new CouldntCloseBoltBlockedException(LockingState.Open);
 
 				default:
 					// Comprises values
 					// - LockitLockingState.Open 
 					// - LockitLockingState.Unknown
-					// - LockitLockingState.CouldntOpenBoldBlocked
+					// - LockitLockingState.CouldntOpenBoltBlocked
 					// Internal error which should never occur. Lock refuses to close but connection is ok.                    
 					Log.ForContext<LockItEventBased>().Debug($"Opening lock failed. Unexpected lock state {lockingState.Value.GetLockingState()} detected.");
 					throw new CouldntCloseInconsistentStateExecption(lockingState.Value.GetLockingState());
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
index f665a60..c6ce716 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
@@ -55,34 +55,35 @@ namespace TINK.Services.BluetoothLock.BLE
 			}
 
 			var info = await GetLockStateAsync();
-			if (info?.State == null)
+			if (!(info?.State is LockitLockingState initialLockingState))
 			{
 				// Device not reachable.
 				Log.ForContext<LockItPolling>().Information("Can not open lock. Device is not reachable (get state).");
 				return await Task.FromResult((LockitLockingState?)null);
 			}
 
-			if (info.State.Value.GetLockingState() == LockingState.Open)
+			if (initialLockingState.GetLockingState() == LockingState.Open)
 			{
 				// Lock is already open.
 				Log.ForContext<LockItPolling>().Information("No need to open lock. Lock is already open.");
 				return await Task.FromResult((LockitLockingState?)null);
 			}
-
+				
 			Log.ForContext<LockItPolling>().Debug($"Request to open lock. Current locking state is {info}, counter value {ActivateLockWriteCounter}.");
 
+			// Send command to open to lock.
 			var result = await OpenCloseLockAsync(
-				true); // Close lock);
+				true /* Close lock*/ );
 
 			if (!result)
 			{
 				// State did not change. Return previous state.
 				Log.ForContext<LockItPolling>().Information($"Opening lock failed.");
-				return await Task.FromResult(info.State.Value);
+				return await Task.FromResult(initialLockingState);
 			}
 
-			info = await GetLockStateAsync();
-			if (info?.State == null)
+			var subsequentLockingStateNullable = (await GetLockStateAsync()).State;
+			if (subsequentLockingStateNullable == null)
 			{
 				// Device not reachable.
 				Log.ForContext<LockItPolling>().Information($"State after open command unknown. Device is not reachable (get state).");
@@ -92,28 +93,28 @@ namespace TINK.Services.BluetoothLock.BLE
 			var watch = new Stopwatch();
 			watch.Start();
 
-			while (info?.State != null
-				&& info.State.Value != LockitLockingState.CouldntOpenBoldBlocked
-				&& info.State.Value != LockitLockingState.Open
+			while (subsequentLockingStateNullable != null
+				&& subsequentLockingStateNullable != LockitLockingState.CouldntOpenBoltBlocked
+				&& subsequentLockingStateNullable != LockitLockingState.Open
 				&& watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
 			{
-				info = await GetLockStateAsync(true); // While opening lock seems not always respond to reading operations.
-				Log.ForContext<LockItPolling>().Debug($"Waiting for lock to open. Current lock state is {info?.State.Value}.");
+				subsequentLockingStateNullable = (await GetLockStateAsync(true)).State; // While opening lock seems not always respond to reading operations.
+				Log.ForContext<LockItPolling>().Debug($"Waiting for lock to open. Current lock state is {subsequentLockingStateNullable}.");
 			}
 
-			if (info == null)
+			if (!(subsequentLockingStateNullable is LockitLockingState subsequentLockingState))
 			{
 				Log.ForContext<LockItPolling>().Fatal($"Opening lock failed. State object is null.");
 				return null;
 			}
 
-			switch (info.State.Value)
+			switch (subsequentLockingState)
 			{
 				case LockitLockingState.Open:
 					Log.ForContext<LockItPolling>().Information($"Lock was opened successfully.");
-					return info.State.Value;
+					return subsequentLockingState;
 
-				case LockitLockingState.CouldntOpenBoldBlocked:
+				case LockitLockingState.CouldntOpenBoltBlocked:
 					// Expected error. ILockIt count not be opened (Spoke blocks lock, ....)
 					Log.ForContext<LockItPolling>().Debug($"Opening lock failed. Bold is blocked.");
 					throw new CouldntOpenBoldIsBlockedException();
@@ -127,10 +128,10 @@ namespace TINK.Services.BluetoothLock.BLE
 					// Comprises values
 					// - LockitLockingState.Closed 
 					// - LockitLockingState.CouldntCloseMoving (should never happen because command open was send)
-					// - LockitLockingState.CouldntCloseBoldBlocked (should never happen because command open was send)
+					// - LockitLockingState.CouldntCloseBoltBlocked (should never happen because command open was send)
 					// Internal error which should never occur. Lock refuses to open but connection is ok.
-					Log.ForContext<LockItPolling>().Debug($"Opening lock failed. Unexpected lock state {info.State.Value.GetLockingState()} detected.");
-					throw new CouldntOpenInconsistentStateExecption(info.State.Value.GetLockingState());
+					Log.ForContext<LockItPolling>().Debug($"Opening lock failed. Unexpected lock state {subsequentLockingState.GetLockingState()} detected.");
+					throw new CouldntOpenInconsistentStateExecption(subsequentLockingState.GetLockingState());
 			}
 		}
 
@@ -145,33 +146,35 @@ namespace TINK.Services.BluetoothLock.BLE
 
 			// Get current state
 			var info = await GetLockStateAsync();
-			if (info?.State == null)
+			if (!(info?.State is LockitLockingState initialLockingState))
 			{
 				// Device not reachable.
 				Log.ForContext<LockItPolling>().Error("Can not close lock. Device is not reachable (get state).");
 				return await Task.FromResult((LockitLockingState?)null);
 			}
 
-			if (info.State.Value.GetLockingState() == LockingState.Closed)
+			if (initialLockingState.GetLockingState() == LockingState.Closed)
 			{
 				// Lock is already closed.
 				Log.ForContext<LockItPolling>().Error("No need to close lock. Lock is already closed.");
-				return await Task.FromResult(info.State.Value);
+				return await Task.FromResult(initialLockingState);
 			}
 
 			Log.ForContext<LockItPolling>().Debug($"Request to close lock. Current locking state is {info}, counter value {ActivateLockWriteCounter}.");
 
-			var result = await OpenCloseLockAsync(false); // Close lock
+			// Send command to close to lock.
+			var result = await OpenCloseLockAsync(
+				false /*Close lock*/); 
 			if (!result)
 			{
 				// State did not change. Return previous state.
 				Log.ForContext<LockItPolling>().Information($"Closing lock failed.");
-				return await Task.FromResult(info.State.Value);
+				return await Task.FromResult(initialLockingState);
 			}
 
-			// Get lock state until either lock state chaneges or until log gets unreachable.
-			info = await GetLockStateAsync();
-			if (info?.State == null)
+			// Get lock state until either lock state changes or until log gets unreachable.
+			var subsequentLockingStateNullable = (await GetLockStateAsync()).State;
+			if (subsequentLockingStateNullable == null)
 			{
 				// Device not reachable.
 				Log.ForContext<LockItPolling>().Information($"Lock state after close command unknown.");
@@ -182,14 +185,14 @@ namespace TINK.Services.BluetoothLock.BLE
 			watch.Start();
 
 			var hasBeenLocked = false;
-			while (info.State != null
-				&& info.State.Value != LockitLockingState.CouldntCloseMoving
-				&& info.State.Value != LockitLockingState.Closed
+			while (subsequentLockingStateNullable != null
+				&& subsequentLockingStateNullable != LockitLockingState.CouldntCloseMoving
+				&& subsequentLockingStateNullable != LockitLockingState.Closed
 				&& watch.Elapsed < TimeSpan.FromMilliseconds(OPEN_CLOSE_TIMEOUT_MS))
 			{
-				info = await GetLockStateAsync(true); ; // While closing lock seems not always respond to reading operations.
+				subsequentLockingStateNullable = (await GetLockStateAsync(true)).State; ; // While closing lock seems not always respond to reading operations.
 
-				if (info.State.Value == LockitLockingState.CouldntCloseBoldBlocked)
+				if (subsequentLockingStateNullable == LockitLockingState.CouldntCloseBoltBlocked)
 				{
 					// Lock reported a blocked bold.
 					hasBeenLocked = true;
@@ -197,14 +200,14 @@ namespace TINK.Services.BluetoothLock.BLE
 					continue;
 				}
 
-				if (hasBeenLocked && info.State.Value == LockitLockingState.Open)
+				if (hasBeenLocked && subsequentLockingStateNullable == LockitLockingState.Open)
 				{
 					// ILockIt could not be closed. Bolt was blocked but was opened again.
 					Log.ForContext<LockItPolling>().Debug($"Closing lock failed. Bold was blocked and lock was reopened.");
-					throw new CouldntCloseBoldBlockedException(LockingState.Open);
+					throw new CouldntCloseBoltBlockedException(LockingState.Open);
 				}
 
-				Log.ForContext<LockItPolling>().Debug($"Waiting for lock to close. Current lock state is {info?.State.Value}.");
+				Log.ForContext<LockItPolling>().Debug($"Waiting for lock to close. Current lock state is {subsequentLockingStateNullable}.");
 			}
 
 			if (info == null)
@@ -213,12 +216,19 @@ namespace TINK.Services.BluetoothLock.BLE
 				return null;
 			}
 
-			switch (info.State.Value)
+			if (!(subsequentLockingStateNullable is LockitLockingState subsequentLockingState))
 			{
-				case LockitLockingState.CouldntCloseBoldBlocked:
+				// Device not reachable.
+				Log.ForContext<LockItPolling>().Information($"Lock state after close command unknown.");
+				return await Task.FromResult((LockitLockingState?)null);
+			}
+
+			switch (subsequentLockingState)
+			{
+				case LockitLockingState.CouldntCloseBoltBlocked:
 					// Expected error. ILockIt could not be closed (Spoke blocks lock, ....)
 					Log.ForContext<LockItPolling>().Debug($"Closing lock failed. Bold is blocked.");
-					throw new CouldntCloseBoldBlockedException();
+					throw new CouldntCloseBoltBlockedException();
 
 				case LockitLockingState.CouldntCloseMoving:
 					// Expected error. ILockIt could not be closed (bike is moving)
@@ -228,16 +238,16 @@ namespace TINK.Services.BluetoothLock.BLE
 				case LockitLockingState.Closed:
 					// Everything is ok.
 					Log.ForContext<LockItPolling>().Information($"Lock was closed successfully.");
-					return info.State.Value;
+					return subsequentLockingState;
 
 				default:
 					// Comprises values
 					// - LockitLockingState.Open 
 					// - LockitLockingState.Unknown
-					// - LockitLockingState.CouldntOpenBoldBlocked
+					// - LockitLockingState.CouldntOpenBoltBlocked
 					// Internal error which should never occur. Lock refuses to close but connection is ok.
-					Log.ForContext<LockItPolling>().Debug($"Closing lock failed. Unexpected lock state {info.State.Value.GetLockingState()} detected.");
-					throw new CouldntCloseInconsistentStateExecption(info.State.Value.GetLockingState());
+					Log.ForContext<LockItPolling>().Debug($"Closing lock failed. Unexpected lock state {subsequentLockingState.GetLockingState()} detected.");
+					throw new CouldntCloseInconsistentStateExecption(subsequentLockingState.GetLockingState());
 			}
 		}
 	}
diff --git a/LockItShared/MultilingualResources/LockItShared.de.xlf b/LockItShared/MultilingualResources/LockItShared.de.xlf
index 3bb2a8b..e9430e3 100644
--- a/LockItShared/MultilingualResources/LockItShared.de.xlf
+++ b/LockItShared/MultilingualResources/LockItShared.de.xlf
@@ -6,54 +6,57 @@
     </header>
     <body>
       <group id="LOCKITSHARED/MULTILINGUALRESOURCES/RESOURCES.RESX" datatype="resx">
-        <trans-unit id="ErrorCloseLockUnexpectedState" translate="yes" xml:space="preserve">
-          <source>Unexpected locking state "{0}" detected after sending close command.</source>
-          <target state="translated">Unerwarteter Schlosszustand "{0}" gemeldet nach Ausführung des Abschließen-Befehls.</target>
+        <trans-unit id="LockItExceptionCloseLockUnknownPosition" translate="yes" xml:space="preserve">
+          <source>Lock reports unknown bold position. Lock could be closed or open. Please try again or contact customer support.</source>
+          <target state="translated">Das Schloss meldet unbekannte Position des Schlossbügels. Das Schloss könnte geschlossen oder offen sein. Bitte versuchen Sie es erneut oder melden Sie das Fahrrad dem Betreiber!</target>
         </trans-unit>
-        <trans-unit id="ErrorCloseLockUnknownPosition" translate="yes" xml:space="preserve">
-          <source>Lock reports unknown bold position.</source>
-          <target state="translated">Schloss meldet unbekannten Schließzustand.</target>
+        <trans-unit id="LockItExceptionOpenLockUnexpectedState" translate="yes" xml:space="preserve">
+          <source>Unexpected locking state "{0}" detected after sending open command. Please try again or contact customer support.</source>
+          <target state="translated">Unerwarteter Schlosszustand "{0}" nach Ausführen des Öffnen-Befehls erkannt. Bitte versuchen Sie es erneut oder kontaktieren Sie den Kundensupport.</target>
         </trans-unit>
-        <trans-unit id="ErrorOpenLockUnexpectedState" translate="yes" xml:space="preserve">
-          <source>Unexpected locking state "{0}" detected after sending open command.</source>
-          <target state="translated">Unerwarteter Schlosszustand "{0}" gemeldet nach Ausführen des Öffnen-Befehls.</target>
+        <trans-unit id="LockItExceptionBluetoothDisconnected" translate="yes" xml:space="preserve">
+          <source>Bluetooth connection to the lock could not be established. Activate Bluetooth and try again.</source>
+          <target state="translated">Es konnte keine Bluetooth-Verbindung zum Schloss hergestellt werden. Aktivieren Sie Bluetooth und versuchen Sie es erneut.</target>
         </trans-unit>
-        <trans-unit id="ErrorBluetoothDisconnectedException" translate="yes" xml:space="preserve">
-          <source>No bluetooth connection.</source>
-          <target state="translated">Keine Bluetooth-Verbindung.</target>
+        <trans-unit id="LockItExceptionCloseLockMoving" translate="yes" xml:space="preserve">
+          <source>The process is motion sensitive. Step close to the lock, do not move, and try again.</source>
+          <target state="translated">Der Vorgang ist bewegungssensibel. Treten Sie nah an das Schloss heran, bewegen Sie sich nicht und versuchen Sie es erneut.</target>
         </trans-unit>
-        <trans-unit id="ErrorCloseLockBikeMoving" translate="yes" xml:space="preserve">
-          <source>Bike is moving.</source>
-          <target state="translated">Rad ist in Bewegung.</target>
+        <trans-unit id="LockItExceptionOpenLockBoldWasBlocked" translate="yes" xml:space="preserve">
+          <source>Bolt was blocked. Make sure that no spoke presses against the lock bolt and try again.</source>
+          <target state="translated">Der Schlossbügel war blockiert. Stellen Sie sicher, dass keine Speiche oder anderer Gegenstand das Schloss blockiert und wiederholen Sie den Vorgang.</target>
         </trans-unit>
-        <trans-unit id="ErrorCloseLockBoldBlocked" translate="yes" xml:space="preserve">
-          <source>Bold is blocked.</source>
-          <target state="translated">Schloss ist blockiert.</target>
+        <trans-unit id="LockItExceptionConnectLockBluetoothNotOnException" translate="yes" xml:space="preserve">
+          <source>Bluetooth connection to the lock could not be established. Current Blutooth status is {0}. Activate Bluetooth and try again.</source>
+          <target state="translated">Es kann keine Bluetooth-Verbindung hergestellt werden. Der aktuelle Blutooth-Status ist {0}. Aktivieren Sie Bluetooth und versuchen Sie es erneut.</target>
         </trans-unit>
-        <trans-unit id="ErrorOpenLockBoldBlocked" translate="yes" xml:space="preserve">
-          <source>Bold is blocked.</source>
-          <target state="translated">Schloss ist blockiert.</target>
+        <trans-unit id="LockItExceptionConnectLockBluetoothOffException" translate="yes" xml:space="preserve">
+          <source>Bluetooth connection to the lock could not be established. Activate Bluetooth and try again.</source>
+          <target state="translated">Es kann keine Bluetooth-Verbindung hergestellt werden. Aktivieren Sie Bluetooth und versuchen Sie es erneut.</target>
         </trans-unit>
-        <trans-unit id="ErrorOpenLockBoldWasBlocked" translate="yes" xml:space="preserve">
-          <source>Bold was or is blocked.</source>
-          <target state="needs-review-translation">Schloss war oder ist blockiert.</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+        <trans-unit id="LockItExceptionConnectLockLocationOffException" translate="yes" xml:space="preserve">
+          <source>Connection to the lock could not be established. Activate Location services and try again.</source>
+          <target state="translated">Es konnte keine Verbindung zum Schloss hergestellt werden. Aktivieren Sie die Standortdienste und versuchen Sie es erneut.</target>
         </trans-unit>
-        <trans-unit id="ErrorConnectLockBluetoothNotOnException" translate="yes" xml:space="preserve">
-          <source>Can not connect to lock. Unexpected bluetooth state {0} detected.</source>
-          <target state="translated">Kann keine Verbindung zum Schloss herstellen. Unerwarteter Bluetooth-Status {0} erkannt.</target>
+        <trans-unit id="LockItExceptionConnectLockLocationPermissingMissingException" translate="yes" xml:space="preserve">
+          <source>Connection to the lock could not be established. Grant Location permission, activate Location services and try again.</source>
+          <target state="translated">Es konnte keine Verbindung zum Schloss hergestellt werden. Erlauben Sie den Standort-Zugriff, aktivieren Sie die Standortdienste und versuchen Sie es erneut.</target>
         </trans-unit>
-        <trans-unit id="ErrorConnectLockBluetoothOffException" translate="yes" xml:space="preserve">
-          <source>Can not connect to lock. Bluetooth is off but has to be turned on.</source>
-          <target state="translated">Kann keine Verbindung zum Schloss herstellen. Bluetooth ist aus und sollte aber angeschalten sein.</target>
+        <trans-unit id="LockItExceptionOpenLockBoldStatusIsUnknown" translate="yes" xml:space="preserve">
+          <source>Position of lock bolt is unknown. Lock could be closed or open. Please try again or contact customer support.</source>
+          <target state="translated">Position des Schlossbügels ist unbekannt. Schloss könnte geschlossen oder offen sein. Bitte versuchen Sie es erneut oder kontaktieren Sie den Kundensupport.</target>
         </trans-unit>
-        <trans-unit id="ErrorConnectLockLocationOffException" translate="yes" xml:space="preserve">
-          <source>Can not connect to lock. Location is off but has to be turned on.</source>
-          <target state="translated">Kann keine Verbindung zum Schloss herstellen. Standortbestimmung ist deaktiviert, sollte aber aktiviert sein.</target>
+        <trans-unit id="LockItExceptionCloseLockBoltBlocked" translate="yes" xml:space="preserve">
+          <source>Lock bolt is blocked. Make sure that no spoke or any other obstacle prevents the lock from closing and try again.</source>
+          <target state="translated">Der Schlossbügel ist blockiert. Stellen Sie sicher, dass keine Speiche oder ein anderes Hindernis das Schließen des Schlosses verhindert, und versuchen Sie es erneut.</target>
         </trans-unit>
-        <trans-unit id="ErrorConnectLockLocationPermissingMissingException" translate="yes" xml:space="preserve">
-          <source>Can not connect to lock. Location permission is required but not granted. </source>
-          <target state="translated">Kann keine Verbindung zum Schloss herstellen. Standort-Zugriffserlaubnis muss erteilt sein wurde aber nicht erteilt. </target>
+        <trans-unit id="LockItExceptionOpenLockBoltBlocked" translate="yes" xml:space="preserve">
+          <source>Lock bolt is blocked. Make sure that no spoke presses against the lock bolt and try again.</source>
+          <target state="translated">Der Schlossbügel ist blockiert. Stellen Sie sicher, dass keine Speiche gegen den Bügel drückt und versuchen Sie es erneut.</target>
+        </trans-unit>
+        <trans-unit id="LockItExceptionCloseLockUnexpectedLockState" translate="yes" xml:space="preserve">
+          <source>Unexpected locking state "{0}" detected after sending close command. Please try again or contact customer support.</source>
+          <target state="translated">Unerwarteter Schlosszustand "{0}" nach Senden des Schließbefehls festgestellt. Bitte versuchen Sie es erneut oder kontaktieren Sie den Kundensupport.</target>
         </trans-unit>
       </group>
     </body>
diff --git a/LockItShared/MultilingualResources/Resources.Designer.cs b/LockItShared/MultilingualResources/Resources.Designer.cs
index 652a138..f1da258 100644
--- a/LockItShared/MultilingualResources/Resources.Designer.cs
+++ b/LockItShared/MultilingualResources/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace TINK.MultilingualResources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -61,110 +61,119 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to No bluetooth connection..
+        ///   Looks up a localized string similar to Bluetooth connection to the lock could not be established. Activate Bluetooth and try again..
         /// </summary>
-        internal static string ErrorBluetoothDisconnectedException {
+        internal static string LockItExceptionBluetoothDisconnected {
             get {
-                return ResourceManager.GetString("ErrorBluetoothDisconnectedException", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionBluetoothDisconnected", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bike is moving..
+        ///   Looks up a localized string similar to Lock bolt is blocked. Make sure that no spoke or any other obstacle prevents the lock from closing and try again..
         /// </summary>
-        internal static string ErrorCloseLockBikeMoving {
+        internal static string LockItExceptionCloseLockBoltBlocked {
             get {
-                return ResourceManager.GetString("ErrorCloseLockBikeMoving", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionCloseLockBoltBlocked", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bold is blocked..
+        ///   Looks up a localized string similar to The process is motion sensitive. Step close to the lock, do not move, and try again..
         /// </summary>
-        internal static string ErrorCloseLockBoldBlocked {
+        internal static string LockItExceptionCloseLockMoving {
             get {
-                return ResourceManager.GetString("ErrorCloseLockBoldBlocked", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionCloseLockMoving", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unexpected locking state &quot;{0}&quot; detected after sending close command..
+        ///   Looks up a localized string similar to Unexpected locking state &quot;{0}&quot; detected after sending close command. Please try again or contact customer support..
         /// </summary>
-        internal static string ErrorCloseLockUnexpectedState {
+        internal static string LockItExceptionCloseLockUnexpectedLockState {
             get {
-                return ResourceManager.GetString("ErrorCloseLockUnexpectedState", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionCloseLockUnexpectedLockState", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lock reports unknown bold position..
+        ///   Looks up a localized string similar to Lock reports unknown bold position. Lock could be closed or open. Please try again or contact customer support..
         /// </summary>
-        internal static string ErrorCloseLockUnknownPosition {
+        internal static string LockItExceptionCloseLockUnknownPosition {
             get {
-                return ResourceManager.GetString("ErrorCloseLockUnknownPosition", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionCloseLockUnknownPosition", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Can not connect to lock. Unexpected bluetooth state {0} detected..
+        ///   Looks up a localized string similar to Bluetooth connection to the lock could not be established. Current Blutooth status is {0}. Activate Bluetooth and try again..
         /// </summary>
-        internal static string ErrorConnectLockBluetoothNotOnException {
+        internal static string LockItExceptionConnectLockBluetoothNotOnException {
             get {
-                return ResourceManager.GetString("ErrorConnectLockBluetoothNotOnException", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionConnectLockBluetoothNotOnException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Can not connect to lock. Bluetooth is off but has to be turned on..
+        ///   Looks up a localized string similar to Bluetooth connection to the lock could not be established. Activate Bluetooth and try again..
         /// </summary>
-        internal static string ErrorConnectLockBluetoothOffException {
+        internal static string LockItExceptionConnectLockBluetoothOffException {
             get {
-                return ResourceManager.GetString("ErrorConnectLockBluetoothOffException", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionConnectLockBluetoothOffException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Can not connect to lock. Location is off but has to be turned on..
+        ///   Looks up a localized string similar to Connection to the lock could not be established. Activate Location services and try again..
         /// </summary>
-        internal static string ErrorConnectLockLocationOffException {
+        internal static string LockItExceptionConnectLockLocationOffException {
             get {
-                return ResourceManager.GetString("ErrorConnectLockLocationOffException", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionConnectLockLocationOffException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Can not connect to lock. Location permission is required but not granted. .
+        ///   Looks up a localized string similar to Connection to the lock could not be established. Grant Location permission, activate Location services and try again..
         /// </summary>
-        internal static string ErrorConnectLockLocationPermissingMissingException {
+        internal static string LockItExceptionConnectLockLocationPermissingMissingException {
             get {
-                return ResourceManager.GetString("ErrorConnectLockLocationPermissingMissingException", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionConnectLockLocationPermissingMissingException", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bold is blocked..
+        ///   Looks up a localized string similar to Position of lock bolt is unknown. Lock could be closed or open. Please try again or contact customer support..
         /// </summary>
-        internal static string ErrorOpenLockBoldIsBlocked {
+        internal static string LockItExceptionOpenLockBoldStatusIsUnknown {
             get {
-                return ResourceManager.GetString("ErrorOpenLockBoldIsBlocked", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionOpenLockBoldStatusIsUnknown", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Bold status is unknown..
+        ///   Looks up a localized string similar to Bolt was blocked. Make sure that no spoke presses against the lock bolt and try again..
         /// </summary>
-        internal static string ErrorOpenLockBoldStatusIsUnknown {
+        internal static string LockItExceptionOpenLockBoldWasBlocked {
             get {
-                return ResourceManager.GetString("ErrorOpenLockBoldStatusIsUnknown", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionOpenLockBoldWasBlocked", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Unexpected locking state &quot;{0}&quot; detected after sending open command..
+        ///   Looks up a localized string similar to Lock bolt is blocked. Make sure that no spoke presses against the lock bolt and try again..
         /// </summary>
-        internal static string ErrorOpenLockUnexpectedState {
+        internal static string LockItExceptionOpenLockBoltBlocked {
             get {
-                return ResourceManager.GetString("ErrorOpenLockUnexpectedState", resourceCulture);
+                return ResourceManager.GetString("LockItExceptionOpenLockBoltBlocked", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Unexpected locking state &quot;{0}&quot; detected after sending open command. Please try again or contact customer support..
+        /// </summary>
+        internal static string LockItExceptionOpenLockUnexpectedState {
+            get {
+                return ResourceManager.GetString("LockItExceptionOpenLockUnexpectedState", resourceCulture);
             }
         }
     }
diff --git a/LockItShared/MultilingualResources/Resources.de.resx b/LockItShared/MultilingualResources/Resources.de.resx
index 0fb1b22..4afaee0 100644
--- a/LockItShared/MultilingualResources/Resources.de.resx
+++ b/LockItShared/MultilingualResources/Resources.de.resx
@@ -12,40 +12,43 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ErrorCloseLockUnexpectedState" xml:space="preserve">
-    <value>Unerwarteter Schlosszustand "{0}" gemeldet nach Ausführung des Abschließen-Befehls.</value>
+  <data name="LockItExceptionCloseLockUnknownPosition" xml:space="preserve">
+    <value>Das Schloss meldet unbekannte Position des Schlossbügels. Das Schloss könnte geschlossen oder offen sein. Bitte versuchen Sie es erneut oder melden Sie das Fahrrad dem Betreiber!</value>
   </data>
-  <data name="ErrorCloseLockUnknownPosition" xml:space="preserve">
-    <value>Schloss meldet unbekannten Schließzustand.</value>
+  <data name="LockItExceptionOpenLockUnexpectedState" xml:space="preserve">
+    <value>Unerwarteter Schlosszustand "{0}" nach Ausführen des Öffnen-Befehls erkannt. Bitte versuchen Sie es erneut oder kontaktieren Sie den Kundensupport.</value>
   </data>
-  <data name="ErrorOpenLockUnexpectedState" xml:space="preserve">
-    <value>Unerwarteter Schlosszustand "{0}" gemeldet nach Ausführen des Öffnen-Befehls.</value>
+  <data name="LockItExceptionBluetoothDisconnected" xml:space="preserve">
+    <value>Es konnte keine Bluetooth-Verbindung zum Schloss hergestellt werden. Aktivieren Sie Bluetooth und versuchen Sie es erneut.</value>
   </data>
-  <data name="ErrorBluetoothDisconnectedException" xml:space="preserve">
-    <value>Keine Bluetooth-Verbindung.</value>
+  <data name="LockItExceptionCloseLockMoving" xml:space="preserve">
+    <value>Der Vorgang ist bewegungssensibel. Treten Sie nah an das Schloss heran, bewegen Sie sich nicht und versuchen Sie es erneut.</value>
   </data>
-  <data name="ErrorCloseLockBikeMoving" xml:space="preserve">
-    <value>Rad ist in Bewegung.</value>
+  <data name="LockItExceptionOpenLockBoldWasBlocked" xml:space="preserve">
+    <value>Der Schlossbügel war blockiert. Stellen Sie sicher, dass keine Speiche oder anderer Gegenstand das Schloss blockiert und wiederholen Sie den Vorgang.</value>
   </data>
-  <data name="ErrorCloseLockBoldBlocked" xml:space="preserve">
-    <value>Schloss ist blockiert.</value>
+  <data name="LockItExceptionConnectLockBluetoothNotOnException" xml:space="preserve">
+    <value>Es kann keine Bluetooth-Verbindung hergestellt werden. Der aktuelle Blutooth-Status ist {0}. Aktivieren Sie Bluetooth und versuchen Sie es erneut.</value>
   </data>
-  <data name="ErrorOpenLockBoldBlocked" xml:space="preserve">
-    <value>Schloss ist blockiert.</value>
+  <data name="LockItExceptionConnectLockBluetoothOffException" xml:space="preserve">
+    <value>Es kann keine Bluetooth-Verbindung hergestellt werden. Aktivieren Sie Bluetooth und versuchen Sie es erneut.</value>
   </data>
-  <data name="ErrorOpenLockBoldWasBlocked" xml:space="preserve">
-    <value>Schloss war oder ist blockiert.</value>
+  <data name="LockItExceptionConnectLockLocationOffException" xml:space="preserve">
+    <value>Es konnte keine Verbindung zum Schloss hergestellt werden. Aktivieren Sie die Standortdienste und versuchen Sie es erneut.</value>
   </data>
-  <data name="ErrorConnectLockBluetoothNotOnException" xml:space="preserve">
-    <value>Kann keine Verbindung zum Schloss herstellen. Unerwarteter Bluetooth-Status {0} erkannt.</value>
+  <data name="LockItExceptionConnectLockLocationPermissingMissingException" xml:space="preserve">
+    <value>Es konnte keine Verbindung zum Schloss hergestellt werden. Erlauben Sie den Standort-Zugriff, aktivieren Sie die Standortdienste und versuchen Sie es erneut.</value>
   </data>
-  <data name="ErrorConnectLockBluetoothOffException" xml:space="preserve">
-    <value>Kann keine Verbindung zum Schloss herstellen. Bluetooth ist aus und sollte aber angeschalten sein.</value>
+  <data name="LockItExceptionOpenLockBoldStatusIsUnknown" xml:space="preserve">
+    <value>Position des Schlossbügels ist unbekannt. Schloss könnte geschlossen oder offen sein. Bitte versuchen Sie es erneut oder kontaktieren Sie den Kundensupport.</value>
   </data>
-  <data name="ErrorConnectLockLocationOffException" xml:space="preserve">
-    <value>Kann keine Verbindung zum Schloss herstellen. Standortbestimmung ist deaktiviert, sollte aber aktiviert sein.</value>
+  <data name="LockItExceptionCloseLockBoltBlocked" xml:space="preserve">
+    <value>Der Schlossbügel ist blockiert. Stellen Sie sicher, dass keine Speiche oder ein anderes Hindernis das Schließen des Schlosses verhindert, und versuchen Sie es erneut.</value>
   </data>
-  <data name="ErrorConnectLockLocationPermissingMissingException" xml:space="preserve">
-    <value>Kann keine Verbindung zum Schloss herstellen. Standort-Zugriffserlaubnis muss erteilt sein wurde aber nicht erteilt. </value>
+  <data name="LockItExceptionOpenLockBoltBlocked" xml:space="preserve">
+    <value>Der Schlossbügel ist blockiert. Stellen Sie sicher, dass keine Speiche gegen den Bügel drückt und versuchen Sie es erneut.</value>
+  </data>
+  <data name="LockItExceptionCloseLockUnexpectedLockState" xml:space="preserve">
+    <value>Unerwarteter Schlosszustand "{0}" nach Senden des Schließbefehls festgestellt. Bitte versuchen Sie es erneut oder kontaktieren Sie den Kundensupport.</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/LockItShared/MultilingualResources/Resources.resx b/LockItShared/MultilingualResources/Resources.resx
index d3fed11..bb55866 100644
--- a/LockItShared/MultilingualResources/Resources.resx
+++ b/LockItShared/MultilingualResources/Resources.resx
@@ -117,40 +117,43 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ErrorBluetoothDisconnectedException" xml:space="preserve">
-    <value>No bluetooth connection.</value>
+  <data name="LockItExceptionBluetoothDisconnected" xml:space="preserve">
+    <value>Bluetooth connection to the lock could not be established. Activate Bluetooth and try again.</value>
   </data>
-  <data name="ErrorCloseLockBikeMoving" xml:space="preserve">
-    <value>Bike is moving.</value>
+  <data name="LockItExceptionCloseLockMoving" xml:space="preserve">
+    <value>The process is motion sensitive. Step close to the lock, do not move, and try again.</value>
   </data>
-  <data name="ErrorCloseLockBoldBlocked" xml:space="preserve">
-    <value>Bold is blocked.</value>
+  <data name="LockItExceptionCloseLockBoltBlocked" xml:space="preserve">
+    <value>Lock bolt is blocked. Make sure that no spoke or any other obstacle prevents the lock from closing and try again.</value>
   </data>
-  <data name="ErrorCloseLockUnexpectedState" xml:space="preserve">
-    <value>Unexpected locking state "{0}" detected after sending close command.</value>
+  <data name="LockItExceptionCloseLockUnexpectedLockState" xml:space="preserve">
+    <value>Unexpected locking state "{0}" detected after sending close command. Please try again or contact customer support.</value>
   </data>
-  <data name="ErrorCloseLockUnknownPosition" xml:space="preserve">
-    <value>Lock reports unknown bold position.</value>
+  <data name="LockItExceptionCloseLockUnknownPosition" xml:space="preserve">
+    <value>Lock reports unknown bold position. Lock could be closed or open. Please try again or contact customer support.</value>
   </data>
-  <data name="ErrorConnectLockBluetoothNotOnException" xml:space="preserve">
-    <value>Can not connect to lock. Unexpected bluetooth state {0} detected.</value>
+  <data name="LockItExceptionConnectLockBluetoothNotOnException" xml:space="preserve">
+    <value>Bluetooth connection to the lock could not be established. Current Blutooth status is {0}. Activate Bluetooth and try again.</value>
   </data>
-  <data name="ErrorConnectLockBluetoothOffException" xml:space="preserve">
-    <value>Can not connect to lock. Bluetooth is off but has to be turned on.</value>
+  <data name="LockItExceptionConnectLockBluetoothOffException" xml:space="preserve">
+    <value>Bluetooth connection to the lock could not be established. Activate Bluetooth and try again.</value>
   </data>
-  <data name="ErrorConnectLockLocationOffException" xml:space="preserve">
-    <value>Can not connect to lock. Location is off but has to be turned on.</value>
+  <data name="LockItExceptionConnectLockLocationOffException" xml:space="preserve">
+    <value>Connection to the lock could not be established. Activate Location services and try again.</value>
   </data>
-  <data name="ErrorConnectLockLocationPermissingMissingException" xml:space="preserve">
-    <value>Can not connect to lock. Location permission is required but not granted. </value>
+  <data name="LockItExceptionConnectLockLocationPermissingMissingException" xml:space="preserve">
+    <value>Connection to the lock could not be established. Grant Location permission, activate Location services and try again.</value>
   </data>
-  <data name="ErrorOpenLockBoldBlocked" xml:space="preserve">
-    <value>Bold is blocked.</value>
+  <data name="LockItExceptionOpenLockBoltBlocked" xml:space="preserve">
+    <value>Lock bolt is blocked. Make sure that no spoke presses against the lock bolt and try again.</value>
   </data>
-  <data name="ErrorOpenLockBoldWasBlocked" xml:space="preserve">
-    <value>Bold was or is blocked.</value>
+  <data name="LockItExceptionOpenLockBoldStatusIsUnknown" xml:space="preserve">
+    <value>Position of lock bolt is unknown. Lock could be closed or open. Please try again or contact customer support.</value>
   </data>
-  <data name="ErrorOpenLockUnexpectedState" xml:space="preserve">
-    <value>Unexpected locking state "{0}" detected after sending open command.</value>
+  <data name="LockItExceptionOpenLockBoldWasBlocked" xml:space="preserve">
+    <value>Bolt was blocked. Make sure that no spoke presses against the lock bolt and try again.</value>
+  </data>
+  <data name="LockItExceptionOpenLockUnexpectedState" xml:space="preserve">
+    <value>Unexpected locking state "{0}" detected after sending open command. Please try again or contact customer support.</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs b/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs
index dc05c85..67176cf 100644
--- a/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs
@@ -13,7 +13,7 @@ namespace TINK.Services.BluetoothLock.Exception
 	{
 		public BluetoothDisconnectedException() : base(
 			LockingState.UnknownDisconnected,
-			MultilingualResources.Resources.ErrorBluetoothDisconnectedException)
+			MultilingualResources.Resources.LockItExceptionBluetoothDisconnected)
 		{
 		}
 	}
diff --git a/LockItShared/Services/BluetoothLock/Exception/ConnectBluetoothNotOnException.cs b/LockItShared/Services/BluetoothLock/Exception/ConnectBluetoothNotOnException.cs
index 4456b4c..04d5d2b 100644
--- a/LockItShared/Services/BluetoothLock/Exception/ConnectBluetoothNotOnException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/ConnectBluetoothNotOnException.cs
@@ -10,8 +10,8 @@ namespace TINK.Services.BluetoothLock.Exception
 	/// </remarks>
 	public class ConnectBluetoothNotOnException : System.Exception
 	{
-		public ConnectBluetoothNotOnException() : base(Resources.ErrorConnectLockBluetoothOffException) { }
+		public ConnectBluetoothNotOnException() : base(Resources.LockItExceptionConnectLockBluetoothOffException) { }
 
-		public ConnectBluetoothNotOnException(object state) : base(string.Format(Resources.ErrorConnectLockBluetoothNotOnException, state.ToString())) { }
+		public ConnectBluetoothNotOnException(object state) : base(string.Format(Resources.LockItExceptionConnectLockBluetoothNotOnException, state.ToString())) { }
 	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/ConnectLocationOffException.cs b/LockItShared/Services/BluetoothLock/Exception/ConnectLocationOffException.cs
index 760ba06..47b1ffb 100644
--- a/LockItShared/Services/BluetoothLock/Exception/ConnectLocationOffException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/ConnectLocationOffException.cs
@@ -4,6 +4,6 @@ namespace TINK.Services.BluetoothLock.Exception
 {
 	public class ConnectLocationOffException : System.Exception
 	{
-		public ConnectLocationOffException() : base(Resources.ErrorConnectLockLocationOffException) { }
+		public ConnectLocationOffException() : base(Resources.LockItExceptionConnectLockLocationOffException) { }
 	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs b/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs
index d37bd10..7ed689c 100644
--- a/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs
@@ -4,6 +4,6 @@ namespace TINK.Services.BluetoothLock.Exception
 {
 	public class ConnectLocationPermissionMissingException : System.Exception
 	{
-		public ConnectLocationPermissionMissingException() : base(Resources.ErrorConnectLockLocationPermissingMissingException) { }
+		public ConnectLocationPermissionMissingException() : base(Resources.LockItExceptionConnectLockLocationPermissingMissingException) { }
 	}
 }
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs
index f940e81..d42a0b7 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs
@@ -2,7 +2,7 @@ using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 
 namespace TINK.Services.BluetoothLock.Exception
 {
-	public class CouldntCloseBoldBlockedException : StateAwareException
+	public class CouldntCloseBoltBlockedException : StateAwareException
 	{
 		/// <summary>
 		/// Constructs a bold blocked exception.
@@ -13,9 +13,9 @@ namespace TINK.Services.BluetoothLock.Exception
 		/// <param name="state">State of the lock while/ after bold blocked event.</param>
 		/// <remarks>
 		/// </remarks>
-		public CouldntCloseBoldBlockedException(LockingState state = LockingState.UnknownFromHardwareError) : base(
+		public CouldntCloseBoltBlockedException(LockingState state = LockingState.UnknownFromHardwareError) : base(
 			state, 
-			MultilingualResources.Resources.ErrorCloseLockBoldBlocked)
+			MultilingualResources.Resources.LockItExceptionCloseLockBoltBlocked)
 		{
 		}
 	}
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs
index a8ddeae..2f9c01b 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs
@@ -1,4 +1,4 @@
-
+
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.MultilingualResources;
 
@@ -10,8 +10,8 @@ namespace TINK.Services.BluetoothLock.Exception
 			base(
 				state,
 				state != LockingState.UnknownFromHardwareError
-					? string.Format(Resources.ErrorCloseLockUnexpectedState, state)
-					: Resources.ErrorCloseLockUnknownPosition)
+					? string.Format(Resources.LockItExceptionCloseLockUnexpectedLockState, state)
+					: Resources.LockItExceptionCloseLockUnknownPosition)
 		{
 		}
 	}
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs
index 08839fc..a44cc03 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs
@@ -1,4 +1,4 @@
-using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 
 namespace TINK.Services.BluetoothLock.Exception
 {
@@ -6,7 +6,7 @@ namespace TINK.Services.BluetoothLock.Exception
 	{
 		public CouldntCloseMovingException() : base(
 			LockingState.Open, // Locking bold is probable (according to haveltec) still open.
-			MultilingualResources.Resources.ErrorCloseLockBikeMoving)
+			MultilingualResources.Resources.LockItExceptionCloseLockMoving)
 		{
 		}
 	}
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs
index af5aad8..018f4a1 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs
@@ -9,7 +9,7 @@ namespace TINK.Services.BluetoothLock.Exception
 	{
 		public CouldntOpenBoldIsBlockedException() : base(
 			LockingState.UnknownFromHardwareError,
-			MultilingualResources.Resources.ErrorOpenLockBoldIsBlocked)
+			MultilingualResources.Resources.LockItExceptionOpenLockBoltBlocked)
 		{
 		}
 	}
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldStatusIsUnknownException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldStatusIsUnknownException.cs
index 9913eb4..2c451b9 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldStatusIsUnknownException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldStatusIsUnknownException.cs
@@ -9,7 +9,7 @@ namespace TINK.Services.BluetoothLock.Exception
 	{
 		public CouldntOpenBoldStatusIsUnknownException() : base(
 			LockingState.UnknownFromHardwareError,
-			MultilingualResources.Resources.ErrorOpenLockBoldStatusIsUnknown)
+			MultilingualResources.Resources.LockItExceptionOpenLockBoldStatusIsUnknown)
 		{
 		}
 	}
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs
index 9e5a4d0..f28e07a 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs
@@ -1,4 +1,4 @@
-
+
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.MultilingualResources;
 
@@ -9,7 +9,7 @@ namespace TINK.Services.BluetoothLock.Exception
 		public CouldntOpenInconsistentStateExecption(LockingState state) :
 			base(
 				state,
-				string.Format(Resources.ErrorOpenLockUnexpectedState, state))
+				string.Format(Resources.LockItExceptionOpenLockUnexpectedState, state))
 		{
 		}
 	}
diff --git a/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs b/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs
index 80004e4..c17fe3e 100644
--- a/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs
@@ -1,7 +1,7 @@
-namespace TINK.Services.BluetoothLock.Exception
+namespace TINK.Services.BluetoothLock.Exception
 {
 	/// <summary> Thrown whenever lock is out of reach.</summary>
-	/// <remarks> If fired when scan for devices does not result in lock beeing found.</remarks>
+	/// <remarks> If fired when scan for devices does not result in lock being found.</remarks>
 	public class OutOfReachException : System.Exception
 	{
 	}
diff --git a/LockItShared/Services/BluetoothLock/LockInfoHelper.cs b/LockItShared/Services/BluetoothLock/LockInfoHelper.cs
index 5f5c01b..102923a 100644
--- a/LockItShared/Services/BluetoothLock/LockInfoHelper.cs
+++ b/LockItShared/Services/BluetoothLock/LockInfoHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using TINK.Services.BluetoothLock.Tdo;
@@ -42,12 +42,12 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 			switch (lockingState)
 			{
 				case LockitLockingState.Unknown:
-				case LockitLockingState.CouldntOpenBoldBlocked: // Lock is closed in most cases, but this is not guarnteed according to haveltec.
+				case LockitLockingState.CouldntOpenBoltBlocked: // Lock is closed in most cases, but this is not guaranteed according to haveltec.
 					return LockingState.UnknownFromHardwareError;
 
 				case LockitLockingState.Open:
 				case LockitLockingState.CouldntCloseMoving:
-				case LockitLockingState.CouldntCloseBoldBlocked:
+				case LockitLockingState.CouldntCloseBoltBlocked:
 					return LockingState.Open;
 
 				case LockitLockingState.Closed:
diff --git a/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs b/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs
index 1af4d84..b7bd91e 100644
--- a/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs
+++ b/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs
@@ -13,9 +13,9 @@ namespace TINK.Services.BluetoothLock.Tdo
 
 		CouldntCloseMoving = 0x03,
 
-		CouldntOpenBoldBlocked = 0x04,
+		CouldntOpenBoltBlocked = 0x04,
 
-		CouldntCloseBoldBlocked = 0x05
+		CouldntCloseBoltBlocked = 0x05
 	}
 
 	/// <summary> Object holding info about bluetooth lock. </summary>
diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
index 93dfb60..5a2c95e 100644
--- a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
+++ b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.369" android:versionCode="369">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.370" android:versionCode="370">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs b/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs
index 8c29d3e..fbedeb0 100644
--- a/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs
+++ b/Meinkonrad/TINK.Android/Resources/Resource.Designer.cs
@@ -14,7 +14,7 @@ namespace TINK.Droid
 {
 	
 	
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.93")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
 	public partial class Resource
 	{
 		
diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist
index a4b0628..0b58fa3 100644
--- a/Meinkonrad/TINK.iOS/Info.plist
+++ b/Meinkonrad/TINK.iOS/Info.plist
@@ -56,8 +56,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>Mein konrad</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>370</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.369</string>
+	<string>3.0.370</string>
 </dict>
 </plist>
diff --git a/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj b/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj
index c37c907..2189f36 100644
--- a/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj
+++ b/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj
@@ -269,9 +269,6 @@
       <HintPath>..\..\..\..\.nuget\packages\xamarin.google.ios.maps\2.5.0\lib\Xamarin.iOS10\Google.Maps.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\tink2.png" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\LockItBLE\LockItBLE.csproj">
       <Project>{bde9ce26-15cf-47da-a4f6-b6956d02d0fc}</Project>
diff --git a/Meinkonrad/TINK.iOS/Resources/LaunchScreen.storyboard b/Meinkonrad/TINK.iOS/Resources/LaunchScreen.storyboard
index fc416b5..6c353a3 100644
--- a/Meinkonrad/TINK.iOS/Resources/LaunchScreen.storyboard
+++ b/Meinkonrad/TINK.iOS/Resources/LaunchScreen.storyboard
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="X5k-f2-b5h">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
@@ -42,6 +42,5 @@
         <image name="Icon-76.png" width="76" height="76"/>
         <image name="Icon-Small-40.png" width="40" height="40"/>
         <image name="Icon-Small.png" width="29" height="29"/>
-        <image name="tink2.png" width="208" height="208"/>
     </resources>
-</document>
\ No newline at end of file
+</document>
diff --git a/Meinkonrad/TINK/App.xaml.cs b/Meinkonrad/TINK/App.xaml.cs
index 84fb8b5..46b18d4 100644
--- a/Meinkonrad/TINK/App.xaml.cs
+++ b/Meinkonrad/TINK/App.xaml.cs
@@ -31,6 +31,8 @@ using Arendi.BleLibrary.Local;
 
 // Add ExportFont attribute
 [assembly: ExportFont("Font Awesome 5 Free-Solid-900.otf", Alias = "FA-S")]
+[assembly: ExportFont("Font Awesome 5 Brands-Regular-400.otf", Alias = "FA-B")]
+[assembly: ExportFont("Font Awesome 5 Free-Regular-400.otf", Alias = "FA-R")]
 
 namespace TINK
 {
diff --git a/Meinkonrad/TINK/Meinkonrad.projitems b/Meinkonrad/TINK/Meinkonrad.projitems
index 24eecc6..dc95227 100644
--- a/Meinkonrad/TINK/Meinkonrad.projitems
+++ b/Meinkonrad/TINK/Meinkonrad.projitems
@@ -181,7 +181,6 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="$(MSBuildThisFileDirectory)Resources\Fonts\" />
     <Folder Include="$(MSBuildThisFileDirectory)View\BikesAtStation\" />
     <Folder Include="$(MSBuildThisFileDirectory)View\FeesAndBikes\" />
     <Folder Include="$(MSBuildThisFileDirectory)View\Login\" />
@@ -323,4 +322,12 @@
       <Generator>MSBuild:Compile</Generator>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Fonts\Font Awesome 5 Brands-Regular-400.otf">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Fonts\Font Awesome 5 Free-Regular-400.otf">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Meinkonrad/TINK/Resources/Fonts/Font Awesome 5 Brands-Regular-400.otf b/Meinkonrad/TINK/Resources/Fonts/Font Awesome 5 Brands-Regular-400.otf
new file mode 100644
index 0000000..1840b93
Binary files /dev/null and b/Meinkonrad/TINK/Resources/Fonts/Font Awesome 5 Brands-Regular-400.otf differ
diff --git a/Meinkonrad/TINK/Resources/Fonts/Font Awesome 5 Free-Regular-400.otf b/Meinkonrad/TINK/Resources/Fonts/Font Awesome 5 Free-Regular-400.otf
new file mode 100644
index 0000000..0f55808
Binary files /dev/null and b/Meinkonrad/TINK/Resources/Fonts/Font Awesome 5 Free-Regular-400.otf differ
diff --git a/Meinkonrad/TINK/View/Account/AccountPage.xaml b/Meinkonrad/TINK/View/Account/AccountPage.xaml
index 4f78fed..95c465d 100644
--- a/Meinkonrad/TINK/View/Account/AccountPage.xaml
+++ b/Meinkonrad/TINK/View/Account/AccountPage.xaml
@@ -49,13 +49,13 @@
 					Text="{Binding BookingStateInfo}" />
 
 						<Button
-					Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}" 
+					Text="{x:Static resources:AppResources.MarkingAccountPageManagePersonalData}" 
 					Command="{Binding OnManageAccount}"
 					IsEnabled="{Binding IsLogoutPossible}"/>
 
 						<Button
 					Style="{StaticResource SecondaryButton}"
-					Text="{x:Static resources:AppResources.MessageAccountPageManageLogout}"
+					Text="{x:Static resources:AppResources.MarkingAccountPageManageLogout}"
 					Command="{Binding OnLogoutRequest}"
 					IsEnabled="{Binding IsLogoutPossible}"/>
 
diff --git a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml
index 7f99f96..a0f93e3 100644
--- a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml
+++ b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+<ContentPage
+	xmlns="http://xamarin.com/schemas/2014/forms"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+	xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
 	x:Class="TINK.View.BikesAtStation.BikesAtStationPage"
+	xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
-	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
+	xmlns:bikeRentalProcess="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
 	BackgroundColor="{DynamicResource background-color}"
-	Shell.FlyoutBehavior="Disabled"
 	Shell.NavBarIsVisible="{Binding IsIdle}">
 
 	<Shell.TitleView>
@@ -21,6 +23,15 @@
 	<ContentPage.Resources>
 		<ResourceDictionary>
 			<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
+			<xct:MultiConverter x:Key="RentalProcessToVisibleConverter">
+				<xct:EnumToBoolConverter>
+					<xct:EnumToBoolConverter.TrueValues>
+						<rental_process:CurrentRentalProcess>CloseLock</rental_process:CurrentRentalProcess>
+						<rental_process:CurrentRentalProcess>EndRental</rental_process:CurrentRentalProcess>
+					</xct:EnumToBoolConverter.TrueValues>
+				</xct:EnumToBoolConverter>
+				<xct:InvertedBoolConverter />
+			</xct:MultiConverter>
 		</ResourceDictionary>
 	</ContentPage.Resources>
 
@@ -28,8 +39,10 @@
 
 		<!--Grid for Bike(s) view and Running process in same row-->
 		<Grid>
-			<!-- Grid for Content -->
+
+			<!--BikesAtStationPage Content-->
 			<Grid
+				IsVisible="{Binding RentalProcess.State, Converter={StaticResource RentalProcessToVisibleConverter}}"
 				Grid.Row="0"
 				RowSpacing="0"
 				RowDefinitions="1*,Auto">
@@ -41,7 +54,7 @@
 
 					<!--Station-->
 					<StackLayout
-						BackgroundColor="{DynamicResource secondary-back-title-color}"
+						BackgroundColor="{DynamicResource primary-back-title-color}"
 						IsVisible="{Binding IsIdle}"
 						Padding="20,0,20,0">
 
@@ -189,6 +202,14 @@
 					IsVisible="{Binding IsProcessWithRunningProcessView}"
 					Grid.Row="0"/>
 
+			<!--CloseLock View-->
+			<bikeRentalProcess:RentalProcessBookedOpenCloseLock
+				Grid.Row="0"/>
+
+			<!--EndRental View-->
+			<bikeRentalProcess:RentalProcessBookedClosedEndRental
+				Grid.Row="0"/>
+
 		</Grid>
 
 	</ContentPage.Content>
diff --git a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
index a718079..0e47316 100644
--- a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
+++ b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
@@ -24,6 +24,7 @@ namespace TINK.View.BikesAtStation
 	using TINK.ViewModel.Bikes;
 	using Xamarin.CommunityToolkit.Extensions;
 	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.MultilingualResources;
 
 	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
@@ -111,7 +112,10 @@ namespace TINK.View.BikesAtStation
 			catch (Exception exception)
 			{
 				Log.ForContext<BikesAtStationPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+				await DisplayAlert(
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					AppResources.MessageAnswerOk);
 				isInitializationStarted = false;
 				return;
 			}
diff --git a/Meinkonrad/TINK/View/Contact/ContactPage.xaml b/Meinkonrad/TINK/View/Contact/ContactPage.xaml
index aa0090e..862ee2c 100644
--- a/Meinkonrad/TINK/View/Contact/ContactPage.xaml
+++ b/Meinkonrad/TINK/View/Contact/ContactPage.xaml
@@ -60,7 +60,7 @@
 
 					</StackLayout>
 
-					<!--Contact operator of selected station-->
+					<!--contact customer support of selected station-->
 					<StackLayout
 							IsVisible="{Binding IsOperatorInfoAvaliable}">
 
diff --git a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml
index 79b9a4a..021e24f 100644
--- a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml
+++ b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml
@@ -20,8 +20,9 @@
 
 		<!--Grid for Map with Buttons and Running process-->
 		<Grid
-			RowDefinitions="3,46,1*,32"
+			RowDefinitions="3,46,1*,Auto"
 			ColumnDefinitions="1*,Auto,1*"
+			RowSpacing="0"
 			IsEnabled="{Binding IsMapPageEnabled}"
 			VerticalOptions="FillAndExpand">
 
@@ -119,10 +120,23 @@
 				Grid.ColumnSpan="3"
 				Text="{Binding StatusInfoText}"
 				IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
-				TextColor="White"
 				FontSize="Small"
-				HorizontalOptions="CenterAndExpand"
-				VerticalOptions="CenterAndExpand"/>
+				Padding="5"
+				TextColor="DimGray" 
+				HorizontalOptions="CenterAndExpand">
+				<Label.Triggers>
+					<DataTrigger
+							TargetType="Label"
+							Binding="{Binding Path=StatusInfoText.Length}" Value="0">
+						<Setter Property="HeightRequest" Value="0" />
+					</DataTrigger>
+					<DataTrigger
+							TargetType="Label"
+							Binding="{Binding Path=StatusInfoText}" Value="Offline.">
+						<Setter Property="HeightRequest" Value="0" />
+					</DataTrigger>
+				</Label.Triggers>
+			</Label>
 
 			<!--While process is running-->
 			<sharedGui:RunningProcessView
diff --git a/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml b/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml
index fc43e15..4bd8ec2 100644
--- a/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml
+++ b/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml
@@ -7,7 +7,7 @@
         <Grid ColumnDefinitions="Auto, 1*">
             <Image Style="{StaticResource Image-Navbar}"/>
             <Label Style="{StaticResource Label-Navbar}"
-                   Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}"/>
+                   Text="{x:Static resources:AppResources.MarkingAccountPageManagePersonalData}"/>
         </Grid>
     </Shell.TitleView>
     <Shell.BackButtonBehavior>
diff --git a/Meinkonrad/TINK/View/FeedbackPopup.xaml b/Meinkonrad/TINK/View/FeedbackPopup.xaml
index 37d8a60..0bfc633 100644
--- a/Meinkonrad/TINK/View/FeedbackPopup.xaml
+++ b/Meinkonrad/TINK/View/FeedbackPopup.xaml
@@ -6,10 +6,12 @@
            x:TypeArguments="local:FeedbackPopup+Result"
            xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
            xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+		   IsLightDismissEnabled="false"
            x:Class="TINK.View.FeedbackPopup">
 
 	<xct:Popup.Resources>
 		<x:String x:Key="check_circle">&#xf058;</x:String>
+		<x:String x:Key="WriteFeedback">&#xf044;</x:String>
 	</xct:Popup.Resources>
 
 	<ScrollView
@@ -20,95 +22,124 @@
 		<StackLayout
 			HorizontalOptions="FillAndExpand"
 			VerticalOptions="FillAndExpand"
-			Padding="0,0,0,300">
+			Padding="0,0,0,400">
 
-			<!-- Head and title -->
-			<StackLayout
-						Padding="20"
-						BackgroundColor="{DynamicResource primary-back-title-color}">
-				<Label
-							HorizontalTextAlignment="Center"
-							FontSize="Large"
-							TextColor="White"
-							Text="{x:Static resources:AppResources.MarkingReturnBikeMainMessage}"/>
-				<Image>
+			<!-- Head -->
+			<Grid 
+				Padding="0,30,0,10"
+				ColumnDefinitions="10,Auto,1*,10"
+				ColumnSpacing="10"
+				HorizontalOptions="CenterAndExpand">
+
+				<!--icon-->
+				<Image
+					Grid.Column="1"
+					HorizontalOptions="End">
 					<Image.Source>
-						<FontImageSource Size="60" Glyph="{StaticResource check_circle}" FontFamily="FA-S" Color="White"/>
+						<FontImageSource
+							Glyph="{StaticResource WriteFeedback}"
+							FontFamily="FA-S"
+							Size="40"
+							Color="Black"/>
+
 					</Image.Source>
 				</Image>
-			</StackLayout>
+
+				<!--text-->
+				<Label
+					Grid.Column="2"
+					TextType="Html"
+					Text="{x:Static resources:AppResources.ActionGiveFeedback}"
+					FontSize="Large"
+					HorizontalOptions="StartAndExpand"
+					VerticalOptions="Center"
+					TextColor="Black"
+					Padding="0">
+				</Label>
+
+			</Grid>
+
+			<BoxView
+				Margin="20,0,20,10"
+				HeightRequest="1"
+				WidthRequest="400"
+				HorizontalOptions="Center"
+				Color="{DynamicResource primary-back-title-color}"/>
 
 			<!-- Content -->
 			<StackLayout
 				Margin="10"
 				Spacing="10">
 
-				<!-- Co2saving -->
-				<Frame 
-					x:Name="Co2SavingFrame">
-					<Label 
-						x:Name="Co2SavingLabel"
-						Text=""/>
-				</Frame>
-
 				<!-- Battery level -->
 				<sharedGui:BarLevelInputView 
-									x:Name="BarLevelInputView"
-									HorizontalOptions="Center"/>
+					x:Name="BarLevelInputView"
+					HorizontalOptions="Center"/>
 
 				<!-- Is bike okay? -->
 				<Grid
-					ColumnDefinitions="*,Auto,Auto,Auto,*"
+					ColumnDefinitions="*,Auto,*"
 					RowDefinitions="Auto,Auto"
 					Margin="0,20,0,0">
-					<Label
+					<Grid
 						Grid.Column="1"
-						Grid.Row="0"
-						FontSize="Medium"
-						FontAttributes="Bold"
-						Text= "{x:Static resources:AppResources.MarkingReturnBikeBikeIsStateOkQuestion}">
-					</Label>
-					<Switch
-								Grid.Column="2"
-								Grid.Row="0"
+						ColumnDefinitions="1*,Auto,Auto">
+						<Label
+							Grid.Column="0"
+							FontAttributes="Bold"
+							HorizontalTextAlignment="End"
+							Text= "{x:Static resources:AppResources.MarkingReturnBikeBikeIsStateOkQuestion}">
+						</Label>
+						<Switch
+								Grid.Column="1"
 								VerticalOptions="Center"
 								HorizontalOptions="End"
 								x:Name="bikeIsOkSwitch"
 								IsToggled="True"/>
-					<Label
-								Grid.Column="3"
-								Grid.Row="0"
+						<Label
+								Grid.Column="2"
+								FontSize="Small"
 								VerticalOptions="Center"
 								HorizontalOptions="Start">
-						<Label.Triggers>
-							<DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}" Value="False">
-								<Setter Property="Text" Value="{x:Static resources:AppResources.QuestionAnswerNo}"/>
-							</DataTrigger>
-							<DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}" Value="True">
-								<Setter Property="Text" Value="{x:Static resources:AppResources.QuestionAnswerYes}"/>
-							</DataTrigger>
-						</Label.Triggers>
-					</Label>
+							<Label.Triggers>
+								<DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}" Value="False">
+									<Setter Property="Text" Value="{x:Static resources:AppResources.MessageAnswerNo}"/>
+								</DataTrigger>
+								<DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}" Value="True">
+									<Setter Property="Text" Value="{x:Static resources:AppResources.MessageAnswerYes}"/>
+								</DataTrigger>
+							</Label.Triggers>
+						</Label>
+					</Grid>
 
 					<!-- Text input bike is not OK -->
-					<Editor
+					<StackLayout Grid.Row="1"
 						Grid.Column="0"
-						Grid.ColumnSpan="5"
-						Grid.Row="1"
-								x:Name="feedbackMessage"
-								AutoSize="TextChanges"
-								Placeholder="{x:Static resources:AppResources.MarkingReturnBikeErrorDescriptionInputPlaceholder}"
-								Text=""
-								IsVisible="False">
-						<Editor.Triggers>
-							<DataTrigger TargetType="Editor"
-												 Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}"
-												 Value="False">
+						Grid.ColumnSpan="3"
+						Padding="1"
+						BackgroundColor="{DynamicResource primary-back-title-color}">
+						<StackLayout.Triggers>
+							<DataTrigger TargetType="StackLayout"
+											 Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}"
+											 Value="False">
 								<Setter Property="IsVisible" Value="True"/>
-								<Setter Property="Text" Value=""/>
+								<Setter Property="HeightRequest" Value="100"/>
 							</DataTrigger>
-						</Editor.Triggers>
-					</Editor>
+							<DataTrigger TargetType="StackLayout"
+											 Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}"
+											 Value="True">
+								<Setter Property="IsVisible" Value="False"/>
+								<Setter Property="HeightRequest" Value="0"/>
+							</DataTrigger>
+						</StackLayout.Triggers>
+						<Editor
+							x:Name="feedbackMessage"
+							HeightRequest="100"
+							Placeholder="{x:Static resources:AppResources.MarkingReturnBikeErrorDescriptionInputPlaceholder}"
+							Text=""
+							BackgroundColor="White">
+						</Editor>
+					</StackLayout>
 
 				</Grid>
 
diff --git a/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs b/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
index 6da0837..f4b5fe0 100644
--- a/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
+++ b/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
@@ -17,11 +17,6 @@ namespace TINK.View
 		{
 			InitializeComponent();
 
-			if (string.IsNullOrEmpty(co2Saving))
-				Co2SavingFrame.IsVisible = false;
-			else
-				Co2SavingLabel.Text = co2Saving;
-
 			if (battery == null
 				|| (battery.IsBackendAccessible.HasValue && battery.IsBackendAccessible.Value))
 			{
diff --git a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml
index 4ebda2e..04cd42b 100644
--- a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml
+++ b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+<ContentPage
+	xmlns="http://xamarin.com/schemas/2014/forms"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+	xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
 	x:Class="TINK.View.FindBike.FindBikePage"
 	xmlns:conv="clr-namespace:TINK.View"
 	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
+	xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
+	xmlns:bikeRentalProcess="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
 	BackgroundColor="{DynamicResource background-color}">
 
 	<Shell.TitleView>
@@ -19,6 +23,15 @@
 		<ResourceDictionary>
 			<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
 			<conv:StringNotNullOrEmptyToVisibleConverter x:Key="Label_Converter"/>
+			<xct:MultiConverter x:Key="RentalProcessToVisibleConverter">
+				<xct:EnumToBoolConverter>
+					<xct:EnumToBoolConverter.TrueValues>
+						<rental_process:CurrentRentalProcess>CloseLock</rental_process:CurrentRentalProcess>
+						<rental_process:CurrentRentalProcess>EndRental</rental_process:CurrentRentalProcess>
+					</xct:EnumToBoolConverter.TrueValues>
+				</xct:EnumToBoolConverter>
+				<xct:InvertedBoolConverter />
+			</xct:MultiConverter>
 		</ResourceDictionary>
 	</ContentPage.Resources>
 
@@ -29,9 +42,10 @@
 
 			<!-- Grid for Content -->
 			<Grid
-				RowDefinitions="1*,Auto"
+				IsVisible="{Binding RentalProcess.State, Converter={StaticResource RentalProcessToVisibleConverter}}"
+				Grid.Row="0"
 				RowSpacing="0"
-				Grid.Row="0">
+				RowDefinitions="1*,Auto">
 
 				<StackLayout
 					Grid.Row="0"
@@ -40,37 +54,7 @@
 
 					<StackLayout
 						BackgroundColor="White"
-						Padding="20,5,20,0">
-
-						<!--Bike type-->
-						<StackLayout Orientation="Horizontal"
-									 HorizontalOptions="Center"
-									 IsVisible="{Binding ActiveFilteredBikeType, Converter={StaticResource Label_Converter}}"
-									 Spacing="0">
-							<Label
-								TextColor="DimGray"
-								Text="{x:Static resources:AppResources.MarkingFindBikeTypeOfBikeText}"/>
-							<Label
-								TextColor="{DynamicResource primary-back-title-color}"
-								FontAttributes="Bold"
-								Text="{Binding ActiveFilteredBikeType}"/>
-							<Button
-								Command="{Binding ShowFilterBikeTypeInfoCommand}"
-								WidthRequest="24"
-								HeightRequest="24"
-								BackgroundColor="Transparent"
-								BorderWidth="0"
-								Padding="0"
-								Margin="5,0,0,0">
-								<Button.ImageSource>
-									<FontImageSource
-									Glyph="{StaticResource InfoCircle}"
-									Color="DimGray"
-									FontFamily="FA-S"
-									Size="20"/>
-								</Button.ImageSource>
-							</Button>
-						</StackLayout>
+						Padding="20,0,20,0">
 
 						<Grid
 							RowDefinitions="Auto,Auto"
@@ -171,6 +155,14 @@
 				Grid.Row="0"
 				IsVisible="{Binding IsProcessWithRunningProcessView}"/>
 
+			<!--CloseLock View-->
+			<bikeRentalProcess:RentalProcessBookedOpenCloseLock
+				Grid.Row="0"/>
+
+			<!--EndRental View-->
+			<bikeRentalProcess:RentalProcessBookedClosedEndRental
+				Grid.Row="0"/>
+
 		</Grid>
 
 	</ContentPage.Content>
diff --git a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
index 468d80e..0823263 100644
--- a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
+++ b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Serilog;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 using TINK.Model.Device;
+using TINK.MultilingualResources;
 using TINK.ViewModel.FindBike;
 using Xamarin.CommunityToolkit.Extensions;
 using Xamarin.Forms;
@@ -64,7 +65,10 @@ namespace TINK.View.FindBike
 			catch (Exception exception)
 			{
 				Log.ForContext<FindBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-				await DisplayAlert("Fehler", $"Seite Fahrrad Wählen kann nicht angezeigt werden. ${exception.Message}", "OK");
+				await DisplayAlert(
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					AppResources.MessageAnswerOk);
 				return;
 
 			}
diff --git a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml
index 0f1fa27..335d903 100644
--- a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml
+++ b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml
@@ -2,13 +2,16 @@
 <ContentPage
 	xmlns="http://xamarin.com/schemas/2014/forms"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+	xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
 	x:Class="TINK.View.MyBikes.MyBikesPage"
 	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
+	xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
+	xmlns:bikeRentalProcess="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
 	BackgroundColor="{DynamicResource background-color}"
 	Shell.FlyoutBehavior="{Binding FlyoutBehavior}"
-	>
+	Shell.NavBarIsVisible="{Binding IsIdle}">
 
 	<Shell.TitleView>
 		<Grid ColumnDefinitions="Auto, 1*">
@@ -22,6 +25,15 @@
 	<ContentPage.Resources>
 		<ResourceDictionary>
 			<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
+			<xct:MultiConverter x:Key="RentalProcessToVisibleConverter">
+				<xct:EnumToBoolConverter>
+					<xct:EnumToBoolConverter.TrueValues>
+						<rental_process:CurrentRentalProcess>CloseLock</rental_process:CurrentRentalProcess>
+						<rental_process:CurrentRentalProcess>EndRental</rental_process:CurrentRentalProcess>
+					</xct:EnumToBoolConverter.TrueValues>
+				</xct:EnumToBoolConverter>
+				<xct:InvertedBoolConverter />
+			</xct:MultiConverter>
 		</ResourceDictionary>
 	</ContentPage.Resources>
 
@@ -32,9 +44,10 @@
 
 			<!--Bike(s) view-->
 			<Grid
-					RowDefinitions="1*,Auto"
+				IsVisible="{Binding RentalProcess.State, Converter={StaticResource RentalProcessToVisibleConverter}}"
+				Grid.Row="0"
 				RowSpacing="0"
-					Grid.Row="0">
+				RowDefinitions="1*,Auto">
 
 				<StackLayout
 						Grid.Row="0"
@@ -107,6 +120,14 @@
 					Grid.Row="0"
 					IsVisible="{Binding IsProcessWithRunningProcessView}"/>
 
+			<!--CloseLock View-->
+			<bikeRentalProcess:RentalProcessBookedOpenCloseLock
+				Grid.Row="0"/>
+
+			<!--EndRental View-->
+			<bikeRentalProcess:RentalProcessBookedClosedEndRental
+				Grid.Row="0"/>
+
 		</Grid>
 
 	</ContentPage.Content>
diff --git a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs
index 75c265c..fca7a06 100644
--- a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs
+++ b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs
@@ -14,6 +14,7 @@ namespace TINK.View.MyBikes
 	using TINK.Model;
 	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 	using TINK.Model.Device;
+	using TINK.MultilingualResources;
 	using TINK.ViewModel.MyBikes;
 	using Xamarin.CommunityToolkit.Extensions;
 
@@ -78,7 +79,10 @@ namespace TINK.View.MyBikes
 			catch (Exception exception)
 			{
 				Log.ForContext<MyBikesPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+				await DisplayAlert(
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					AppResources.MessageAnswerOk);
 				isInitializationStarted = false;
 				return;
 			}
diff --git a/ShareeSharedGuiLib/ShareeSharedGuiLib.projitems b/ShareeSharedGuiLib/ShareeSharedGuiLib.projitems
index 3b70c60..9703628 100644
--- a/ShareeSharedGuiLib/ShareeSharedGuiLib.projitems
+++ b/ShareeSharedGuiLib/ShareeSharedGuiLib.projitems
@@ -12,6 +12,10 @@
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)View\BarLevelView.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcessBookedOpenCloseLock.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)View\VersionNumberView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
@@ -30,9 +34,32 @@
       <DependentUpon>BarLevelView.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcess2StepsBar.xaml.cs">
+      <DependentUpon>RentalProcess2StepsBar.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcess3StepsBar.xaml.cs">
+      <DependentUpon>RentalProcess3StepsBar.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcessBikeInfo.xaml.cs">
+      <DependentUpon>RentalProcessBikeInfo.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcessStepBarFinished.xaml.cs">
+      <DependentUpon>RentalProcessStepBarFinished.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)View\HintForRefreshingPageView.xaml.cs">
       <DependentUpon>HintForRefreshingPageView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcessBookedClosedEndRental.xaml.cs">
+      <DependentUpon>RentalProcessBookedClosedEndRental.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcessBookedOpenCloseLock.xaml.cs">
+      <DependentUpon>RentalProcessBookedOpenCloseLock.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)View\NotConnectedToNetView.xaml.cs">
       <DependentUpon>NotConnectedToNetView.xaml</DependentUpon>
     </Compile>
@@ -86,4 +113,34 @@
       <Generator>MSBuild:Compile</Generator>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcessBookedClosedEndRental.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcess2StepsBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcess3StepsBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcessBikeInfo.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Bike\RentalProcess\RentalProcessStepBarFinished.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ShareeSharedGuiLib/View/BarLevelInputView.xaml b/ShareeSharedGuiLib/View/BarLevelInputView.xaml
index 29c0b5f..024210b 100644
--- a/ShareeSharedGuiLib/View/BarLevelInputView.xaml
+++ b/ShareeSharedGuiLib/View/BarLevelInputView.xaml
@@ -7,7 +7,9 @@
   <ContentView.Content>
       <StackLayout>
             <Label
-                Text="{x:Static resources:AppResources.MarkingDriveBatteryTitel}"/>
+                Text="{x:Static resources:AppResources.MarkingDriveBatteryTitel}"
+				TextType="Html"
+				HorizontalOptions="CenterAndExpand"/>
             <sharedGui:BarLevelView
                 x:Name="BarLevelElement"
 				HorizontalOptions="CenterAndExpand"
diff --git a/ShareeSharedGuiLib/View/BarLevelView.xaml b/ShareeSharedGuiLib/View/BarLevelView.xaml
index 16aa6ce..b8f2886 100644
--- a/ShareeSharedGuiLib/View/BarLevelView.xaml
+++ b/ShareeSharedGuiLib/View/BarLevelView.xaml
@@ -7,8 +7,8 @@
             <!-- Nice battery images symbolizing filling level for batteries with 5 bars -->
             <Image
                 x:Name="BarLevelImage"
-                WidthRequest="50"
-				HeightRequest="30"
+                WidthRequest="60"
+				HeightRequest="36"
 				Aspect="AspectFit"
 				HorizontalOptions="CenterAndExpand"
                 IsVisible="{Binding IsBatteryChargeLevelImageVisible}"
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess2StepsBar.xaml b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess2StepsBar.xaml
new file mode 100644
index 0000000..a9bca77
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess2StepsBar.xaml
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+			 xmlns:conv="clr-namespace:TINK.View"
+			 xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
+			 xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
+             x:Class="ShareeSharedGuiLib.View.Bike.RentalProcess.RentalProcess2StepsBar">
+
+	<ContentView.Resources>
+		<conv:StringNotNullOrEmptyToVisibleConverter x:Key="StringNotNullOrEmpty_Converter"/>
+		<x:String x:Key="check">&#xf00c;</x:String>
+		<x:String x:Key="xmark">&#xf00d;</x:String>
+	</ContentView.Resources>
+
+	<ContentView.Content>
+
+		<Grid>
+			
+			<!-- Progress bar finished-->
+			<Grid
+				Grid.Row="0"
+				IsVisible="False">
+
+				<Grid.Triggers>
+					<MultiTrigger TargetType="Grid">
+						<MultiTrigger.Conditions>
+							<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+							<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+						</MultiTrigger.Conditions>
+						<Setter Property="IsVisible" Value="True" />
+					</MultiTrigger>
+				</Grid.Triggers>
+
+				<sharedGui:RentalProcessStepBarFinished/>
+			
+			</Grid>
+
+			<!-- 2 Steps Progress bar -->
+			<Grid
+				Grid.Row="0"
+				IsVisible="True"
+				ColumnDefinitions="*,*">
+
+				<Grid.Triggers>
+					<MultiTrigger TargetType="Grid">
+						<MultiTrigger.Conditions>
+							<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+							<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+						</MultiTrigger.Conditions>
+						<Setter Property="IsVisible" Value="False" />
+					</MultiTrigger>
+				</Grid.Triggers>
+
+				<!--1st step-->
+				<Grid
+					Grid.Column="0"
+					RowDefinitions="40,10"
+					RowSpacing="0">
+					<Frame
+						Grid.Row="0"
+						BackgroundColor="{DynamicResource process-step-upcoming}"
+						Padding="0">
+						<Frame.Triggers>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-active}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-succeeded}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-succeeded}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
+							</MultiTrigger>
+						</Frame.Triggers>
+						<StackLayout
+									Orientation="Horizontal"
+									HorizontalOptions="Center"
+									VerticalOptions="Center">
+							<Label
+										Text="1"
+										TextColor="White"
+										FontAttributes="Bold"/>
+							<Image
+										IsVisible="False">
+								<Image.Triggers>
+									<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="1">
+										<Setter Property="IsVisible" Value="True" />
+									</DataTrigger>
+									<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="2">
+										<Setter Property="IsVisible" Value="True" />
+									</DataTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+											<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource check}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource check}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+											<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource xmark}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+								</Image.Triggers>
+							</Image>
+						</StackLayout>
+					</Frame>
+					<Polygon
+						Grid.Row="1"
+						Points="0,0 20,0 10,10"
+						IsVisible="False"
+						HorizontalOptions="Center">
+						<Polygon.Triggers>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="True" />
+								<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="True" />
+								<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="False" />
+							</MultiTrigger>
+						</Polygon.Triggers>
+					</Polygon>
+				</Grid>
+
+				<!--2nd step-->
+				<Grid
+					Grid.Column="1"
+					RowDefinitions="40,10"
+					RowSpacing="0">
+					<Frame
+						Grid.Row="0"
+						BackgroundColor="{DynamicResource process-step-upcoming}"
+						Padding="0">
+						<Frame.Triggers>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-upcoming}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-active}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-succeeded}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
+							</MultiTrigger>
+						</Frame.Triggers>
+						<StackLayout
+									Orientation="Horizontal"
+									HorizontalOptions="Center"
+									VerticalOptions="Center">
+							<Label
+										Text="2"
+										TextColor="White"
+										FontAttributes="Bold"/>
+							<Image
+										IsVisible="False">
+								<Image.Triggers>
+									<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="2">
+										<Setter Property="IsVisible" Value="True" />
+									</DataTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+											<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource check}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+											<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource xmark}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+								</Image.Triggers>
+							</Image>
+						</StackLayout>
+					</Frame>
+					<Polygon
+						Grid.Row="1"
+						Points="0,0 20,0 10,10"
+						IsVisible="False"
+						HorizontalOptions="Center">
+						<Polygon.Triggers>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="True" />
+								<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="True" />
+								<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="False" />
+							</MultiTrigger>
+						</Polygon.Triggers>
+					</Polygon>
+				</Grid>
+
+			</Grid>
+
+		</Grid>
+
+	</ContentView.Content>
+	
+</ContentView>
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess2StepsBar.xaml.cs b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess2StepsBar.xaml.cs
new file mode 100644
index 0000000..e2c9880
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess2StepsBar.xaml.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace ShareeSharedGuiLib.View.Bike.RentalProcess
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RentalProcess2StepsBar : ContentView
+	{
+		public RentalProcess2StepsBar ()
+		{
+			InitializeComponent ();
+		}
+	}
+}
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess3StepsBar.xaml b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess3StepsBar.xaml
new file mode 100644
index 0000000..ff42612
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess3StepsBar.xaml
@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+			 xmlns:conv="clr-namespace:TINK.View"
+			 xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
+			 xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
+             x:Class="ShareeSharedGuiLib.View.Bike.RentalProcess.RentalProcess3StepsBar">
+
+	<ContentView.Resources>
+		<conv:StringNotNullOrEmptyToVisibleConverter x:Key="StringNotNullOrEmpty_Converter"/>
+		<x:String x:Key="check">&#xf00c;</x:String>
+		<x:String x:Key="xmark">&#xf00d;</x:String>
+	</ContentView.Resources>
+	
+  <ContentView.Content>
+
+		<Grid>
+			
+			<!-- Progress bar finished-->
+			<Grid
+				Grid.Row="0"
+				IsVisible="False">
+
+				<Grid.Triggers>
+					<MultiTrigger TargetType="Grid">
+						<MultiTrigger.Conditions>
+							<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+							<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+						</MultiTrigger.Conditions>
+						<Setter Property="IsVisible" Value="True" />
+					</MultiTrigger>
+				</Grid.Triggers>
+
+				<sharedGui:RentalProcessStepBarFinished/>
+
+			</Grid>
+
+			<!-- 3 Steps Progress bar -->
+			<Grid
+				Grid.Row="0"
+				IsVisible="True"
+				ColumnDefinitions="*,*,*">
+
+				<Grid.Triggers>
+					<MultiTrigger TargetType="Grid">
+						<MultiTrigger.Conditions>
+							<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+							<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+						</MultiTrigger.Conditions>
+						<Setter Property="IsVisible" Value="False" />
+					</MultiTrigger>
+				</Grid.Triggers>
+
+				<!--1st step-->
+				<Grid
+					Grid.Column="0"
+					RowDefinitions="40,10"
+					RowSpacing="0">
+					<Frame
+						Grid.Row="0"
+						BackgroundColor="{DynamicResource process-step-upcoming}"
+						Padding="0">
+						<Frame.Triggers>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-active}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-succeeded}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-succeeded}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-succeeded}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
+							</MultiTrigger>
+						</Frame.Triggers>
+						<StackLayout
+									Orientation="Horizontal"
+									HorizontalOptions="Center"
+									VerticalOptions="Center">
+							<Label
+										Text="1"
+										TextColor="White"
+										FontAttributes="Bold"/>
+							<Image
+										IsVisible="False">
+								<Image.Triggers>
+									<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="1">
+										<Setter Property="IsVisible" Value="True" />
+									</DataTrigger>
+									<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="2">
+										<Setter Property="IsVisible" Value="True" />
+									</DataTrigger>
+									<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="3">
+										<Setter Property="IsVisible" Value="True" />
+									</DataTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+											<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource check}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource check}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource check}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+											<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource xmark}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+								</Image.Triggers>
+							</Image>
+						</StackLayout>
+					</Frame>
+					<Polygon
+						Grid.Row="1"
+						Points="0,0 20,0 10,10"
+						IsVisible="False"
+						HorizontalOptions="Center">
+						<Polygon.Triggers>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="True" />
+								<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="True" />
+								<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="False" />
+							</MultiTrigger>
+						</Polygon.Triggers>
+					</Polygon>
+				</Grid>
+
+				<!--2nd step-->
+				<Grid
+					Grid.Column="1"
+					RowDefinitions="40,10"
+					RowSpacing="0">
+					<Frame
+						Grid.Row="0"
+						BackgroundColor="{DynamicResource process-step-upcoming}"
+						Padding="0">
+						<Frame.Triggers>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-upcoming}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-active}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-succeeded}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-succeeded}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
+							</MultiTrigger>
+						</Frame.Triggers>
+						<StackLayout
+									Orientation="Horizontal"
+									HorizontalOptions="Center"
+									VerticalOptions="Center">
+							<Label
+										Text="2"
+										TextColor="White"
+										FontAttributes="Bold"/>
+							<Image
+										IsVisible="False">
+								<Image.Triggers>
+									<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="2">
+										<Setter Property="IsVisible" Value="True" />
+									</DataTrigger>
+									<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="3">
+										<Setter Property="IsVisible" Value="True" />
+									</DataTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+											<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource check}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource check}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+											<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource xmark}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+								</Image.Triggers>
+							</Image>
+						</StackLayout>
+					</Frame>
+					<Polygon
+						Grid.Row="1"
+						Points="0,0 20,0 10,10"
+						IsVisible="False"
+						HorizontalOptions="Center">
+						<Polygon.Triggers>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="True" />
+								<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="True" />
+								<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="False" />
+							</MultiTrigger>
+						</Polygon.Triggers>
+					</Polygon>
+				</Grid>
+
+				<!--3rd step-->
+				<Grid
+					Grid.Column="2"
+					RowDefinitions="40,10"
+					RowSpacing="0">
+					<Frame
+						Grid.Row="0"
+						BackgroundColor="{DynamicResource process-step-upcoming}"
+						Padding="0">
+						<Frame.Triggers>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-upcoming}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-upcoming}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-active}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-succeeded}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Frame">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}" />
+								</MultiTrigger.Conditions>
+								<Setter Property="BackgroundColor" Value="{DynamicResource process-step-failed}" />
+							</MultiTrigger>
+						</Frame.Triggers>
+						<StackLayout
+									Orientation="Horizontal"
+									HorizontalOptions="Center"
+									VerticalOptions="Center">
+							<Label
+										Text="3"
+										TextColor="White"
+										FontAttributes="Bold"/>
+							<Image
+										IsVisible="False">
+								<Image.Triggers>
+									<DataTrigger TargetType="Image" Binding="{Binding RentalProcess.StepIndex}" Value="3">
+										<Setter Property="IsVisible" Value="True" />
+									</DataTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+											<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource check}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+									<MultiTrigger TargetType="Image">
+										<MultiTrigger.Conditions>
+											<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+											<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}" />
+										</MultiTrigger.Conditions>
+										<Setter Property="Source">
+											<Setter.Value>
+												<FontImageSource
+															Glyph="{StaticResource xmark}"
+															FontFamily="FA-S"
+															Size="Small"
+															Color="White"/>
+											</Setter.Value>
+										</Setter>
+									</MultiTrigger>
+								</Image.Triggers>
+							</Image>
+						</StackLayout>
+					</Frame>
+					<Polygon
+						Grid.Row="1"
+						Points="0,0 20,0 10,10"
+						IsVisible="False"
+						HorizontalOptions="Center">
+						<Polygon.Triggers>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.None}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="True" />
+								<Setter Property="Fill" Value="{DynamicResource process-step-active}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Failed}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="True" />
+								<Setter Property="Fill" Value="{DynamicResource process-step-failed}" />
+							</MultiTrigger>
+							<MultiTrigger TargetType="Polygon">
+								<MultiTrigger.Conditions>
+									<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+									<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}"/>
+								</MultiTrigger.Conditions>
+								<Setter Property="IsVisible" Value="False" />
+							</MultiTrigger>
+						</Polygon.Triggers>
+					</Polygon>
+				</Grid>
+
+			</Grid>
+
+		</Grid>
+
+	</ContentView.Content>
+	
+</ContentView>
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess3StepsBar.xaml.cs b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess3StepsBar.xaml.cs
new file mode 100644
index 0000000..31fc6e1
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcess3StepsBar.xaml.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace ShareeSharedGuiLib.View.Bike.RentalProcess
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RentalProcess3StepsBar : ContentView
+	{
+		public RentalProcess3StepsBar ()
+		{
+			InitializeComponent ();
+		}
+	}
+}
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBikeInfo.xaml b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBikeInfo.xaml
new file mode 100644
index 0000000..67a1bb2
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBikeInfo.xaml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+			 xmlns:conv="clr-namespace:TINK.View"
+             x:Class="ShareeSharedGuiLib.View.Bike.RentalProcess.RentalProcessBikeInfo">
+
+	<ContentView.Resources>
+		<conv:StringNotNullOrEmptyToVisibleConverter x:Key="StringNotNullOrEmpty_Converter"/>
+	</ContentView.Resources>
+	
+  <ContentView.Content>
+	  
+		<!--Bike info-->
+		<Frame
+			Padding="20,30,20,30"
+			Margin="0,5,0,5"
+			HorizontalOptions="FillAndExpand"
+			BackgroundColor="White">
+
+			<Grid
+				ColumnDefinitions="Auto,*"
+				RowDefinitions="Auto,Auto"
+				RowSpacing="0">
+
+				<!-- Icon of the bike -->
+				<Image
+					Grid.Column="0"
+					Grid.Row="0"
+					Grid.RowSpan="2"
+					Source="{Binding BikeInRentalProcess.DisplayedBikeImageSourceString}"
+					HeightRequest="60"
+					Aspect="AspectFit"
+					HorizontalOptions="Start"
+					VerticalOptions="End"/>
+
+				<!-- Name of the bike -->
+				<Label
+					Grid.Column="1"
+					Grid.Row="0"
+					FontAttributes="Bold"
+					FontSize="Large"
+					HorizontalTextAlignment="Right"
+					IsVisible="{Binding BikeInRentalProcess.DisplayName, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
+					Text="{Binding BikeInRentalProcess.DisplayName}"/>
+
+				<!-- Id of the bike -->
+				<Label
+					Grid.Column="1"
+					Grid.Row="1"
+					FontAttributes="Bold"
+					HorizontalTextAlignment="Right"
+					VerticalTextAlignment="Start"
+					IsVisible="{Binding BikeInRentalProcess.DisplayId, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
+					Text="{Binding BikeInRentalProcess.DisplayId}"/>
+
+			</Grid>
+
+		</Frame>
+	  
+	</ContentView.Content>
+	
+</ContentView>
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBikeInfo.xaml.cs b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBikeInfo.xaml.cs
new file mode 100644
index 0000000..57dae34
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBikeInfo.xaml.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace ShareeSharedGuiLib.View.Bike.RentalProcess
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RentalProcessBikeInfo : ContentView
+	{
+		public RentalProcessBikeInfo ()
+		{
+			InitializeComponent ();
+		}
+	}
+}
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedClosedEndRental.xaml b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedClosedEndRental.xaml
new file mode 100644
index 0000000..43446f4
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedClosedEndRental.xaml
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+			 xmlns:conv="clr-namespace:TINK.View"
+			 xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
+			 xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+			 xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
+			 x:Class="ShareeSharedGuiLib.View.Bike.RentalProcess.RentalProcessBookedClosedEndRental"
+			 IsVisible="False">
+
+	<ContentView.Triggers>
+		<DataTrigger TargetType="ContentView"
+				Binding="{Binding RentalProcess.State}"
+				Value="{x:Static rental_process:CurrentRentalProcess.EndRental}">
+			<Setter Property="IsVisible" Value="True" />
+		</DataTrigger>
+		<DataTrigger TargetType="ContentView"
+							Binding="{Binding RentalProcess.State}"
+							Value="{x:Static rental_process:CurrentRentalProcess.CloseLock}">
+			<Setter Property="IsVisible" Value="False" />
+			<Setter Property="HeightRequest" Value="0"/>
+		</DataTrigger>
+	</ContentView.Triggers>
+
+	<ContentView.Resources>
+		<conv:StringNotNullOrEmptyToVisibleConverter x:Key="StringNotNullOrEmpty_Converter"/>
+		<x:String x:Key="Triangle">&#xf071;</x:String>
+		<x:String x:Key="LocationServiceSymbol">&#xf3c5;</x:String>
+		<x:String x:Key="Upload">&#xf382;</x:String>
+		<x:String x:Key="WriteFeedback">&#xf044;</x:String>
+	</ContentView.Resources>
+
+	<ContentView.Content>
+
+		<Frame
+			Grid.Row="0"
+			HorizontalOptions="FillAndExpand"
+			VerticalOptions="FillAndExpand"
+			BackgroundColor="White"
+			Padding="0"
+			Margin="0">
+
+			<Grid RowDefinitions="60,Auto,Auto,1*"
+				RowSpacing="0">
+
+				<!-- Title of rental process-->
+				<Frame Grid.Row="0"
+					HorizontalOptions="FillAndExpand"
+					VerticalOptions="FillAndExpand"
+					BackgroundColor="{DynamicResource primary-back-title-color}"
+					Padding="0"
+					Margin="0">
+					<Label
+						Text="{x:Static resources:AppResources.ActionReturn}"
+						FontSize="Large"
+						TextColor="White"
+						HorizontalOptions="Center"
+						VerticalOptions="Center"/>
+				</Frame>
+
+				<!--Bike info-->
+				<sharedGui:RentalProcessBikeInfo Grid.Row="1"/>
+
+				<!-- Progress bar -->
+				<sharedGui:RentalProcess3StepsBar Grid.Row="2"/>
+
+				<!--EndRental Content-->
+				<Grid Grid.Row="3"
+					RowSpacing="10"
+					RowDefinitions="Auto,1*,Auto"
+					Margin="0,40,0,20">
+					<Grid.Triggers>
+						<MultiTrigger TargetType="Grid">
+							<MultiTrigger.Conditions>
+								<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+							</MultiTrigger.Conditions>
+							<Setter Property="IsVisible" Value="False"/>
+							<Setter Property="HeightRequest" Value="0"/>
+						</MultiTrigger>
+						<MultiTrigger TargetType="Grid">
+							<MultiTrigger.Conditions>
+								<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+								<BindingCondition Binding="{Binding RentalProcess.Result}" Value="{x:Static rental_process:CurrentStepStatus.Succeeded}" />
+							</MultiTrigger.Conditions>
+							<Setter Property="IsVisible" Value="False"/>
+							<Setter Property="HeightRequest" Value="0"/>
+						</MultiTrigger>
+					</Grid.Triggers>
+
+					<!--Step icon and Step text-->
+					<Grid Grid.Row="0"
+						Padding="30,0,0,0"
+						ColumnDefinitions="20,Auto,1*,20"
+						ColumnSpacing="10"
+						HorizontalOptions="CenterAndExpand">
+
+						<!--Step icon-->
+						<Image
+							Grid.Column="1"
+							HorizontalOptions="End">
+							<Image.Triggers>
+								<MultiTrigger TargetType="Image">
+									<MultiTrigger.Conditions>
+										<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="1" />
+									</MultiTrigger.Conditions>
+									<Setter Property="Source">
+										<Setter.Value>
+											<FontImageSource
+														Glyph="{StaticResource LocationServiceSymbol}"
+														FontFamily="FA-S"
+														Size="40"
+														Color="Black"/>
+										</Setter.Value>
+									</Setter>
+								</MultiTrigger>
+								<MultiTrigger TargetType="Image">
+									<MultiTrigger.Conditions>
+										<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="3" />
+									</MultiTrigger.Conditions>
+									<Setter Property="Source">
+										<Setter.Value>
+											<FontImageSource
+														Glyph="{StaticResource Upload}"
+														FontFamily="FA-S"
+														Size="40"
+														Color="Black"/>
+										</Setter.Value>
+									</Setter>
+								</MultiTrigger>
+							</Image.Triggers>
+						</Image>
+
+						<!--Step text-->
+						<Label
+							Grid.Column="2"
+							TextType="Html"
+							Text="{Binding RentalProcess.StepInfoText}"
+							FontSize="Large"
+							HorizontalOptions="StartAndExpand"
+							VerticalOptions="Center"
+							TextColor="Black"
+							Padding="0">
+						</Label>
+
+					</Grid>
+
+					<!--Spinner & Info text-->
+					<StackLayout Grid.Row="1"
+						Margin="30,30,30,0"
+						Spacing="30"
+						IsVisible="True">
+
+						<!--Spinner-->
+						<ActivityIndicator
+							IsRunning="{Binding IsProcessWithRunningProcessView}"
+							Scale="2"
+							HorizontalOptions="Center"
+							Color="{x:DynamicResource primary-back-title-color}"/>
+
+						<!--Info text-->
+						<Label
+							TextType="Html"
+							Text="{Binding StatusInfoText}"
+							FontSize="Medium"
+							TextColor="DimGray"
+							HorizontalOptions="CenterAndExpand"
+							HorizontalTextAlignment="Center"/>
+
+					</StackLayout>
+
+					<!--Attention: Important info-->
+					<Frame Grid.Row="2"
+						Margin="0,20,0,60"
+						Padding="10"
+						HorizontalOptions="FillAndExpand"
+						HasShadow="False"
+						IsVisible="{Binding RentalProcess.ImportantStepInfoText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
+						BackgroundColor="{DynamicResource important-text-color}">
+
+						<Grid
+							ColumnDefinitions="20,*,Auto,20"
+							RowDefinitions="Auto">
+
+							<Label
+								Grid.Column="1"
+								HorizontalOptions="End"
+								IsVisible="True"
+								TextColor="White"
+								FontSize="Large"
+								
+								Text="{Binding RentalProcess.ImportantStepInfoText}"
+								FontAttributes="Bold">
+							</Label>
+
+							<Image
+								Grid.Column="2"
+								HorizontalOptions="Start">
+								<Image.Source>
+									<FontImageSource
+										Glyph="{StaticResource Triangle}"
+										FontFamily="FA-S"
+										Size="40"
+										Color="White"/>
+								</Image.Source>
+							</Image>
+
+						</Grid>
+
+					</Frame>
+
+				</Grid>
+
+			</Grid>
+
+		</Frame>
+
+	</ContentView.Content>
+
+</ContentView>
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedClosedEndRental.xaml.cs b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedClosedEndRental.xaml.cs
new file mode 100644
index 0000000..f9cd8ab
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedClosedEndRental.xaml.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+#if !NOXCT
+namespace ShareeSharedGuiLib.View.Bike.RentalProcess
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RentalProcessBookedClosedEndRental : ContentView
+	{
+		public RentalProcessBookedClosedEndRental()
+		{
+			InitializeComponent ();
+		}
+	}
+}
+# endif
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedOpenCloseLock.xaml b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedOpenCloseLock.xaml
new file mode 100644
index 0000000..e26e007
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedOpenCloseLock.xaml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+			 xmlns:conv="clr-namespace:TINK.View"
+			 xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
+			 xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+			  xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
+			 x:Class="ShareeSharedGuiLib.View.Bike.RentalProcess.RentalProcessBookedOpenCloseLock"
+			 IsVisible="False">
+
+	<ContentView.Triggers>
+		<DataTrigger TargetType="ContentView"
+				Binding="{Binding RentalProcess.State}"
+				Value="{x:Static rental_process:CurrentRentalProcess.CloseLock}">
+			<Setter Property="IsVisible" Value="True" />
+		</DataTrigger>
+		<DataTrigger TargetType="ContentView"
+							Binding="{Binding RentalProcess.State}"
+							Value="{x:Static rental_process:CurrentRentalProcess.EndRental}">
+			<Setter Property="IsVisible" Value="False" />
+			<Setter Property="HeightRequest" Value="0"/>
+		</DataTrigger>
+	</ContentView.Triggers>
+
+	<ContentView.Resources>
+		<conv:StringNotNullOrEmptyToVisibleConverter x:Key="StringNotNullOrEmpty_Converter"/>
+		<x:String x:Key="Glasses">&#xf530;</x:String>
+		<x:String x:Key="Bluetooth">&#xf293;</x:String>
+		<x:String x:Key="Upload">&#xf382;</x:String>
+	</ContentView.Resources>
+
+	<ContentView.Content>
+
+		<Frame
+			Grid.Row="0"
+			HorizontalOptions="FillAndExpand"
+			VerticalOptions="FillAndExpand"
+			BackgroundColor="White"
+			Padding="0"
+			Margin="0">
+
+			<Grid RowDefinitions="60,Auto,Auto,1*"
+				RowSpacing="0">
+
+				<!-- Title of rental process -->
+				<Frame Grid.Row="0"
+					HorizontalOptions="FillAndExpand"
+					VerticalOptions="FillAndExpand"
+					BackgroundColor="{DynamicResource primary-back-title-color}"
+					Padding="0"
+					Margin="0">
+					<Label
+						Text="{x:Static resources:AppResources.ActionClose}"
+						FontSize="Large"
+						TextColor="White"
+						HorizontalOptions="Center"
+						VerticalOptions="Center"/>
+				</Frame>
+
+				<!--Bike info-->
+				<sharedGui:RentalProcessBikeInfo Grid.Row="1"/>
+
+				<!-- Progress bar -->
+				<sharedGui:RentalProcess2StepsBar Grid.Row="2"/>
+
+				<!--CloseLock Content-->
+				<Grid Grid.Row="3"
+					RowSpacing="10"
+					RowDefinitions="Auto,1*,Auto"
+					Margin="0,40,0,20">
+					<Grid.Triggers>
+						<MultiTrigger TargetType="Grid">
+							<MultiTrigger.Conditions>
+								<BindingCondition Binding="{Binding RentalProcess.StepIndex}" Value="2" />
+							</MultiTrigger.Conditions>
+							<Setter Property="IsVisible" Value="False"/>
+							<Setter Property="HeightRequest" Value="0"/>
+						</MultiTrigger>
+					</Grid.Triggers>
+
+					<!--Step-->
+					<Grid Grid.Row="0"
+						Padding="30,0,0,0"
+						ColumnDefinitions="20,Auto,1*,20"
+						ColumnSpacing="10"
+						HorizontalOptions="CenterAndExpand">
+
+						<!--Step icon-->
+						<Image
+							Grid.Column="1"
+							HorizontalOptions="End">
+							<Image.Triggers>
+								<MultiTrigger TargetType="Image">
+									<MultiTrigger.Conditions>
+										<BindingCondition Binding="{Binding RentalProcess.StepInfoText}" Value="{x:Static resources:AppResources.MarkingRentalProcessCloseLockStepCloseLock}"/>
+
+									</MultiTrigger.Conditions>
+									<Setter Property="Source">
+										<Setter.Value>
+											<FontImageSource
+														Glyph="{StaticResource Bluetooth}"
+														FontFamily="FA-B"
+														Size="40"
+														Color="Black"/>
+										</Setter.Value>
+									</Setter>
+								</MultiTrigger>
+								<MultiTrigger TargetType="Image">
+									<MultiTrigger.Conditions>
+										<BindingCondition Binding="{Binding RentalProcess.StepInfoText}" Value="{x:Static resources:AppResources.MarkingRentalProcessCloseLockStepUpload}"/>
+									</MultiTrigger.Conditions>
+									<Setter Property="Source">
+										<Setter.Value>
+											<FontImageSource
+														Glyph="{StaticResource Upload}"
+														FontFamily="FA-S"
+														Size="40"
+														Color="Black"/>
+										</Setter.Value>
+									</Setter>
+								</MultiTrigger>
+							</Image.Triggers>
+						</Image>
+
+						<!--Step text-->
+						<Label
+							Grid.Column="2"
+							TextType="Html"
+							Text="{Binding RentalProcess.StepInfoText}"
+							FontSize="Large"
+							HorizontalOptions="Start"
+							VerticalOptions="Center"
+							TextColor="Black"
+							Padding="0">
+						</Label>
+
+					</Grid>
+
+					<!--Spinner-->
+					<StackLayout Grid.Row="1"
+						Margin="30,30,30,0"
+						Spacing="30">
+
+						<!--Spinner-->
+						<ActivityIndicator
+							IsRunning="{Binding IsProcessWithRunningProcessView}"
+							Scale="2"
+							HorizontalOptions="Center"
+							Color="{x:DynamicResource primary-back-title-color}"/>
+
+						<!--Info text-->
+						<Label
+							TextType="Html"
+							Text="{Binding StatusInfoText}"
+							FontSize="Medium"
+							TextColor="DimGray"
+							HorizontalOptions="CenterAndExpand"
+							HorizontalTextAlignment="Center"/>
+
+					</StackLayout>
+
+					<!--Attention: Important info-->
+					<Frame Grid.Row="2"
+						Margin="0,20,0,60"
+						Padding="10"
+						HorizontalOptions="FillAndExpand"
+						HasShadow="False"
+						IsVisible="{Binding RentalProcess.ImportantStepInfoText, Converter={StaticResource StringNotNullOrEmpty_Converter}}"
+						BackgroundColor="{DynamicResource important-text-color}">
+
+						<Grid
+							ColumnDefinitions="20,*,Auto,20"
+							RowDefinitions="Auto">
+
+							<Label
+								Grid.Column="1"
+								HorizontalOptions="End"
+								IsVisible="True"
+								TextColor="White"
+								FontSize="Large"
+								Text="{Binding RentalProcess.ImportantStepInfoText}"
+								FontAttributes="Bold">
+							</Label>
+
+							<Image
+								Grid.Column="2"
+								HorizontalOptions="Start">
+								<Image.Source>
+									<FontImageSource
+										Glyph="{StaticResource Glasses}"
+										FontFamily="FA-S"
+										Size="40"
+										Color="White"/>
+								</Image.Source>
+							</Image>
+
+						</Grid>
+
+					</Frame>
+
+				</Grid>
+
+			</Grid>
+
+		</Frame>
+
+	</ContentView.Content>
+
+</ContentView>
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedOpenCloseLock.xaml.cs b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedOpenCloseLock.xaml.cs
new file mode 100644
index 0000000..d7df7b7
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessBookedOpenCloseLock.xaml.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace ShareeSharedGuiLib.View.Bike.RentalProcess
+{
+#if !NOXCT
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RentalProcessBookedOpenCloseLock : ContentView
+	{
+
+		public RentalProcessBookedOpenCloseLock()
+		{
+			InitializeComponent();
+		}
+	}
+#endif
+}
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessStepBarFinished.xaml b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessStepBarFinished.xaml
new file mode 100644
index 0000000..57d8bc6
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessStepBarFinished.xaml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+			 xmlns:conv="clr-namespace:TINK.View"
+			 xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
+			 xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+             x:Class="ShareeSharedGuiLib.View.Bike.RentalProcess.RentalProcessStepBarFinished">
+
+	<ContentView.Resources>
+		<conv:StringNotNullOrEmptyToVisibleConverter x:Key="StringNotNullOrEmpty_Converter"/>
+		<x:String x:Key="check">&#xf00c;</x:String>
+		<x:String x:Key="xmark">&#xf00d;</x:String>
+	</ContentView.Resources>
+	
+	<ContentView.Content>
+		
+		<!-- Progress bar -->
+		<Grid
+			ColumnDefinitions="1*,80,40"
+			RowDefinitions="15,50,15"
+			RowSpacing="0">
+
+			<Frame
+				Grid.Column="0"
+				Grid.ColumnSpan="3"
+				Grid.Row="1"
+				BackgroundColor="{DynamicResource process-step-succeeded}"
+				Padding="0">
+
+				<Label
+					Padding="40,0,0,0"
+					VerticalOptions="Center"
+					TextColor="White"
+					FontAttributes="Bold"
+					Text="">
+					<Label.Triggers>
+						<MultiTrigger TargetType="Label">
+							<MultiTrigger.Conditions>
+								<BindingCondition Binding="{Binding RentalProcess.State}" Value="{x:Static rental_process:CurrentRentalProcess.CloseLock}" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Text" Value="{x:Static resources:AppResources.StatusTextLockClosed}" />
+						</MultiTrigger>
+						<MultiTrigger TargetType="Label">
+							<MultiTrigger.Conditions>
+								<BindingCondition Binding="{Binding RentalProcess.State}" Value="{x:Static rental_process:CurrentRentalProcess.EndRental}" />
+							</MultiTrigger.Conditions>
+							<Setter Property="Text" Value="{x:Static resources:AppResources.StatusTextRentalEnded}" />
+						</MultiTrigger>
+					</Label.Triggers>
+				</Label>
+				
+			</Frame>
+
+			<Frame
+				Grid.Column="1"
+				Grid.Row="0"
+				Grid.RowSpan="3"
+				BackgroundColor="{DynamicResource process-step-succeeded}"
+				BorderColor="White"
+				CornerRadius="40">
+				<Image>
+					<Image.Source>
+						<FontImageSource
+							Glyph="{StaticResource check}"
+							FontFamily="FA-S"
+							Size="Large"
+							Color="White"/>
+					</Image.Source>
+				</Image>
+			</Frame>
+
+		</Grid>
+		
+	</ContentView.Content>
+	
+</ContentView>
diff --git a/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessStepBarFinished.xaml.cs b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessStepBarFinished.xaml.cs
new file mode 100644
index 0000000..5845250
--- /dev/null
+++ b/ShareeSharedGuiLib/View/Bike/RentalProcess/RentalProcessStepBarFinished.xaml.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace ShareeSharedGuiLib.View.Bike.RentalProcess
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class RentalProcessStepBarFinished : ContentView
+	{
+		public RentalProcessStepBarFinished ()
+		{
+			InitializeComponent ();
+		}
+	}
+}
\ No newline at end of file
diff --git a/ShareeSharedGuiLib/View/NotConnectedToNetView.xaml b/ShareeSharedGuiLib/View/NotConnectedToNetView.xaml
index df946f4..1cd266a 100644
--- a/ShareeSharedGuiLib/View/NotConnectedToNetView.xaml
+++ b/ShareeSharedGuiLib/View/NotConnectedToNetView.xaml
@@ -19,7 +19,7 @@
 				</DataTrigger>
 			</StackLayout.Triggers>
 
-		<Label Text="{x:Static resources:AppResources.MarkingNoNetworkConnection}"
+		<Label Text="{x:Static resources:AppResources.MarkingNoWeb}"
                    TextColor="White"
 				   FontSize="Small"
 					Padding="5"
diff --git a/TINK/TINK.Android/MainActivity.cs b/TINK/TINK.Android/MainActivity.cs
index b8180b7..81fbd7c 100644
--- a/TINK/TINK.Android/MainActivity.cs
+++ b/TINK/TINK.Android/MainActivity.cs
@@ -14,6 +14,7 @@ using Xamarin.Forms.Platform.Android.AppLinks;
 using static Xamarin.Essentials.Permissions;
 using Xamarin.Essentials;
 using Android.Runtime;
+using Xamarin.Forms;
 
 namespace TINK.Droid
 {
diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml
index bb328da..b11e566 100644
--- a/TINK/TINK.Android/Properties/AndroidManifest.xml
+++ b/TINK/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.369" android:versionCode="369">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.370" android:versionCode="370">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/TINK/TINK.Android/Resources/Resource.Designer.cs b/TINK/TINK.Android/Resources/Resource.Designer.cs
index 6a49fae..deee853 100644
--- a/TINK/TINK.Android/Resources/Resource.Designer.cs
+++ b/TINK/TINK.Android/Resources/Resource.Designer.cs
@@ -14,7 +14,7 @@ namespace TINK.Droid
 {
 	
 	
-	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.93")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
 	public partial class Resource
 	{
 		
@@ -24011,208 +24011,211 @@ namespace TINK.Droid
 			public const int ic_vol_unmute = 2131165510;
 			
 			// aapt resource value: 0x7F070147
-			public const int material_cursor_drawable = 2131165511;
+			public const int Location_Button = 2131165511;
 			
 			// aapt resource value: 0x7F070148
-			public const int material_ic_calendar_black_24dp = 2131165512;
+			public const int material_cursor_drawable = 2131165512;
 			
 			// aapt resource value: 0x7F070149
-			public const int material_ic_clear_black_24dp = 2131165513;
+			public const int material_ic_calendar_black_24dp = 2131165513;
 			
 			// aapt resource value: 0x7F07014A
-			public const int material_ic_edit_black_24dp = 2131165514;
+			public const int material_ic_clear_black_24dp = 2131165514;
 			
 			// aapt resource value: 0x7F07014B
-			public const int material_ic_keyboard_arrow_left_black_24dp = 2131165515;
+			public const int material_ic_edit_black_24dp = 2131165515;
 			
 			// aapt resource value: 0x7F07014C
-			public const int material_ic_keyboard_arrow_next_black_24dp = 2131165516;
+			public const int material_ic_keyboard_arrow_left_black_24dp = 2131165516;
 			
 			// aapt resource value: 0x7F07014D
-			public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165517;
+			public const int material_ic_keyboard_arrow_next_black_24dp = 2131165517;
 			
 			// aapt resource value: 0x7F07014E
-			public const int material_ic_keyboard_arrow_right_black_24dp = 2131165518;
+			public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165518;
 			
 			// aapt resource value: 0x7F07014F
-			public const int material_ic_menu_arrow_down_black_24dp = 2131165519;
+			public const int material_ic_keyboard_arrow_right_black_24dp = 2131165519;
 			
 			// aapt resource value: 0x7F070150
-			public const int material_ic_menu_arrow_up_black_24dp = 2131165520;
+			public const int material_ic_menu_arrow_down_black_24dp = 2131165520;
 			
 			// aapt resource value: 0x7F070151
-			public const int mr_button_connected_dark = 2131165521;
+			public const int material_ic_menu_arrow_up_black_24dp = 2131165521;
 			
 			// aapt resource value: 0x7F070152
-			public const int mr_button_connected_light = 2131165522;
+			public const int mr_button_connected_dark = 2131165522;
 			
 			// aapt resource value: 0x7F070153
-			public const int mr_button_connecting_dark = 2131165523;
+			public const int mr_button_connected_light = 2131165523;
 			
 			// aapt resource value: 0x7F070154
-			public const int mr_button_connecting_light = 2131165524;
+			public const int mr_button_connecting_dark = 2131165524;
 			
 			// aapt resource value: 0x7F070155
-			public const int mr_button_dark = 2131165525;
+			public const int mr_button_connecting_light = 2131165525;
 			
 			// aapt resource value: 0x7F070156
-			public const int mr_button_dark_static = 2131165526;
+			public const int mr_button_dark = 2131165526;
 			
 			// aapt resource value: 0x7F070157
-			public const int mr_button_light = 2131165527;
+			public const int mr_button_dark_static = 2131165527;
 			
 			// aapt resource value: 0x7F070158
-			public const int mr_button_light_static = 2131165528;
+			public const int mr_button_light = 2131165528;
 			
 			// aapt resource value: 0x7F070159
-			public const int mr_cast_checkbox = 2131165529;
+			public const int mr_button_light_static = 2131165529;
 			
 			// aapt resource value: 0x7F07015A
-			public const int mr_cast_group_seekbar_track = 2131165530;
+			public const int mr_cast_checkbox = 2131165530;
 			
 			// aapt resource value: 0x7F07015B
-			public const int mr_cast_mute_button = 2131165531;
+			public const int mr_cast_group_seekbar_track = 2131165531;
 			
 			// aapt resource value: 0x7F07015C
-			public const int mr_cast_route_seekbar_track = 2131165532;
+			public const int mr_cast_mute_button = 2131165532;
 			
 			// aapt resource value: 0x7F07015D
-			public const int mr_cast_stop = 2131165533;
+			public const int mr_cast_route_seekbar_track = 2131165533;
 			
 			// aapt resource value: 0x7F07015E
-			public const int mr_cast_thumb = 2131165534;
+			public const int mr_cast_stop = 2131165534;
 			
 			// aapt resource value: 0x7F07015F
-			public const int mr_dialog_close_dark = 2131165535;
+			public const int mr_cast_thumb = 2131165535;
 			
 			// aapt resource value: 0x7F070160
-			public const int mr_dialog_close_light = 2131165536;
+			public const int mr_dialog_close_dark = 2131165536;
 			
 			// aapt resource value: 0x7F070161
-			public const int mr_dialog_material_background_dark = 2131165537;
+			public const int mr_dialog_close_light = 2131165537;
 			
 			// aapt resource value: 0x7F070162
-			public const int mr_dialog_material_background_light = 2131165538;
+			public const int mr_dialog_material_background_dark = 2131165538;
 			
 			// aapt resource value: 0x7F070163
-			public const int mr_group_collapse = 2131165539;
+			public const int mr_dialog_material_background_light = 2131165539;
 			
 			// aapt resource value: 0x7F070164
-			public const int mr_group_expand = 2131165540;
+			public const int mr_group_collapse = 2131165540;
 			
 			// aapt resource value: 0x7F070165
-			public const int mr_media_pause_dark = 2131165541;
+			public const int mr_group_expand = 2131165541;
 			
 			// aapt resource value: 0x7F070166
-			public const int mr_media_pause_light = 2131165542;
+			public const int mr_media_pause_dark = 2131165542;
 			
 			// aapt resource value: 0x7F070167
-			public const int mr_media_play_dark = 2131165543;
+			public const int mr_media_pause_light = 2131165543;
 			
 			// aapt resource value: 0x7F070168
-			public const int mr_media_play_light = 2131165544;
+			public const int mr_media_play_dark = 2131165544;
 			
 			// aapt resource value: 0x7F070169
-			public const int mr_media_stop_dark = 2131165545;
+			public const int mr_media_play_light = 2131165545;
 			
 			// aapt resource value: 0x7F07016A
-			public const int mr_media_stop_light = 2131165546;
+			public const int mr_media_stop_dark = 2131165546;
 			
 			// aapt resource value: 0x7F07016B
-			public const int mr_vol_type_audiotrack_dark = 2131165547;
+			public const int mr_media_stop_light = 2131165547;
 			
 			// aapt resource value: 0x7F07016C
-			public const int mr_vol_type_audiotrack_light = 2131165548;
+			public const int mr_vol_type_audiotrack_dark = 2131165548;
 			
 			// aapt resource value: 0x7F07016D
-			public const int mtrl_dialog_background = 2131165549;
+			public const int mr_vol_type_audiotrack_light = 2131165549;
 			
 			// aapt resource value: 0x7F07016E
-			public const int mtrl_dropdown_arrow = 2131165550;
+			public const int mtrl_dialog_background = 2131165550;
 			
 			// aapt resource value: 0x7F07016F
-			public const int mtrl_ic_arrow_drop_down = 2131165551;
+			public const int mtrl_dropdown_arrow = 2131165551;
 			
 			// aapt resource value: 0x7F070170
-			public const int mtrl_ic_arrow_drop_up = 2131165552;
+			public const int mtrl_ic_arrow_drop_down = 2131165552;
 			
 			// aapt resource value: 0x7F070171
-			public const int mtrl_ic_cancel = 2131165553;
+			public const int mtrl_ic_arrow_drop_up = 2131165553;
 			
 			// aapt resource value: 0x7F070172
-			public const int mtrl_ic_error = 2131165554;
+			public const int mtrl_ic_cancel = 2131165554;
 			
 			// aapt resource value: 0x7F070173
-			public const int mtrl_navigation_bar_item_background = 2131165555;
+			public const int mtrl_ic_error = 2131165555;
 			
 			// aapt resource value: 0x7F070174
-			public const int mtrl_popupmenu_background = 2131165556;
+			public const int mtrl_navigation_bar_item_background = 2131165556;
 			
 			// aapt resource value: 0x7F070175
-			public const int mtrl_popupmenu_background_dark = 2131165557;
+			public const int mtrl_popupmenu_background = 2131165557;
 			
 			// aapt resource value: 0x7F070176
-			public const int mtrl_tabs_default_indicator = 2131165558;
+			public const int mtrl_popupmenu_background_dark = 2131165558;
 			
 			// aapt resource value: 0x7F070177
-			public const int navigation_empty_icon = 2131165559;
+			public const int mtrl_tabs_default_indicator = 2131165559;
 			
 			// aapt resource value: 0x7F070178
-			public const int notification_action_background = 2131165560;
+			public const int navigation_empty_icon = 2131165560;
 			
 			// aapt resource value: 0x7F070179
-			public const int notification_bg = 2131165561;
+			public const int notification_action_background = 2131165561;
 			
 			// aapt resource value: 0x7F07017A
-			public const int notification_bg_low = 2131165562;
+			public const int notification_bg = 2131165562;
 			
 			// aapt resource value: 0x7F07017B
-			public const int notification_bg_low_normal = 2131165563;
+			public const int notification_bg_low = 2131165563;
 			
 			// aapt resource value: 0x7F07017C
-			public const int notification_bg_low_pressed = 2131165564;
+			public const int notification_bg_low_normal = 2131165564;
 			
 			// aapt resource value: 0x7F07017D
-			public const int notification_bg_normal = 2131165565;
+			public const int notification_bg_low_pressed = 2131165565;
 			
 			// aapt resource value: 0x7F07017E
-			public const int notification_bg_normal_pressed = 2131165566;
+			public const int notification_bg_normal = 2131165566;
 			
 			// aapt resource value: 0x7F07017F
-			public const int notification_icon_background = 2131165567;
+			public const int notification_bg_normal_pressed = 2131165567;
 			
 			// aapt resource value: 0x7F070180
-			public const int notification_template_icon_bg = 2131165568;
+			public const int notification_icon_background = 2131165568;
 			
 			// aapt resource value: 0x7F070181
-			public const int notification_template_icon_low_bg = 2131165569;
+			public const int notification_template_icon_bg = 2131165569;
 			
 			// aapt resource value: 0x7F070182
-			public const int notification_tile_bg = 2131165570;
+			public const int notification_template_icon_low_bg = 2131165570;
 			
 			// aapt resource value: 0x7F070183
-			public const int notify_panel_notification_icon_bg = 2131165571;
+			public const int notification_tile_bg = 2131165571;
 			
 			// aapt resource value: 0x7F070184
-			public const int preference_list_divider_material = 2131165572;
+			public const int notify_panel_notification_icon_bg = 2131165572;
 			
 			// aapt resource value: 0x7F070185
-			public const int sharee = 2131165573;
+			public const int preference_list_divider_material = 2131165573;
 			
 			// aapt resource value: 0x7F070186
-			public const int sharee_no_background = 2131165574;
+			public const int sharee = 2131165574;
 			
 			// aapt resource value: 0x7F070187
-			public const int test_custom_background = 2131165575;
+			public const int sharee_no_background = 2131165575;
 			
 			// aapt resource value: 0x7F070188
-			public const int test_level_drawable = 2131165576;
+			public const int test_custom_background = 2131165576;
 			
 			// aapt resource value: 0x7F070189
-			public const int tooltip_frame_dark = 2131165577;
+			public const int test_level_drawable = 2131165577;
 			
 			// aapt resource value: 0x7F07018A
-			public const int tooltip_frame_light = 2131165578;
+			public const int tooltip_frame_dark = 2131165578;
+			
+			// aapt resource value: 0x7F07018B
+			public const int tooltip_frame_light = 2131165579;
 			
 			static Drawable()
 			{
diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist
index a304081..435b23f 100644
--- a/TINK/TINK.iOS/Info.plist
+++ b/TINK/TINK.iOS/Info.plist
@@ -56,8 +56,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>sharee.bike</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>370</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.369</string>
+	<string>3.0.370</string>
 </dict>
 </plist>
diff --git a/Meinkonrad/TINK.iOS/Resources/Font Awesome 5 Free-Solid-900.otf b/TINK/TINK.iOS/Resources/Font Awesome 5 Free-Solid-900.otf
similarity index 100%
rename from Meinkonrad/TINK.iOS/Resources/Font Awesome 5 Free-Solid-900.otf
rename to TINK/TINK.iOS/Resources/Font Awesome 5 Free-Solid-900.otf
diff --git a/TINK/TINK.iOS/Resources/LaunchScreen.storyboard b/TINK/TINK.iOS/Resources/LaunchScreen.storyboard
index 60a5305..d663a21 100644
--- a/TINK/TINK.iOS/Resources/LaunchScreen.storyboard
+++ b/TINK/TINK.iOS/Resources/LaunchScreen.storyboard
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="X5k-f2-b5h">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
@@ -41,6 +41,5 @@
         <image name="Icon-76.png" width="76" height="76"/>
         <image name="Icon-Small-40.png" width="40" height="40"/>
         <image name="Icon-Small.png" width="29" height="29"/>
-        <image name="tink2.png" width="208" height="208"/>
     </resources>
-</document>
\ No newline at end of file
+</document>
diff --git a/TINK/TINK/App.xaml.cs b/TINK/TINK/App.xaml.cs
index 8488840..2db211a 100644
--- a/TINK/TINK/App.xaml.cs
+++ b/TINK/TINK/App.xaml.cs
@@ -31,7 +31,11 @@ using Arendi.BleLibrary.Local;
 
 // Add ExportFont attribute
 [assembly: ExportFont("Font Awesome 5 Free-Solid-900.otf", Alias = "FA-S")]
+[assembly: ExportFont("Font Awesome 5 Brands-Regular-400.otf", Alias = "FA-B")]
+[assembly: ExportFont("Font Awesome 5 Free-Regular-400.otf", Alias = "FA-R")]
 [assembly: ExportFont("Roboto-Regular.ttf", Alias = "RobotoRegular")]
+[assembly: ExportFont("Roboto-Bold.ttf", Alias = "RobotoBold")]
+[assembly: ExportFont("Roboto-Italic.ttf", Alias = "RobotoItalic")]
 
 namespace TINK
 {
diff --git a/TINK/TINK/Resources/Fonts/Font Awesome 5 Brands-Regular-400.otf b/TINK/TINK/Resources/Fonts/Font Awesome 5 Brands-Regular-400.otf
new file mode 100644
index 0000000..1840b93
Binary files /dev/null and b/TINK/TINK/Resources/Fonts/Font Awesome 5 Brands-Regular-400.otf differ
diff --git a/TINK/TINK/Resources/Fonts/Font Awesome 5 Free-Regular-400.otf b/TINK/TINK/Resources/Fonts/Font Awesome 5 Free-Regular-400.otf
new file mode 100644
index 0000000..0f55808
Binary files /dev/null and b/TINK/TINK/Resources/Fonts/Font Awesome 5 Free-Regular-400.otf differ
diff --git a/TINK/TINK/TINK.projitems b/TINK/TINK/TINK.projitems
index 3a05e39..7661626 100644
--- a/TINK/TINK/TINK.projitems
+++ b/TINK/TINK/TINK.projitems
@@ -319,6 +319,12 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Fonts\Font Awesome 5 Brands-Regular-400.otf">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\Fonts\Font Awesome 5 Free-Regular-400.otf">
+      <Generator>MSBuild:Compile</Generator>
+    </EmbeddedResource>
     <Content Include="$(MSBuildThisFileDirectory)Resources\Fonts\Roboto-Bold.ttf" />
     <Content Include="$(MSBuildThisFileDirectory)Resources\Fonts\Roboto-Italic.ttf" />
   </ItemGroup>
diff --git a/TINK/TINK/View/Account/AccountPage.xaml b/TINK/TINK/View/Account/AccountPage.xaml
index e485f00..3da1bda 100644
--- a/TINK/TINK/View/Account/AccountPage.xaml
+++ b/TINK/TINK/View/Account/AccountPage.xaml
@@ -48,14 +48,14 @@
 							Text="{Binding BookingStateInfo}" />
 
 						<Button
-							Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}" 
+							Text="{x:Static resources:AppResources.MarkingAccountPageManagePersonalData}" 
 							Command="{Binding OnManageAccount}"
 							IsEnabled="{Binding IsLogoutPossible}">
 							</Button>
 
 						<Button
 							Style="{StaticResource SecondaryButton}"
-							Text="{x:Static resources:AppResources.MessageAccountPageManageLogout}"
+							Text="{x:Static resources:AppResources.MarkingAccountPageManageLogout}"
 							Command="{Binding OnLogoutRequest}"
 							IsEnabled="{Binding IsLogoutPossible}">
 							</Button>
diff --git a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml
index 643a03a..c6d4a70 100644
--- a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml
+++ b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml
@@ -2,11 +2,12 @@
 <ContentPage
 	xmlns="http://xamarin.com/schemas/2014/forms"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+	xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
+	xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
 	x:Class="TINK.View.BikesAtStation.BikesAtStationPage"
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
-	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
-	Shell.FlyoutBehavior="Disabled"
+	xmlns:bikeRentalProcess="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
 	BackgroundColor="{DynamicResource background-color}"
 	Shell.NavBarIsVisible="{Binding IsIdle}">
 
@@ -20,6 +21,15 @@
 	<ContentPage.Resources>
 		<ResourceDictionary>
 			<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
+			<xct:MultiConverter x:Key="RentalProcessToVisibleConverter">
+				<xct:EnumToBoolConverter>
+					<xct:EnumToBoolConverter.TrueValues>
+						<rental_process:CurrentRentalProcess>CloseLock</rental_process:CurrentRentalProcess>
+						<rental_process:CurrentRentalProcess>EndRental</rental_process:CurrentRentalProcess>
+					</xct:EnumToBoolConverter.TrueValues>
+				</xct:EnumToBoolConverter>
+				<xct:InvertedBoolConverter />
+			</xct:MultiConverter>
 		</ResourceDictionary>
 	</ContentPage.Resources>
 
@@ -27,8 +37,10 @@
 
 		<!--Grid for Bike(s) view and Running process in same row-->
 		<Grid>
-			<!-- Grid for Content -->
+
+			<!--BikesAtStationPage Content-->
 			<Grid
+				IsVisible="{Binding RentalProcess.State, Converter={StaticResource RentalProcessToVisibleConverter}}"
 				Grid.Row="0"
 				RowSpacing="0"
 				RowDefinitions="1*,Auto">
@@ -188,6 +200,14 @@
 					IsVisible="{Binding IsProcessWithRunningProcessView}"
 					Grid.Row="0"/>
 
+			<!--CloseLock View-->
+			<bikeRentalProcess:RentalProcessBookedOpenCloseLock
+				Grid.Row="0"/>
+
+			<!--EndRental View-->
+			<bikeRentalProcess:RentalProcessBookedClosedEndRental
+				Grid.Row="0"/>
+
 		</Grid>
 
 	</ContentPage.Content>
diff --git a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
index a718079..0e47316 100644
--- a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
+++ b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
@@ -24,6 +24,7 @@ namespace TINK.View.BikesAtStation
 	using TINK.ViewModel.Bikes;
 	using Xamarin.CommunityToolkit.Extensions;
 	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
+	using TINK.MultilingualResources;
 
 	[XamlCompilation(XamlCompilationOptions.Compile)]
 #if USEFLYOUT
@@ -111,7 +112,10 @@ namespace TINK.View.BikesAtStation
 			catch (Exception exception)
 			{
 				Log.ForContext<BikesAtStationPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+				await DisplayAlert(
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					AppResources.MessageAnswerOk);
 				isInitializationStarted = false;
 				return;
 			}
diff --git a/TINK/TINK/View/Contact/ContactPage.xaml b/TINK/TINK/View/Contact/ContactPage.xaml
index f52432f..59dbaf1 100644
--- a/TINK/TINK/View/Contact/ContactPage.xaml
+++ b/TINK/TINK/View/Contact/ContactPage.xaml
@@ -59,7 +59,7 @@
 
 						</StackLayout>
 
-						<!--Contact operator of selected station-->
+						<!--contact customer support of selected station-->
 						<StackLayout
 							IsVisible="{Binding IsOperatorInfoAvaliable}">
 
diff --git a/TINK/TINK/View/Contact/SelectStationPage.xaml b/TINK/TINK/View/Contact/SelectStationPage.xaml
index d047428..d5891b0 100644
--- a/TINK/TINK/View/Contact/SelectStationPage.xaml
+++ b/TINK/TINK/View/Contact/SelectStationPage.xaml
@@ -115,20 +115,25 @@
 
 			<!--Info text-->
 			<Label
-						Grid.Row="3"
-						Grid.ColumnSpan="3"
-						Text="{Binding StatusInfoText}"
-						IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
-						FontSize="Small"
-						Padding="5"
-						TextColor="DimGray" 
-						HorizontalOptions="CenterAndExpand">
+				Grid.Row="3"
+				Grid.ColumnSpan="3"
+				Text="{Binding StatusInfoText}"
+				IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
+				FontSize="Small"
+				Padding="5"
+				TextColor="DimGray" 
+				HorizontalOptions="CenterAndExpand">
 				<Label.Triggers>
 					<DataTrigger
 							TargetType="Label"
 							Binding="{Binding Path=StatusInfoText.Length}" Value="0">
 						<Setter Property="HeightRequest" Value="0" />
 					</DataTrigger>
+					<DataTrigger
+							TargetType="Label"
+							Binding="{Binding Path=StatusInfoText}" Value="Offline.">
+						<Setter Property="HeightRequest" Value="0" />
+					</DataTrigger>
 				</Label.Triggers>
 			</Label>
 
diff --git a/TINK/TINK/View/CopriWebView/ManageAccountPage.xaml b/TINK/TINK/View/CopriWebView/ManageAccountPage.xaml
index ed3f958..0f317e1 100644
--- a/TINK/TINK/View/CopriWebView/ManageAccountPage.xaml
+++ b/TINK/TINK/View/CopriWebView/ManageAccountPage.xaml
@@ -8,7 +8,7 @@
 	<Shell.TitleView>
 		<Grid ColumnDefinitions="Auto, 1*">
 			<Label Style="{StaticResource Label-Navbar}"
-				Text="{x:Static resources:AppResources.MessageAccountPageManagePersonalData}"/>
+				Text="{x:Static resources:AppResources.MarkingAccountPageManagePersonalData}"/>
 		</Grid>
 	</Shell.TitleView>
 
diff --git a/TINK/TINK/View/FeedbackPopup.xaml b/TINK/TINK/View/FeedbackPopup.xaml
index be0d32a..0bfc633 100644
--- a/TINK/TINK/View/FeedbackPopup.xaml
+++ b/TINK/TINK/View/FeedbackPopup.xaml
@@ -6,109 +6,140 @@
            x:TypeArguments="local:FeedbackPopup+Result"
            xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
            xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+		   IsLightDismissEnabled="false"
            x:Class="TINK.View.FeedbackPopup">
-	
-    <xct:Popup.Resources>
-        <x:String x:Key="check_circle">&#xf058;</x:String>
-    </xct:Popup.Resources>
+
+	<xct:Popup.Resources>
+		<x:String x:Key="check_circle">&#xf058;</x:String>
+		<x:String x:Key="WriteFeedback">&#xf044;</x:String>
+	</xct:Popup.Resources>
 
 	<ScrollView
 		Orientation="Vertical"
 		HorizontalOptions="FillAndExpand"
 		VerticalOptions="FillAndExpand">
-		
+
 		<StackLayout
 			HorizontalOptions="FillAndExpand"
 			VerticalOptions="FillAndExpand"
-			Padding="0,0,0,300">
+			Padding="0,0,0,400">
 
-			<!-- Head and title -->
-			<StackLayout
-						Padding="20"
-						BackgroundColor="{DynamicResource primary-back-title-color}">
-				<Label
-							HorizontalTextAlignment="Center"
-							FontSize="Large"
-							TextColor="White"
-							Text="{x:Static resources:AppResources.MarkingReturnBikeMainMessage}"/>
-				<Image>
+			<!-- Head -->
+			<Grid 
+				Padding="0,30,0,10"
+				ColumnDefinitions="10,Auto,1*,10"
+				ColumnSpacing="10"
+				HorizontalOptions="CenterAndExpand">
+
+				<!--icon-->
+				<Image
+					Grid.Column="1"
+					HorizontalOptions="End">
 					<Image.Source>
-						<FontImageSource Size="60" Glyph="{StaticResource check_circle}" FontFamily="FA-S" Color="White"/>
+						<FontImageSource
+							Glyph="{StaticResource WriteFeedback}"
+							FontFamily="FA-S"
+							Size="40"
+							Color="Black"/>
+
 					</Image.Source>
 				</Image>
-			</StackLayout>
+
+				<!--text-->
+				<Label
+					Grid.Column="2"
+					TextType="Html"
+					Text="{x:Static resources:AppResources.ActionGiveFeedback}"
+					FontSize="Large"
+					HorizontalOptions="StartAndExpand"
+					VerticalOptions="Center"
+					TextColor="Black"
+					Padding="0">
+				</Label>
+
+			</Grid>
+
+			<BoxView
+				Margin="20,0,20,10"
+				HeightRequest="1"
+				WidthRequest="400"
+				HorizontalOptions="Center"
+				Color="{DynamicResource primary-back-title-color}"/>
 
 			<!-- Content -->
 			<StackLayout
 				Margin="10"
 				Spacing="10">
 
-				<!-- Co2saving -->
-				<Frame 
-					x:Name="Co2SavingFrame">
-					<Label 
-						x:Name="Co2SavingLabel"
-						Text=""/>
-				</Frame>
-
 				<!-- Battery level -->
 				<sharedGui:BarLevelInputView 
-									x:Name="BarLevelInputView"
-									HorizontalOptions="Center"/>
+					x:Name="BarLevelInputView"
+					HorizontalOptions="Center"/>
 
 				<!-- Is bike okay? -->
 				<Grid
-					ColumnDefinitions="*,Auto,Auto,Auto,*"
+					ColumnDefinitions="*,Auto,*"
 					RowDefinitions="Auto,Auto"
 					Margin="0,20,0,0">
-					<Label
+					<Grid
 						Grid.Column="1"
-						Grid.Row="0"
-						FontSize="Medium"
-						FontAttributes="Bold"
-						Text= "{x:Static resources:AppResources.MarkingReturnBikeBikeIsStateOkQuestion}">
-					</Label>
-					<Switch
-								Grid.Column="2"
-								Grid.Row="0"
+						ColumnDefinitions="1*,Auto,Auto">
+						<Label
+							Grid.Column="0"
+							FontAttributes="Bold"
+							HorizontalTextAlignment="End"
+							Text= "{x:Static resources:AppResources.MarkingReturnBikeBikeIsStateOkQuestion}">
+						</Label>
+						<Switch
+								Grid.Column="1"
 								VerticalOptions="Center"
 								HorizontalOptions="End"
 								x:Name="bikeIsOkSwitch"
 								IsToggled="True"/>
-					<Label
-								Grid.Column="3"
-								Grid.Row="0"
+						<Label
+								Grid.Column="2"
+								FontSize="Small"
 								VerticalOptions="Center"
 								HorizontalOptions="Start">
-						<Label.Triggers>
-							<DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}" Value="False">
-								<Setter Property="Text" Value="{x:Static resources:AppResources.QuestionAnswerNo}"/>
-							</DataTrigger>
-							<DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}" Value="True">
-								<Setter Property="Text" Value="{x:Static resources:AppResources.QuestionAnswerYes}"/>
-							</DataTrigger>
-						</Label.Triggers>
-					</Label>
+							<Label.Triggers>
+								<DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}" Value="False">
+									<Setter Property="Text" Value="{x:Static resources:AppResources.MessageAnswerNo}"/>
+								</DataTrigger>
+								<DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}" Value="True">
+									<Setter Property="Text" Value="{x:Static resources:AppResources.MessageAnswerYes}"/>
+								</DataTrigger>
+							</Label.Triggers>
+						</Label>
+					</Grid>
 
 					<!-- Text input bike is not OK -->
-					<Editor
+					<StackLayout Grid.Row="1"
 						Grid.Column="0"
-						Grid.ColumnSpan="5"
-						Grid.Row="1"
-								x:Name="feedbackMessage"
-								AutoSize="TextChanges"
-								Placeholder="{x:Static resources:AppResources.MarkingReturnBikeErrorDescriptionInputPlaceholder}"
-								Text=""
-								IsVisible="False">
-						<Editor.Triggers>
-							<DataTrigger TargetType="Editor"
-												 Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}"
-												 Value="False">
+						Grid.ColumnSpan="3"
+						Padding="1"
+						BackgroundColor="{DynamicResource primary-back-title-color}">
+						<StackLayout.Triggers>
+							<DataTrigger TargetType="StackLayout"
+											 Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}"
+											 Value="False">
 								<Setter Property="IsVisible" Value="True"/>
-								<Setter Property="Text" Value=""/>
+								<Setter Property="HeightRequest" Value="100"/>
 							</DataTrigger>
-						</Editor.Triggers>
-					</Editor>
+							<DataTrigger TargetType="StackLayout"
+											 Binding="{Binding Source={x:Reference bikeIsOkSwitch}, Path=IsToggled}"
+											 Value="True">
+								<Setter Property="IsVisible" Value="False"/>
+								<Setter Property="HeightRequest" Value="0"/>
+							</DataTrigger>
+						</StackLayout.Triggers>
+						<Editor
+							x:Name="feedbackMessage"
+							HeightRequest="100"
+							Placeholder="{x:Static resources:AppResources.MarkingReturnBikeErrorDescriptionInputPlaceholder}"
+							Text=""
+							BackgroundColor="White">
+						</Editor>
+					</StackLayout>
 
 				</Grid>
 
diff --git a/TINK/TINK/View/FeedbackPopup.xaml.cs b/TINK/TINK/View/FeedbackPopup.xaml.cs
index c86ed80..f4b5fe0 100644
--- a/TINK/TINK/View/FeedbackPopup.xaml.cs
+++ b/TINK/TINK/View/FeedbackPopup.xaml.cs
@@ -16,10 +16,6 @@ namespace TINK.View
 			string co2Saving = null)
 		{
 			InitializeComponent();
-			if (string.IsNullOrEmpty(co2Saving))
-				Co2SavingFrame.IsVisible = false;
-			else
-				Co2SavingLabel.Text = co2Saving;
 
 			if (battery == null
 				|| (battery.IsBackendAccessible.HasValue && battery.IsBackendAccessible.Value))
diff --git a/TINK/TINK/View/FindBike/FindBikePage.xaml b/TINK/TINK/View/FindBike/FindBikePage.xaml
index 8fd6830..c63d3a0 100644
--- a/TINK/TINK/View/FindBike/FindBikePage.xaml
+++ b/TINK/TINK/View/FindBike/FindBikePage.xaml
@@ -2,13 +2,17 @@
 <ContentPage
 	xmlns="http://xamarin.com/schemas/2014/forms"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+	xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
 	x:Class="TINK.View.FindBike.FindBikePage"
 	xmlns:conv="clr-namespace:TINK.View"
 	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+	xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
+	xmlns:bikeRentalProcess="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
-	BackgroundColor="{DynamicResource background-color}">
-	
+	BackgroundColor="{DynamicResource background-color}"
+	Shell.NavBarIsVisible="{Binding IsIdle}">
+
 	<Shell.TitleView>
 		<Grid ColumnDefinitions="Auto, 1*">
 			<Label Style="{StaticResource Label-Navbar}"
@@ -20,6 +24,15 @@
 		<ResourceDictionary>
 			<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
 			<conv:StringNotNullOrEmptyToVisibleConverter x:Key="Label_Converter"/>
+			<xct:MultiConverter x:Key="RentalProcessToVisibleConverter">
+				<xct:EnumToBoolConverter>
+					<xct:EnumToBoolConverter.TrueValues>
+						<rental_process:CurrentRentalProcess>CloseLock</rental_process:CurrentRentalProcess>
+						<rental_process:CurrentRentalProcess>EndRental</rental_process:CurrentRentalProcess>
+					</xct:EnumToBoolConverter.TrueValues>
+				</xct:EnumToBoolConverter>
+				<xct:InvertedBoolConverter />
+			</xct:MultiConverter>
 		</ResourceDictionary>
 	</ContentPage.Resources>
 
@@ -30,9 +43,10 @@
 
 			<!-- Grid for Content -->
 			<Grid
-				RowDefinitions="1*,Auto"
+				IsVisible="{Binding RentalProcess.State, Converter={StaticResource RentalProcessToVisibleConverter}}"
+				Grid.Row="0"
 				RowSpacing="0"
-				Grid.Row="0">
+				RowDefinitions="1*,Auto">
 
 				<StackLayout
 					Grid.Row="0"
@@ -142,7 +156,15 @@
 				Grid.Row="0"
 				IsVisible="{Binding IsProcessWithRunningProcessView}"/>
 
-			</Grid>
+			<!--CloseLock View-->
+			<bikeRentalProcess:RentalProcessBookedOpenCloseLock
+				Grid.Row="0"/>
+
+			<!--EndRental View-->
+			<bikeRentalProcess:RentalProcessBookedClosedEndRental
+				Grid.Row="0"/>
+
+		</Grid>
 				
 	</ContentPage.Content>
 	
diff --git a/TINK/TINK/View/FindBike/FindBikePage.xaml.cs b/TINK/TINK/View/FindBike/FindBikePage.xaml.cs
index ff3c9be..f8ccfa2 100644
--- a/TINK/TINK/View/FindBike/FindBikePage.xaml.cs
+++ b/TINK/TINK/View/FindBike/FindBikePage.xaml.cs
@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Serilog;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 using TINK.Model.Device;
+using TINK.MultilingualResources;
 using TINK.ViewModel.FindBike;
 using Xamarin.CommunityToolkit.Extensions;
 using Xamarin.Forms;
@@ -64,7 +65,10 @@ namespace TINK.View.FindBike
 			catch (Exception exception)
 			{
 				Log.ForContext<FindBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-				await DisplayAlert("Fehler", $"Seite Fahrrad Wählen kann nicht angezeigt werden. ${exception.Message}", "OK");
+				await DisplayAlert(
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					AppResources.MessageAnswerOk);
 				return;
 
 			}
diff --git a/TINK/TINK/View/MyBikes/MyBikesPage.xaml b/TINK/TINK/View/MyBikes/MyBikesPage.xaml
index 6c29148..50f7188 100644
--- a/TINK/TINK/View/MyBikes/MyBikesPage.xaml
+++ b/TINK/TINK/View/MyBikes/MyBikesPage.xaml
@@ -2,13 +2,17 @@
 <ContentPage
 	xmlns="http://xamarin.com/schemas/2014/forms"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+	xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
 	x:Class="TINK.View.MyBikes.MyBikesPage"
 	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
+	xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
+	xmlns:bikeRentalProcess="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
 	BackgroundColor="{DynamicResource background-color}"
-	Shell.FlyoutBehavior="{Binding FlyoutBehavior}">
-	
+	Shell.FlyoutBehavior="{Binding FlyoutBehavior}"
+	Shell.NavBarIsVisible="{Binding IsIdle}">
+
 	<Shell.TitleView>
 		<Grid ColumnDefinitions="Auto, 1*">
 			<Label Style="{StaticResource Label-Navbar}"
@@ -19,6 +23,15 @@
 	<ContentPage.Resources>
 		<ResourceDictionary>
 			<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
+			<xct:MultiConverter x:Key="RentalProcessToVisibleConverter">
+				<xct:EnumToBoolConverter>
+					<xct:EnumToBoolConverter.TrueValues>
+						<rental_process:CurrentRentalProcess>CloseLock</rental_process:CurrentRentalProcess>
+						<rental_process:CurrentRentalProcess>EndRental</rental_process:CurrentRentalProcess>
+					</xct:EnumToBoolConverter.TrueValues>
+				</xct:EnumToBoolConverter>
+				<xct:InvertedBoolConverter />
+			</xct:MultiConverter>
 		</ResourceDictionary>
 	</ContentPage.Resources>
 
@@ -29,9 +42,10 @@
 
 			<!--Bike(s) view-->
 			<Grid
-				RowDefinitions="1*,Auto"
+				IsVisible="{Binding RentalProcess.State, Converter={StaticResource RentalProcessToVisibleConverter}}"
+				Grid.Row="0"
 				RowSpacing="0"
-				Grid.Row="0">
+				RowDefinitions="1*,Auto">
 
 				<StackLayout
 						Grid.Row="0"
@@ -104,6 +118,14 @@
 					Grid.Row="0"
 					IsVisible="{Binding IsProcessWithRunningProcessView}"/>
 
+			<!--CloseLock View-->
+			<bikeRentalProcess:RentalProcessBookedOpenCloseLock
+				Grid.Row="0"/>
+
+			<!--EndRental View-->
+			<bikeRentalProcess:RentalProcessBookedClosedEndRental
+				Grid.Row="0"/>
+
 		</Grid>
 
 	</ContentPage.Content>
diff --git a/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs b/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs
index 75c265c..fca7a06 100644
--- a/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs
+++ b/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs
@@ -14,6 +14,7 @@ namespace TINK.View.MyBikes
 	using TINK.Model;
 	using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 	using TINK.Model.Device;
+	using TINK.MultilingualResources;
 	using TINK.ViewModel.MyBikes;
 	using Xamarin.CommunityToolkit.Extensions;
 
@@ -78,7 +79,10 @@ namespace TINK.View.MyBikes
 			catch (Exception exception)
 			{
 				Log.ForContext<MyBikesPage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-				await DisplayAlert("Fehler", $"Seite Räder an Station kann nicht angezeigt werden. ${exception.Message}", "OK");
+				await DisplayAlert(
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					AppResources.MessageAnswerOk);
 				isInitializationStarted = false;
 				return;
 			}
diff --git a/TINKLib/Model/Bikes/BikeCollectionMutable.cs b/TINKLib/Model/Bikes/BikeCollectionMutable.cs
index 8561dd1..f8bfa7c 100644
--- a/TINKLib/Model/Bikes/BikeCollectionMutable.cs
+++ b/TINKLib/Model/Bikes/BikeCollectionMutable.cs
@@ -3,7 +3,11 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using Serilog;
+using TINK.Model.Connector;
 using TINK.Model.Stations.StationNS;
+using TINK.Services.BluetoothLock;
+using TINK.Services.Geolocation;
+using TINK.ViewModel;
 using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 using BikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable;
 
@@ -12,10 +16,49 @@ namespace TINK.Model.Bikes
 	/// <summary> Holds entity of bikes. </summary>
 	public class BikeCollectionMutable : ObservableCollection<BikeInfoMutable>, IBikeDictionaryMutable<BikeInfoMutable>
 	{
+		/// <summary> Provides a connector object.</summary>
+		private Func<bool, IConnector> ConnectorFactory { get; }
+
+		/// <summary> Provides geolocation information.</summary>
+		private IGeolocationService GeolocationService { get; }
+
+		/// <summary> Provides a connector object.</summary>
+		private ILocksService LockService { get; }
+
+		/// <summary> Delegate to retrieve connected state. </summary>
+		private Func<bool> IsConnectedDelegate { get; }
+
+		/// <summary>Object to manage update of view model objects from Copri.</summary>
+		protected Func<IPollingUpdateTaskManager> ViewUpdateManager { get; }
+
 		/// <summary> Constructs a mutable bike collection object. </summary>
-		public BikeCollectionMutable()
+		/// <param name="geolocation">Provides geolocation information.</param>
+		/// <param name="lockService">Manages lock.</param>
+		/// <param name="isConnectedDelegate">Delegate to retrieve connected state.</param>
+		/// <param name="connectorFactory">Provides a connector object.</param>
+		public BikeCollectionMutable(
+			IGeolocationService geolocation,
+			ILocksService lockService,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			Func<IPollingUpdateTaskManager> viewUpdateManager)
 		{
 			SelectedBike = null;
+
+			GeolocationService = geolocation
+				?? throw new ArgumentException($"Can not instantiate {nameof(BikeCollectionMutable)}- object. No geolocation object available.");
+
+			LockService = lockService
+				?? throw new ArgumentException($"Can not instantiate {nameof(BikeCollectionMutable)}- object. No lock service object available.");
+
+			IsConnectedDelegate = isConnectedDelegate
+				?? throw new ArgumentException($"Can not instantiate {nameof(BikeCollectionMutable)}- object. No is connected delegate available.");
+
+			ConnectorFactory = connectorFactory
+				?? throw new ArgumentException($"Can not instantiate {nameof(BikeCollectionMutable)}- object. No connector available.");
+
+			ViewUpdateManager = viewUpdateManager
+				?? throw new ArgumentException($"Can not instantiate {nameof(BikeCollectionMutable)}- object. No view update manager available.");
 		}
 
 		/// <summary>
@@ -44,7 +87,14 @@ namespace TINK.Model.Bikes
 				// Check if bike has to be added to list of existing station.
 				if (ContainsKey(bikeInfo.Id) == false)
 				{
-					var bikeInfoMutable = BikeInfoMutableFactory.Create(bikeInfo, stationName);
+					var bikeInfoMutable = BikeInfoMutableFactory.Create(
+						GeolocationService,
+						LockService,
+						IsConnectedDelegate,
+						ConnectorFactory,
+						ViewUpdateManager,
+						bikeInfo,
+						stationName);
 					if (bikeInfoMutable != null)
 					{
 						// Bike does not yet exist in list of bikes.
@@ -143,13 +193,26 @@ namespace TINK.Model.Bikes
 		/// </summary>
 		public static class BikeInfoMutableFactory
 		{
+			/// <param name="viewUpdateManager">Manages update of view model objects from Copri.</param>
 			public static BikeInfoMutable Create(
+				IGeolocationService geolocation,
+				ILocksService lockService,
+				Func<bool> isConnectedDelegate,
+				Func<bool, IConnector> connectorFactory,
+				Func<IPollingUpdateTaskManager> viewUpdateManager,
 				BikeInfo bikeInfo,
 				string stationName)
 			{
 				if (bikeInfo is BikeInfoNS.BluetoothLock.BikeInfo btBikeInfo)
 				{
-					return new BikeInfoNS.BluetoothLock.BikeInfoMutable(btBikeInfo, stationName);
+					return new BikeInfoNS.BluetoothLock.BikeInfoMutable(
+						geolocation,
+						lockService,
+						isConnectedDelegate,
+						connectorFactory,
+						viewUpdateManager,
+						btBikeInfo,
+						stationName);
 				}
 				else if (bikeInfo is BikeInfoNS.CopriLock.BikeInfo copriBikeInfo)
 				{
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfoMutable.cs
index 7ad5979..cfde5c3 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfoMutable.cs
@@ -1,11 +1,42 @@
 using System;
+using System.Threading.Tasks;
+using TINK.Model.Connector;
+using TINK.Repository.Request;
+using TINK.Services.BluetoothLock;
+using TINK.Services.Geolocation;
+using TINK.ViewModel;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.CloseCommand;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
 	public class BikeInfoMutable : BC.BikeInfoMutable, IBikeInfoMutable
 	{
+		/// <summary> Provides a connector object.</summary>
+		private Func<bool, IConnector> ConnectorFactory { get; }
+
+		/// <summary> Provides geolocation information.</summary>
+		private IGeolocationService GeolocationService { get; }
+
+		/// <summary> Provides a connector object.</summary>
+		private ILocksService LockService { get; }
+
+		/// <summary> Delegate to retrieve connected state. </summary>
+		private Func<bool> IsConnectedDelegate { get; }
+
+		/// <summary>Object to manage update of view model objects from Copri.</summary>
+		protected Func<IPollingUpdateTaskManager> ViewUpdateManager { get; }
+
 		/// <summary> Constructs a bike object from source. </summary>
-		public BikeInfoMutable(BikeInfo bike, string stationName) : base(
+		/// <param name="viewUpdateManager">Manages update of view model objects from Copri.</param>
+		public BikeInfoMutable(
+			IGeolocationService geolocation,
+			ILocksService lockService,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			BikeInfo bike,
+			string stationName) : base(
 			bike != null
 				? bike.Bike
 				: throw new ArgumentNullException(nameof(bike)),
@@ -27,12 +58,58 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 				bike.LockInfo.AdminKey,
 				bike.LockInfo.Seed,
 				bike.LockInfo.State);
+
+			GeolocationService = geolocation
+				?? throw new ArgumentException($"Can not instantiate {nameof(BikeInfoMutable)}- object. No geolocation object available.");
+
+			LockService = lockService
+				?? throw new ArgumentException($"Can not instantiate {nameof(BikeInfoMutable)}- object. No lock service object available.");
+
+			IsConnectedDelegate = isConnectedDelegate
+				?? throw new ArgumentException($"Can not instantiate {nameof(BikeInfoMutable)}- object. No is connected delegate available.");
+
+			ConnectorFactory = connectorFactory
+				?? throw new ArgumentException($"Can not instantiate {nameof(BikeInfoMutable)}- object. No connector available.");
+
+			ViewUpdateManager = viewUpdateManager
+				?? throw new ArgumentException($"Can not instantiate {nameof(BikeInfoMutable)}- object. No update manger available.");
 		}
 
 		public LockInfoMutable LockInfo { get; }
 
 		ILockInfoMutable IBikeInfoMutable.LockInfo => LockInfo;
 
+		/// <summary>
+		/// Closes the lock and updates copri.
+		/// </summary>
+		/// <param name="listener">View model to process closing notifications.</param>
+		/// <param name="stopPollingTask">Task which stops polling.</param>
+		public async Task CloseLockAsync(
+			ICloseCommandListener listener,
+			Task stopPollingTask)
+		{
+			await InvokeAsync<BikeInfoMutable>(
+					this,
+					GeolocationService,
+					LockService,
+					IsConnectedDelegate,
+					ConnectorFactory,
+					listener,
+					stopPollingTask);			
+		}
+
+		/// <summary>
+		/// Gets the location of the locked bike.
+		/// </summary>
+		/// <param name="listener">View model to process notifications.</param>
+		/// <returns></returns>
+		public async Task<LocationDto> GetLockedBikeLocationAsync(IGetLockedLocationCommandListener listener) =>
+			await InvokeAsync<BikeInfoMutable>(
+				this,
+				GeolocationService,
+				LockService,
+				listener: listener);
+
 		public new string ToString()
 		{
 			return $"Id={Id}{(TypeOfBike != null ? $";type={TypeOfBike}" : "")};state={State.ToString()}";
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/CloseCommand.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/CloseCommand.cs
new file mode 100644
index 0000000..c014335
--- /dev/null
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/CloseCommand.cs
@@ -0,0 +1,283 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Serilog;
+using TINK.Model.Connector;
+using TINK.Repository.Exception;
+using TINK.Repository.Request;
+using TINK.Services.BluetoothLock;
+using TINK.Services.BluetoothLock.Exception;
+using TINK.Services.BluetoothLock.Tdo;
+using TINK.Services.Geolocation;
+
+namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command
+{
+	public static class CloseCommand
+	{
+		/// <summary>
+		/// Possible steps of closing a lock.
+		/// </summary>
+		public enum Step
+		{
+			StartStopingPolling,
+			StartingQueryingLocation,
+			ClosingLock,
+			WaitStopPollingQueryLocation,
+			/// <summary>
+			/// Notifies back end about modified lock state.
+			/// </summary>
+			UpdateLockingState,
+			QueryLocationTerminated
+		}
+
+		/// <summary>
+		/// Possible steps of closing a lock.
+		/// </summary>
+		public enum State
+		{
+			OutOfReachError,
+			CouldntCloseMovingError,
+			CouldntCloseBoltBlockedError,
+			GeneralCloseError,
+			StartGeolocationException,
+			WaitGeolocationException,
+			WebConnectFailed,
+			ResponseIsInvalid,
+			BackendUpdateFailed
+		}
+
+		/// <summary>
+		/// Interface to notify view model about steps/ state changes of closing process.
+		/// </summary>
+		public interface ICloseCommandListener
+		{
+			/// <summary>
+			/// Reports current step.
+			/// </summary>
+			/// <param name="currentStep">Current step to report.</param>
+			void ReportStep(Step currentStep);
+
+			/// <summary>
+			/// Reports current state.
+			/// </summary>
+			/// <param name="currentState">Current state to report.</param>
+			/// <param name="message">Message describing the current state.</param>
+			/// <returns></returns>
+			Task ReportStateAsync(State currentState, string message);
+		}
+
+		/// <summary>
+		/// Closes the lock and updates copri.
+		/// </summary>
+		/// <param name="listener">Interface to notify view model about steps/ state changes of closing process.</param>
+		/// <param name="stopPolling">Task which stops polling.</param>
+		public static async Task InvokeAsync<T>(
+			IBikeInfoMutable bike,
+			IGeolocationService geolocation,
+			ILocksService lockService,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactor,
+			ICloseCommandListener listener,
+			Task stopPollingTask)
+		{
+			// Invokes member to notify about step being started.
+			void InvokeCurrentStep(Step step)
+			{
+				if (listener == null)
+					return;
+
+				try
+				{
+					listener.ReportStep(step);
+				}
+				catch (Exception ex)
+				{
+					Log.ForContext<T>().Error("An exception {exception} was thrown invoking step- action for set {step} ", ex, step);
+				}
+			}
+
+			// Invokes member to notify about state change.
+			async Task InvokeCurrentStateAsync(State state, string message)
+			{
+				if (listener == null)
+					return;
+
+				try
+				{
+					await listener.ReportStateAsync(state, message);
+				}
+				catch (Exception ex)
+				{
+					Log.ForContext<T>().Error("An exception {exception} was thrown invoking state- action for set {state} ", ex, state);
+				}
+			}
+
+			// Wait for geolocation and polling task to stop (on finished or on canceled).
+			async Task<IGeolocation> WaitForPendingTasks(Task<IGeolocation> locationTask)
+			{
+				// Step: Wait until getting geolocation has completed.
+				InvokeCurrentStep(Step.WaitStopPollingQueryLocation);
+				Log.ForContext<T>().Debug($"Waiting on steps {Step.StartingQueryingLocation} and {Step.StartStopingPolling} to finish...");
+				try
+				{
+					await Task.WhenAll(new List<Task> { locationTask, stopPollingTask ?? Task.CompletedTask });
+				}
+				catch (Exception ex)
+				{
+					// No location information available.
+					Log.ForContext<T>().Information("Canceling query location/ wait for polling task to finish failed. {Exception}", ex);
+					await InvokeCurrentStateAsync(State.WaitGeolocationException, ex.Message);
+					InvokeCurrentStep(Step.QueryLocationTerminated);
+					return null;
+				}
+
+				Log.ForContext<T>().Debug($"Steps {Step.StartingQueryingLocation} and {Step.StartStopingPolling} finished.");
+				InvokeCurrentStep(Step.QueryLocationTerminated);
+				return locationTask.Result;
+			}
+
+			// Updates locking state
+			async Task UpdateLockingState(IGeolocation location, DateTime timeStamp)
+			{
+				// Step: Update backend.
+				InvokeCurrentStep(Step.UpdateLockingState);
+				try
+				{
+					await connectorFactor(true).Command.UpdateLockingStateAsync(
+						bike,
+						location != null
+							? new LocationDto.Builder
+							{
+								Latitude = location.Latitude,
+								Longitude = location.Longitude,
+								Accuracy = location.Accuracy ?? double.NaN,
+								Age = timeStamp.Subtract(location.Timestamp.DateTime),
+							}.Build()
+							: null);
+				}
+				catch (Exception exception)
+				{
+					//BikesViewModel.RentalProcess.Result = CurrentStepStatus.Failed;
+					if (exception is WebConnectFailureException)
+					{
+						// Copri server is not reachable.
+						Log.ForContext<T>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", bike);
+						await InvokeCurrentStateAsync(State.WebConnectFailed, exception.Message);
+						return;
+					}
+					else if (exception is ResponseException copriException)
+					{
+						// Copri server is not reachable.
+						Log.ForContext<T>().Information("User locked bike {bike} in order to pause ride but updating failed. Message: {Message} Details: {Details}", bike, copriException.Message, copriException.Response);
+						await InvokeCurrentStateAsync(State.ResponseIsInvalid, exception.Message);
+						return;
+					}
+					else
+					{
+						Log.ForContext<T>().Error("User locked bike {bike} in order to pause ride but updating failed. {@l_oException}", bike.Id, exception);
+						await InvokeCurrentStateAsync(State.BackendUpdateFailed, exception.Message);
+						return;
+					}
+				}
+			}
+
+			// Start query geolocation data.
+			Log.ForContext<T>().Debug($"Starting step {Step.StartingQueryingLocation}...");
+			InvokeCurrentStep(Step.StartingQueryingLocation);
+			var ctsLocation = new CancellationTokenSource();
+			Task<IGeolocation> currentLocationTask = Task.FromResult<IGeolocation>(null);
+			var timeStampNow = DateTime.Now;
+			try
+			{
+				currentLocationTask = geolocation.GetAsync(ctsLocation.Token, timeStampNow);
+			}
+			catch (Exception ex)
+			{
+				// No location information available.
+				Log.ForContext<T>().Information("Starting query location failed. {Exception}", bike, ex);
+				await InvokeCurrentStateAsync(State.StartGeolocationException, ex.Message);
+			}
+
+			// Close lock.
+			IGeolocation currentLocation;
+			Log.ForContext<T>().Debug($"Starting step {Step.ClosingLock}...");
+			InvokeCurrentStep(Step.ClosingLock);
+			LockitLockingState? lockingState;
+			try
+			{
+				lockingState = await lockService[bike.LockInfo.Id].CloseAsync();
+			}
+			catch (Exception exception)
+			{
+				if (exception is OutOfReachException)
+				{
+					Log.ForContext<T>().Debug("Lock can not be closed. {Exception}", exception);
+					await InvokeCurrentStateAsync(State.OutOfReachError, exception.Message);
+				}
+				else if (exception is CouldntCloseMovingException)
+				{
+					Log.ForContext<T>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+					await InvokeCurrentStateAsync(State.CouldntCloseMovingError, exception.Message);
+				}
+				else if (exception is CouldntCloseBoltBlockedException)
+				{
+					Log.ForContext<T>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+					await InvokeCurrentStateAsync(State.CouldntCloseBoltBlockedError, exception.Message);
+				}
+				else
+				{
+					Log.ForContext<T>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
+					await InvokeCurrentStateAsync(State.GeneralCloseError, exception.Message);
+				}
+
+				Log.ForContext<T>().Error("Lock can not be closed. {Exception}", exception);
+
+				// Signal cts to  cancel getting geolocation.
+				ctsLocation.Cancel();
+
+				//// Step: Wait until getting geolocation and stop polling has completed.
+				currentLocation = await WaitForPendingTasks(currentLocationTask);
+
+				// Update current state from exception
+				bike.LockInfo.State = exception is StateAwareException stateAwareException
+					? stateAwareException.State
+					: LockingState.UnknownDisconnected;
+
+				if (!isConnectedDelegate())
+				{
+					// Lock state can not be updated because there is no connected.
+					throw;
+				}
+
+				if (exception is OutOfReachException)
+				{
+					// Locking state can not be updated because lock is not connected.
+					throw;
+				}
+
+				// Step: Update backend.
+				// Do this even if current lock state is open (lock state must not necessarily be open before try to open, i.e. something undefined between open and closed).
+				await UpdateLockingState(currentLocation, timeStampNow);
+
+				throw;
+			}
+
+			//// Step: Wait until getting geolocation and stop polling has completed.
+			currentLocation = await WaitForPendingTasks(currentLocationTask);
+
+			bike.LockInfo.State = lockingState?.GetLockingState() ?? LockingState.UnknownDisconnected;
+
+			// Keep geolocation where closing action occurred.
+			bike.LockInfo.Location = currentLocation;
+
+			if (!isConnectedDelegate())
+			{
+				return;
+			}
+
+			//// Step: Update backend.
+			await UpdateLockingState(currentLocation, timeStampNow);
+		}
+	}
+}
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/GetLockedLocationCommand.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/GetLockedLocationCommand.cs
new file mode 100644
index 0000000..60f8335
--- /dev/null
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/GetLockedLocationCommand.cs
@@ -0,0 +1,178 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Serilog;
+using TINK.Repository.Request;
+using TINK.Services.BluetoothLock;
+using TINK.Services.Geolocation;
+
+namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command
+{
+	/// <summary>
+	/// Provides functionality to get the locked bike location.
+	/// </summary>
+	public static class GetLockedLocationCommand		
+	{
+		/// <summary>
+		/// Possible steps of closing a lock.
+		/// </summary>
+		public enum Step
+		{
+			StartingQueryLocation,
+			DisconnectingLockOnDisconnectedNoLocationError,
+		}
+
+		/// <summary>
+		/// Possible steps of closing a lock.
+		/// </summary>
+		public enum State
+		{
+			DisconnetedNoLocationError,
+			DisconnectError,
+			QueryLocationSucceeded,
+			QueryLocationFailed,
+		}
+
+		/// <summary>
+		/// Interface to notify view model about steps/ state changes of closing process.
+		/// </summary>
+		public interface IGetLockedLocationCommandListener
+		{
+			/// <summary>
+			/// Reports current step.
+			/// </summary>
+			/// <param name="currentStep">Current step to report.</param>
+			void ReportStep(Step currentStep);
+
+			/// <summary>
+			/// Reports current state.
+			/// </summary>
+			/// <param name="currentState">Current state to report.</param>
+			/// <param name="message">Message describing the current state.</param>
+			/// <returns></returns>
+			Task ReportStateAsync(State currentState, string message);
+		}
+
+		/// <summary>
+		/// Get current location.
+		/// </summary>
+		/// <param name="listener"></param>
+		/// <returns></returns>
+		/// <exception cref="Exception"></exception>
+		public static async Task<LocationDto> InvokeAsync<T>(
+			IBikeInfoMutable bike,
+			IGeolocationService geolocation,
+			ILocksService lockService,
+			Func<DateTime> dateTimeProvider = null,
+			IGetLockedLocationCommandListener listener = null)
+		{
+			// Invokes member to notify about step being started.
+			void InvokeCurrentStep(Step step)
+			{
+				if (listener == null)
+					return;
+
+				try
+				{
+					listener.ReportStep(step);
+				} catch (Exception ex)
+				{
+					Log.ForContext<T>().Error("An exception {exception} was thrown invoking step- action for set {step} ", ex, step);
+				}
+			}
+
+			// Invokes member to notify about state change.
+			async Task  InvokeCurrentStateAsync(State state, string message)
+			{
+				if (listener == null)
+					return;
+
+				try
+				{
+					await listener.ReportStateAsync(state, message);
+				}
+				catch (Exception ex)
+				{
+					Log.ForContext<T>().Error("An exception {exception} was thrown invoking state- action for set {state} ", ex, state);
+				}
+			}
+
+			InvokeCurrentStep(Step.StartingQueryLocation);
+
+			// Get geolocation which was requested when closing lock.
+			IGeolocation closingLockLocation = bike.LockInfo.Location;
+
+			if (closingLockLocation != null)
+			{
+				// Location was available when closing bike. No further actions required.
+				return new LocationDto.Builder
+				{
+					Latitude = closingLockLocation.Latitude,
+					Longitude = closingLockLocation.Longitude,
+					Accuracy = closingLockLocation.Accuracy ?? double.NaN,
+					Age = bike.LockInfo.LastLockingStateChange is DateTime lastLockState1 ? lastLockState1.Subtract(closingLockLocation.Timestamp.DateTime) : TimeSpan.MaxValue,
+				}.Build();
+			}
+
+			// Check if bike is around => geolocation information can be queried
+			var deviceState = lockService[bike.LockInfo.Id].GetDeviceState();
+			if (deviceState != DeviceState.Connected)
+			{
+				// Geolocation can not be queried because bike is not around.
+				Log.ForContext<T>().Information("User selected booked bike {bike} but returning failed. There is no geolocation information available.", bike);
+
+				await InvokeCurrentStateAsync(State.DisconnetedNoLocationError, "");
+
+				// Disconnect lock.
+				InvokeCurrentStep(Step.DisconnectingLockOnDisconnectedNoLocationError);
+				try
+				{
+					bike.LockInfo.State = await lockService.DisconnectAsync(bike.LockInfo.Id, bike.LockInfo.Guid);
+				}
+				catch (Exception exception)
+				{
+					Log.ForContext<T>().Error("Lock can not be disconnected. {Exception}", exception);
+
+					await InvokeCurrentStateAsync(State.DisconnectError, exception.Message);
+				}
+
+				await InvokeCurrentStateAsync(State.QueryLocationSucceeded, "");
+
+				throw new Exception();
+			}
+
+			// Query geolocation.
+			var ctsLocation = new CancellationTokenSource();
+			try
+			{
+				closingLockLocation = await geolocation.GetAsync(ctsLocation.Token, DateTime.Now);
+			}
+			catch (Exception ex)
+			{
+				// No location information available.
+				Log.ForContext<T>().Information("Returning closed bike {Bike} is not possible. Geolocation query failed. {Exception}", bike, ex);
+
+				await InvokeCurrentStateAsync(State.QueryLocationFailed, ex.Message);
+				throw;
+			}
+
+			await InvokeCurrentStateAsync(State.QueryLocationSucceeded, string.Empty);
+
+			// Update last lock state time
+
+			// save geolocation data for sending to backend
+			var currentLocationDto = closingLockLocation != null
+			? new LocationDto.Builder
+			{
+				Latitude = closingLockLocation.Latitude,
+				Longitude = closingLockLocation.Longitude,
+				Accuracy = closingLockLocation.Accuracy ?? double.NaN,
+				Age = (dateTimeProvider != null ? dateTimeProvider() : DateTime.Now).Subtract(closingLockLocation.Timestamp.DateTime),
+			}.Build()
+			: null;
+
+			return currentLocationDto;
+		}
+	}
+}
+
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfoMutable.cs
index 9495016..611296d 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/IBikeInfoMutable.cs
@@ -1,7 +1,27 @@
+using System.Threading.Tasks;
+using TINK.Repository.Request;
+using TINK.ViewModel.Bikes.Bike.BluetoothLock;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.CloseCommand;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand;
+
 namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 {
 	public interface IBikeInfoMutable : BC.IBikeInfoMutable
 	{
 		ILockInfoMutable LockInfo { get; }
+
+		/// <summary>
+		/// Closes the lock.
+		/// </summary>
+		/// <param name="listener">View model to process closing notifications.</param>
+		/// <param name="stopPollingTask">Task which stops polling to be awaited before updating bike object and copri communication.</param>
+		Task CloseLockAsync(ICloseCommandListener listener, Task stopPollingTask);
+
+		/// <summary>
+		/// Gets the location of the locked bike.
+		/// </summary>
+		/// <param name="listener">View model to process notifications.</param>
+		/// <returns></returns>
+		Task<LocationDto> GetLockedBikeLocationAsync(IGetLockedLocationCommandListener listener);
 	}
 }
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/LockInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/LockInfoMutable.cs
index c348e52..f09ef7f 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/LockInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/LockInfoMutable.cs
@@ -64,7 +64,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 			}
 		}
 
-		/// <summary> Gets the timestamp of the last locking state change.</summary>
+		/// <summary> Gets the time stamp of the last locking state change.</summary>
 		public DateTime? LastLockingStateChange { get; private set; }
 
 		/// <summary>
diff --git a/TINKLib/Model/BookingFinishedModel.cs b/TINKLib/Model/BookingFinishedModel.cs
index ce0570c..f61145b 100644
--- a/TINKLib/Model/BookingFinishedModel.cs
+++ b/TINKLib/Model/BookingFinishedModel.cs
@@ -13,5 +13,8 @@ namespace TINK.Model
 		/// <summary> Holds info about co2 saving accomplished by using cargo bike. </summary>
 		public string Co2Saving { get; set; }
 
+		/// <summary> Holds info about accruing rental costs. </summary>
+		public string RentalCosts { get; set; }
+
 	}
 }
diff --git a/TINKLib/Model/Connector/Command/CommandLoggedIn.cs b/TINKLib/Model/Connector/Command/CommandLoggedIn.cs
index e560a0e..5ae97ef 100644
--- a/TINKLib/Model/Connector/Command/CommandLoggedIn.cs
+++ b/TINKLib/Model/Connector/Command/CommandLoggedIn.cs
@@ -203,17 +203,7 @@ namespace TINK.Model.Connector
 				throw new ArgumentNullException($"Can not update locking state of bike. Unexpected booking state {bike.State} detected.");
 			}
 
-			lock_state? state = null;
-			switch (bike.LockInfo.State)
-			{
-				case LockingState.Open:
-					state = lock_state.unlocked;
-					break;
-
-				case LockingState.Closed:
-					state = lock_state.locked;
-					break;
-			}
+			lock_state? state = RequestBuilderHelper.GetLockState(bike.LockInfo.State);
 
 			if (!state.HasValue)
 			{
diff --git a/TINKLib/Model/Connector/TextToTypeHelper.cs b/TINKLib/Model/Connector/TextToTypeHelper.cs
index c371816..769e437 100644
--- a/TINKLib/Model/Connector/TextToTypeHelper.cs
+++ b/TINKLib/Model/Connector/TextToTypeHelper.cs
@@ -392,6 +392,7 @@ namespace TINK.Model.Connector
 		public static bool GetIsFeedbackPending(this BikeInfoAvailable bike)
 			=> bike.co2saving != null;
 
+
 		/// <summary>
 		/// Gets the count of bikes available at station.
 		/// </summary>
diff --git a/TINKLib/Model/Connector/Updater/BookingFinishedModelFactory.cs b/TINKLib/Model/Connector/Updater/BookingFinishedModelFactory.cs
index 4a57cc4..0aac519 100644
--- a/TINKLib/Model/Connector/Updater/BookingFinishedModelFactory.cs
+++ b/TINKLib/Model/Connector/Updater/BookingFinishedModelFactory.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using TINK.Model.MiniSurvey;
 using TINK.Repository.Response;
@@ -13,7 +13,8 @@ namespace TINK.Model.Connector.Updater
 		{
 			var bookingFinished = new BookingFinishedModel
 			{
-				Co2Saving = response?.co2saving
+				Co2Saving = response?.co2saving,
+				RentalCosts = "0 €",
 			};
 
 			if (response?.user_miniquery == null)
diff --git a/TINKLib/Model/IBookingFinishedModel.cs b/TINKLib/Model/IBookingFinishedModel.cs
index d46e38a..1fdff67 100644
--- a/TINKLib/Model/IBookingFinishedModel.cs
+++ b/TINKLib/Model/IBookingFinishedModel.cs
@@ -1,4 +1,4 @@
-using TINK.Model.MiniSurvey;
+using TINK.Model.MiniSurvey;
 
 namespace TINK.Model
 {
@@ -9,5 +9,8 @@ namespace TINK.Model
 
 		/// <summary> Holds info about co2 saving accomplished by using cargo bike. </summary>
 		string Co2Saving { get; set; }
+
+		/// <summary> Holds info about accruing rental costs. </summary>
+		string RentalCosts { get; set; }
 	}
 }
diff --git a/TINKLib/Model/Message/IMessage.cs b/TINKLib/Model/Message/IMessage.cs
new file mode 100644
index 0000000..2924260
--- /dev/null
+++ b/TINKLib/Model/Message/IMessage.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TINK.Model.Message
+{
+	public interface IMessage
+	{
+		void LongAlert(string message);
+		void ShortAlert(string message);
+	}
+}
diff --git a/TINKLib/Model/Message/Message.cs b/TINKLib/Model/Message/Message.cs
new file mode 100644
index 0000000..745f93d
--- /dev/null
+++ b/TINKLib/Model/Message/Message.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Android.App;
+using Android.Widget;
+using Foundation;
+using TINK.Model.Message;
+using UIKit;
+
+[assembly: Xamarin.Forms.Dependency(typeof(MessageAndroid))]
+[assembly: Xamarin.Forms.Dependency(typeof(MessageIOS))]
+namespace TINK.Model.Message
+{
+	public class MessageAndroid : IMessage
+	{
+		public void LongAlert(string message)
+		{
+			Toast.MakeText(Application.Context, message, ToastLength.Long).Show();
+		}
+
+		public void ShortAlert(string message)
+		{
+			Toast.MakeText(Application.Context, message, ToastLength.Short).Show();
+		}
+	}
+
+	public class MessageIOS : IMessage
+	{
+        const double LONG_DELAY = 3.5;
+		const double SHORT_DELAY = 0.75;
+
+		public void LongAlert(string message)
+		{
+			ShowAlert(message, LONG_DELAY);
+		}
+
+		public void ShortAlert(string message)
+		{
+			ShowAlert(message, SHORT_DELAY);
+		}
+
+		void ShowAlert(string message, double seconds)
+		{
+			var alert = UIAlertController.Create(null, message, UIAlertControllerStyle.Alert);
+
+			var alertDelay = NSTimer.CreateScheduledTimer(seconds, obj =>
+			{
+				DismissMessage(alert, obj);
+			});
+
+			UIApplication.SharedApplication.KeyWindow.RootViewController.PresentViewController(alert, true, null);
+		}
+
+		void DismissMessage(UIAlertController alert, NSTimer alertDelay)
+		{
+			if (alert != null)
+			{
+				alert.DismissViewController(true, null);
+			}
+
+			if (alertDelay != null)
+			{
+				alertDelay.Dispose();
+			}
+		}
+	}
+}
diff --git a/TINKLib/Model/Settings/JsonSettingsDictionary.cs b/TINKLib/Model/Settings/JsonSettingsDictionary.cs
index db6b1ea..a23c102 100644
--- a/TINKLib/Model/Settings/JsonSettingsDictionary.cs
+++ b/TINKLib/Model/Settings/JsonSettingsDictionary.cs
@@ -19,7 +19,7 @@ namespace TINK.Model.Settings
 		public const string SETTINGSFILETITLE = "Setting.Json";
 
 		/// <summary> Key of the app version entry. </summary>
-		public const string APPVERIONKEY = "AppVersion";
+		public const string APPVERSIONKEY = "AppVersion";
 
 		/// <summary> Key of the app version entry. </summary>
 		public const string SHOWWHATSNEWKEY = "ShowWhatsNew";
@@ -171,7 +171,7 @@ namespace TINK.Model.Settings
 
 			return targetDictionary.Union(new Dictionary<string, string>
 			{
-				{APPVERIONKEY , JsonConvert.SerializeObject(appVersion, new VersionConverter()) },
+				{APPVERSIONKEY , JsonConvert.SerializeObject(appVersion, new VersionConverter()) },
 			}).ToDictionary(key => key.Key, value => value.Value);
 		}
 
@@ -181,7 +181,7 @@ namespace TINK.Model.Settings
 		public static Version GetAppVersion(this IDictionary<string, string> settingsJSON)
 		{
 			// Get the version of the app which wrote the settings file.
-			if (!settingsJSON.TryGetValue(APPVERIONKEY, out string appVersion)
+			if (!settingsJSON.TryGetValue(APPVERSIONKEY, out string appVersion)
 				|| string.IsNullOrEmpty(appVersion))
 			{
 				// File holds no entry.
diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs
index 3bc5421..54f3a66 100644
--- a/TINKLib/Model/WhatsNew.cs
+++ b/TINKLib/Model/WhatsNew.cs
@@ -298,277 +298,277 @@ namespace TINK.Model
 				},
 				{
 					new Version(3, 0, 203),
-					AppResources.ChangeLog3_0_203
+					AppResources.ChangeLog_3_0_203
 				},
 				{
 					new Version(3, 0, 204),
-					AppResources.ChangeLog3_0_204
+					AppResources.ChangeLog_3_0_204
 				},
 				{
 					new Version(3, 0, 205),
-					AppResources.ChangeLog3_0_205
+					AppResources.ChangeLog_3_0_205
 				},
 				{
 					new Version(3, 0, 206),
-					AppResources.ChangeLog3_0_206
+					AppResources.ChangeLog_3_0_206
 				},
 				{
 					new Version(3, 0, 207),
-					AppResources.ChangeLog3_0_207
+					AppResources.ChangeLog_3_0_207
 				},
 				{
 					new Version(3, 0, 208),
-					AppResources.ChangeLog3_0_208 // Minor fixes.
+					AppResources.ChangeLog_3_0_208 // Minor fixes.
                 },
 				{
 					new Version(3, 0, 209),
-					AppResources.ChangeLog3_0_209
+					AppResources.ChangeLog_3_0_209
 				},
 				{
 					new Version(3, 0, 214),
-					AppResources.ChangeLog3_0_214
+					AppResources.ChangeLog_3_0_214
 				},
 				{
 					new Version(3, 0, 215),
-					AppResources.ChangeLog3_0_215
+					AppResources.ChangeLog_3_0_215
 				},
 				{
 					new Version(3, 0, 216),
-					AppResources.ChangeLog3_0_216
+					AppResources.ChangeLog_3_0_216
 				},
 				{
 					new Version(3, 0, 217),
-					AppResources.ChangeLog3_0_217
+					AppResources.ChangeLog_3_0_217
 				},
 				{
 					new Version(3, 0, 218),
-					AppResources.ChangeLog3_0_208
+					AppResources.ChangeLog_3_0_208
 				},
 				{
 					new Version(3, 0, 219),
-					AppResources.ChangeLog3_0_219
+					AppResources.ChangeLog_3_0_219
 				},
 				{
 					new Version(3, 0, 220),
-					AppResources.ChangeLog3_0_220
+					AppResources.ChangeLog_3_0_220
 				},
 				{
 					new Version(3, 0, 222),
-					AppResources.ChangeLog3_0_222
+					AppResources.ChangeLog_3_0_222
 				},
 				{
 					new Version(3, 0, 223),
-					AppResources.ChangeLog3_0_208
+					AppResources.ChangeLog_3_0_208
 				},
 				{
 					new Version(3, 0, 224),
-					AppResources.ChangeLog3_0_224
+					AppResources.ChangeLog_3_0_224
 				},
 				{
 					new Version(3, 0, 225),
-					AppResources.ChangeLog3_0_208
+					AppResources.ChangeLog_3_0_208
 				},
 				{
 					new Version(3, 0, 226),
-					AppResources.ChangeLog3_0_226
+					AppResources.ChangeLog_3_0_226
 				},
 				{
 					new Version(3, 0, 227),
-					AppResources.ChangeLog3_0_227
+					AppResources.ChangeLog_3_0_227
 				},
 				{
 					new Version(3, 0, 228),
-					AppResources.ChangeLog3_0_208
+					AppResources.ChangeLog_3_0_208
 				},
 				{
 					new Version(3, 0, 231),
-					AppResources.ChangeLog3_0_231
+					AppResources.ChangeLog_3_0_231
 				},
 				{
 					new Version(3, 0, 232),
-					AppResources.ChangeLog3_0_232
+					AppResources.ChangeLog_3_0_232
 				},
 				{
 					new Version(3, 0, 234),
-					AppResources.ChangeLog3_0_234
+					AppResources.ChangeLog_3_0_234
 				},
 				{
 					new Version(3, 0, 235),
-					AppResources.ChangeLog3_0_235
+					AppResources.ChangeLog_3_0_235
 				},
 				{
 					new Version(3, 0, 236),
-					AppResources.ChangeLog3_0_236
+					AppResources.ChangeLog_3_0_236
 				},
 				{
 					new Version(3, 0, 237),
-					AppResources.ChangeLog3_0_237
+					AppResources.ChangeLog_3_0_237
 				},
 				{
 					new Version(3, 0, 238),
-					AppResources.ChangeLog3_0_231
+					AppResources.ChangeLog_3_0_231
 				},
 				{
 					new Version(3, 0, 239),
-					AppResources.ChangeLog3_0_239
+					AppResources.ChangeLog_3_0_239
 				},
 				{
 					new Version(3, 0, 240),
-					AppResources.ChangeLog3_0_240
+					AppResources.ChangeLog_3_0_240
 				},
 				{
 					new Version(3, 0, 241),
-					AppResources.ChangeLog3_0_241
+					AppResources.ChangeLog_3_0_241
 				},
 				{
 					new Version(3, 0, 242),
-					AppResources.ChangeLog3_0_242
+					AppResources.ChangeLog_3_0_242
 				},
 				{
 					new Version(3, 0, 243),
-					AppResources.ChangeLog3_0_243
+					AppResources.ChangeLog_3_0_243
 				},
 				{
 					new Version(3, 0, 244),
-					AppResources.ChangeLog3_0_231 // Minor improvements.
+					AppResources.ChangeLog_3_0_231 // Minor improvements.
                 },
 				{
 					new Version(3, 0, 245),
-					AppResources.ChangeLog3_0_231 // Minor improvements.
+					AppResources.ChangeLog_3_0_231 // Minor improvements.
                 },
 				{
 					new Version(3, 0, 246),
-					AppResources.ChangeLog3_0_231 // Minor improvements.
+					AppResources.ChangeLog_3_0_231 // Minor improvements.
                 },
 				{
 					new Version(3, 0, 247),
-					AppResources.ChangeLog3_0_231 // Minor improvements.
+					AppResources.ChangeLog_3_0_231 // Minor improvements.
                 },
 				{
 					new Version(3, 0, 248),
-					AppResources.ChangeLog3_0_231 // Minor improvements.
+					AppResources.ChangeLog_3_0_231 // Minor improvements.
                 },
 				{
 					new Version(3, 0, 249),
-					AppResources.ChangeLog3_0_249 // Third-party components updated.
+					AppResources.ChangeLog_3_0_249 // Third-party components updated.
                 },
 				{
 					new Version(3, 0, 250),
-					AppResources.ChangeLog3_0_250 // Third-party components updated.
+					AppResources.ChangeLog_3_0_250 // Third-party components updated.
                 },
 				{
 					new Version(3, 0, 260),
                     // Same info as for version 3.0.251 and 3.0.252
-                    AppResources.ChangeLog3_0_231 // Minor improvements.
+                    AppResources.ChangeLog_3_0_231 // Minor improvements.
                 },
 				{
 					new Version(3, 0, 263),
-					AppResources.ChangeLog3_0_263
+					AppResources.ChangeLog_3_0_263
 				},
 				{
 					new Version(3, 0, 264),
-					AppResources.ChangeLog3_0_264
+					AppResources.ChangeLog_3_0_264
 				},
 				{
 					new Version(3, 0, 265),
-					AppResources.ChangeLog3_0_265
+					AppResources.ChangeLog_3_0_265
 				},
 				{
 					new Version(3, 0, 266),
-					AppResources.ChangeLog3_0_266
+					AppResources.ChangeLog_3_0_266
 				},
 				{
 					new Version(3, 0, 276),
-					AppResources.ChangeLog3_0_276
+					AppResources.ChangeLog_3_0_276
 				},
 				{
 					new Version(3, 0, 277),
-					AppResources.ChangeLog3_0_277
+					AppResources.ChangeLog_3_0_277
 				},
 				{
 					new Version(3, 0, 279),
-					AppResources.ChangeLog3_0_278 // Addition spelling corrected and missing translation added.
+					AppResources.ChangeLog_3_0_278 // Addition spelling corrected and missing translation added.
                 },
 				{
 					new Version(3, 0, 280),
-					AppResources.ChangeLog3_0_280
+					AppResources.ChangeLog_3_0_280
 				},
 				{
 					new Version(3, 0, 281),
-					AppResources.ChangeLog3_0_280
+					AppResources.ChangeLog_3_0_280
 				},
 				{
 					new Version(3, 0, 283),
-					AppResources.ChangeLog3_0_282
+					AppResources.ChangeLog_3_0_282
 				},
 				{
 					new Version(3, 0, 284),
-					AppResources.ChangeLog3_0_284
+					AppResources.ChangeLog_3_0_284
 				},
 				{
 					new Version(3, 0, 285),
-					AppResources.ChangeLog3_0_285
+					AppResources.ChangeLog_3_0_285
 				},
 				{
 					new Version(3, 0, 289),
-					AppResources.ChangeLog3_0_289
+					AppResources.ChangeLog_3_0_289
 				},
 				{
 					new Version(3, 0, 290),
-					AppResources.ChangeLog3_0_290
+					AppResources.ChangeLog_3_0_290
 				},
 				{
 					new Version(3, 0, 297),
-					AppResources.ChangeLog3_0_293
+					AppResources.ChangeLog_3_0_293
 				},
 				{
 					new Version(3, 0, 298),
-					AppResources.ChangeLog3_0_298
+					AppResources.ChangeLog_3_0_298
 				},
 				{
 					new Version(3, 0, 299),
-					AppResources.ChangeLog3_0_299
+					AppResources.ChangeLog_3_0_299
 				},
 				{
 					new Version(3, 0, 300),
-					AppResources.ChangeLog3_0_231 // Minor improvements.
+					AppResources.ChangeLog_3_0_231 // Minor improvements.
                 },
 				{
 					new Version(3, 0, 311),
-					AppResources.ChangeLog3_0_301
+					AppResources.ChangeLog_3_0_301
 				},
 				{
 					new Version(3, 0, 312),
-					AppResources.ChangeLog3_0_312
+					AppResources.ChangeLog_3_0_312
 				},
 				{
 					new Version(3, 0, 323),
-					AppResources.ChangeLog3_0_318 // Support for new lock added.
+					AppResources.ChangeLog_3_0_318 // Support for new lock added.
                 },
 				{
 					new Version(3, 0, 324),
-					AppResources.ChangeLog3_0_324
+					AppResources.ChangeLog_3_0_324
 				},
 				{
 					new Version(3, 0, 333),
-					AppResources.ChangeLog3_0_326 // Battery level display and input.
+					AppResources.ChangeLog_3_0_326 // Battery level display and input.
                 },
 				{
 					new Version(3, 0, 335),
-					AppResources.ChangeLog3_0_326 // Battery level display and input.
+					AppResources.ChangeLog_3_0_326 // Battery level display and input.
                 },
 				{
 					new Version(3, 0, 336),
-					AppResources.ChangeLog3_0_335 // Sharee.bike design improved.
+					AppResources.ChangeLog_3_0_335 // Sharee.bike design improved.
                 },
 				{
 					new Version(3, 0, 337),
-					AppResources.ChangeLog3_0_337_SB, // New Design
+					AppResources.ChangeLog_3_0_337_SB, // New Design
                     new List<AppFlavor> { AppFlavor.ShareeBike }
 				},
 				{
 					new Version(3, 0, 337),
-					AppResources.ChangeLog3_0_337_MK, // Notice for low battery
+					AppResources.ChangeLog_3_0_337_MK, // Notice for low battery
                     new List<AppFlavor> { AppFlavor.MeinKonrad }
 				},
 				{
@@ -578,22 +578,22 @@ namespace TINK.Model
 				},
 				{
 					new Version(3, 0, 338),
-					AppResources.ChangeLog3_0_338_LB_MK,
+					AppResources.ChangeLog_3_0_338_LB_MK,
 					new List<AppFlavor> { AppFlavor.LastenradBayern, AppFlavor.MeinKonrad }
 				},
 				{
 					new Version(3, 0, 338),
-					AppResources.ChangeLog3_0_338_SB,
+					AppResources.ChangeLog_3_0_338_SB,
 					new List<AppFlavor> { AppFlavor.ShareeBike }
 				},
 				{
 					new Version(3, 0, 339),
-					AppResources.ChangeLog3_0_339_SB_LB,
+					AppResources.ChangeLog_3_0_339_SB_LB,
 					new List<AppFlavor> { AppFlavor.LastenradBayern, AppFlavor.ShareeBike }
 				},
 				{
 					new Version(3, 0, 339),
-					AppResources.ChangeLog3_0_339_MK,
+					AppResources.ChangeLog_3_0_339_MK,
 					new List<AppFlavor> { AppFlavor.MeinKonrad }
 				},
 				{
@@ -671,7 +671,7 @@ namespace TINK.Model
 				},
 				{
 					new Version(3, 0, 356),
-					AppResources.ChangeLog3_0_231
+					AppResources.ChangeLog_3_0_231
 				},
 				{
 					new Version(3, 0, 360),
@@ -703,11 +703,15 @@ namespace TINK.Model
 					string.Format("{0} <br /> {1}", AppResources.ChangeLog_PackageUpdates, AppResources.ChangeLog_MinorBugFixes),
 					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
 				},
-								{
+				{
 					new Version(3, 0, 369),
 					AppResources.ChangeLog_3_0_369_MK_SB,
 					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
 				},
+				{
+					new Version(3, 0, 370),
+					AppResources.ChangeLog_3_0_370
+				},
 		};
 
 		/// <summary> Manges the whats new information.</summary>
diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs
index 2816441..12f7890 100644
--- a/TINKLib/MultilingualResources/AppResources.Designer.cs
+++ b/TINKLib/MultilingualResources/AppResources.Designer.cs
@@ -61,16 +61,16 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Rent bike or close lock.
+        ///   Looks up a localized string similar to Rent bike.
         /// </summary>
-        public static string ActionBookOrClose {
+        public static string ActionBook {
             get {
-                return ResourceManager.GetString("ActionBookOrClose", resourceCulture);
+                return ResourceManager.GetString("ActionBook", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Cancel bike reservation.
+        ///   Looks up a localized string similar to Cancel reservation.
         /// </summary>
         public static string ActionCancelRequest {
             get {
@@ -96,6 +96,15 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Close lock or rent bike.
+        /// </summary>
+        public static string ActionCloseOrBook {
+            get {
+                return ResourceManager.GetString("ActionCloseOrBook", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Give feedback.
         /// </summary>
@@ -259,7 +268,7 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &lt;h4&gt;&lt;b&gt;Lock is closing.&lt;br/&gt;Please wait until it is completely closed.&lt;/b&gt;&lt;/h4&gt;.
+        ///   Looks up a localized string similar to Stay with the bike until the lock is closed..
         /// </summary>
         public static string ActivityTextClosingLock {
             get {
@@ -861,36 +870,36 @@ namespace TINK.MultilingualResources {
         /// <summary>
         ///   Looks up a localized string similar to Updated to latest lock firmware..
         /// </summary>
-        public static string ChangeLog3_0_203 {
+        public static string ChangeLog_3_0_203 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_203", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_203", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Bluetooth communication inproved..
         /// </summary>
-        public static string ChangeLog3_0_204 {
+        public static string ChangeLog_3_0_204 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_204", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_204", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Nicer station markers for iOS..
         /// </summary>
-        public static string ChangeLog3_0_205 {
+        public static string ChangeLog_3_0_205 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_205", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_205", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Bluetooth and geolocation functionality improved..
         /// </summary>
-        public static string ChangeLog3_0_206 {
+        public static string ChangeLog_3_0_206 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_206", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_206", resourceCulture);
             }
         }
         
@@ -899,108 +908,108 @@ namespace TINK.MultilingualResources {
         ///Software packages updated.
         ///Targets Android 11..
         /// </summary>
-        public static string ChangeLog3_0_207 {
+        public static string ChangeLog_3_0_207 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_207", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_207", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Minor fixes..
         /// </summary>
-        public static string ChangeLog3_0_208 {
+        public static string ChangeLog_3_0_208 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_208", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_208", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Minor fix: Bikes are disconnected as soon as becoming disposable..
         /// </summary>
-        public static string ChangeLog3_0_209 {
+        public static string ChangeLog_3_0_209 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_209", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_209", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Multiple operators support..
         /// </summary>
-        public static string ChangeLog3_0_214 {
+        public static string ChangeLog_3_0_214 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_214", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_214", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Layout of &quot;Whats New&quot;-dialog improved :-).
         /// </summary>
-        public static string ChangeLog3_0_215 {
+        public static string ChangeLog_3_0_215 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_215", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_215", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to GUI layout improved..
         /// </summary>
-        public static string ChangeLog3_0_216 {
+        public static string ChangeLog_3_0_216 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_216", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_216", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Packages updated..
         /// </summary>
-        public static string ChangeLog3_0_217 {
+        public static string ChangeLog_3_0_217 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_217", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_217", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Icons added to flyout menu..
         /// </summary>
-        public static string ChangeLog3_0_219 {
+        public static string ChangeLog_3_0_219 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_219", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_219", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to GUI layout improved..
         /// </summary>
-        public static string ChangeLog3_0_220 {
+        public static string ChangeLog_3_0_220 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_220", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_220", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to GUI layout improved..
         /// </summary>
-        public static string ChangeLog3_0_221 {
+        public static string ChangeLog_3_0_221 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_221", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_221", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Minor bugfix and improvements..
         /// </summary>
-        public static string ChangeLog3_0_222 {
+        public static string ChangeLog_3_0_222 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_222", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_222", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Updated for latest server version..
         /// </summary>
-        public static string ChangeLog3_0_224 {
+        public static string ChangeLog_3_0_224 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_224", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_224", resourceCulture);
             }
         }
         
@@ -1009,36 +1018,36 @@ namespace TINK.MultilingualResources {
         ///- station markers are updated correctly after login/ logout if required
         ///- routing from &quot;bikes at station&quot; to &quot;login&quot; page and other routings corrected.
         /// </summary>
-        public static string ChangeLog3_0_226 {
+        public static string ChangeLog_3_0_226 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_226", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_226", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Feedback dialog added which is shown after ending rental..
         /// </summary>
-        public static string ChangeLog3_0_227 {
+        public static string ChangeLog_3_0_227 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_227", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_227", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Minor improvements..
         /// </summary>
-        public static string ChangeLog3_0_231 {
+        public static string ChangeLog_3_0_231 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_231", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_231", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Menu modified..
         /// </summary>
-        public static string ChangeLog3_0_232 {
+        public static string ChangeLog_3_0_232 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_232", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_232", resourceCulture);
             }
         }
         
@@ -1046,18 +1055,18 @@ namespace TINK.MultilingualResources {
         ///   Looks up a localized string similar to Tariff info page is displayed correctly again.
         ///Error handling improved..
         /// </summary>
-        public static string ChangeLog3_0_234 {
+        public static string ChangeLog_3_0_234 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_234", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_234", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Obsolete object replaced with up-to-date one..
         /// </summary>
-        public static string ChangeLog3_0_235 {
+        public static string ChangeLog_3_0_235 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_235", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_235", resourceCulture);
             }
         }
         
@@ -1066,54 +1075,54 @@ namespace TINK.MultilingualResources {
         ///Error message when opening lock fails improved.
         ///Layout of bike names and id display improved..
         /// </summary>
-        public static string ChangeLog3_0_236 {
+        public static string ChangeLog_3_0_236 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_236", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_236", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Hard- and software information send to backend when ending rental..
         /// </summary>
-        public static string ChangeLog3_0_237 {
+        public static string ChangeLog_3_0_237 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_237", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_237", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Bugfix: Bike description is displayed correctly again..
         /// </summary>
-        public static string ChangeLog3_0_239 {
+        public static string ChangeLog_3_0_239 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_239", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_239", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Find bike by id functionality added..
         /// </summary>
-        public static string ChangeLog3_0_240 {
+        public static string ChangeLog_3_0_240 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_240", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_240", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Bike sharing system operator specific support info displayed on contact page..
         /// </summary>
-        public static string ChangeLog3_0_241 {
+        public static string ChangeLog_3_0_241 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_241", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_241", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Select station page added to ease getting operator specific contact information..
         /// </summary>
-        public static string ChangeLog3_0_242 {
+        public static string ChangeLog_3_0_242 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_242", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_242", resourceCulture);
             }
         }
         
@@ -1121,27 +1130,27 @@ namespace TINK.MultilingualResources {
         ///   Looks up a localized string similar to Mini survey implemented.
         ///Minor fixes..
         /// </summary>
-        public static string ChangeLog3_0_243 {
+        public static string ChangeLog_3_0_243 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_243", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_243", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Closing lock and returning bike speeded up..
         /// </summary>
-        public static string ChangeLog3_0_244 {
+        public static string ChangeLog_3_0_244 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_244", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_244", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Third-party components updated..
         /// </summary>
-        public static string ChangeLog3_0_249 {
+        public static string ChangeLog_3_0_249 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_249", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_249", resourceCulture);
             }
         }
         
@@ -1150,27 +1159,27 @@ namespace TINK.MultilingualResources {
         ///Center map to current position issue fixed.
         ///Minor improvements..
         /// </summary>
-        public static string ChangeLog3_0_250 {
+        public static string ChangeLog_3_0_250 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_250", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_250", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to CO2 saving is displayed for  bikes with GPS-lock after returning bike..
         /// </summary>
-        public static string ChangeLog3_0_263 {
+        public static string ChangeLog_3_0_263 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_263", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_263", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Bug &quot;object reference not set ....&quot; &lt;a href=&quot;https://dev.azure.com/TeilRad/sharee.bike%20App/_workitems/edit/186&quot;&gt;185&lt;/a&gt; fixed..
         /// </summary>
-        public static string ChangeLog3_0_264 {
+        public static string ChangeLog_3_0_264 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_264", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_264", resourceCulture);
             }
         }
         
@@ -1179,18 +1188,18 @@ namespace TINK.MultilingualResources {
         ///Layouting improved.
         ///App supports deep linking..
         /// </summary>
-        public static string ChangeLog3_0_265 {
+        public static string ChangeLog_3_0_265 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_265", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_265", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Location permissions handling improved..
         /// </summary>
-        public static string ChangeLog3_0_266 {
+        public static string ChangeLog_3_0_266 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_266", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_266", resourceCulture);
             }
         }
         
@@ -1199,27 +1208,27 @@ namespace TINK.MultilingualResources {
         ///Display of status information extended.
         ///Bugfix: Sending support mails works again. .
         /// </summary>
-        public static string ChangeLog3_0_276 {
+        public static string ChangeLog_3_0_276 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_276", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_276", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Bugfix: No more closing of app on Select Bike page..
         /// </summary>
-        public static string ChangeLog3_0_277 {
+        public static string ChangeLog_3_0_277 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_277", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_277", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Hints added to ease closing of lock in case closing does not succeed on first try..
         /// </summary>
-        public static string ChangeLog3_0_278 {
+        public static string ChangeLog_3_0_278 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_278", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_278", resourceCulture);
             }
         }
         
@@ -1229,9 +1238,9 @@ namespace TINK.MultilingualResources {
         ///- location permission is not granted or 
         ///- location is off..
         /// </summary>
-        public static string ChangeLog3_0_280 {
+        public static string ChangeLog_3_0_280 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_280", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_280", resourceCulture);
             }
         }
         
@@ -1239,18 +1248,18 @@ namespace TINK.MultilingualResources {
         ///   Looks up a localized string similar to Permission requests messages on iOS formulated in more detail.
         ///Hints to ease connecting to lock in case connecting does not succeed on first try improved..
         /// </summary>
-        public static string ChangeLog3_0_282 {
+        public static string ChangeLog_3_0_282 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_282", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_282", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to User friendly message is shown if authentication expired..
         /// </summary>
-        public static string ChangeLog3_0_284 {
+        public static string ChangeLog_3_0_284 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_284", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_284", resourceCulture);
             }
         }
         
@@ -1258,27 +1267,27 @@ namespace TINK.MultilingualResources {
         ///   Looks up a localized string similar to Framework updated. 
         ///Activity indicator added account management pages and logging extended..
         /// </summary>
-        public static string ChangeLog3_0_285 {
+        public static string ChangeLog_3_0_285 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_285", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_285", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Flyout menu header improved..
         /// </summary>
-        public static string ChangeLog3_0_289 {
+        public static string ChangeLog_3_0_289 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_289", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_289", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Geolocation is queried with higher accuracy..
         /// </summary>
-        public static string ChangeLog3_0_290 {
+        public static string ChangeLog_3_0_290 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_290", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_290", resourceCulture);
             }
         }
         
@@ -1288,36 +1297,36 @@ namespace TINK.MultilingualResources {
         ///Started adding support for new lock type.
         ///Minor bugfixes..
         /// </summary>
-        public static string ChangeLog3_0_293 {
+        public static string ChangeLog_3_0_293 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_293", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_293", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to New Wort-Bild-Marke integrated in flyout menu for Lastenrad Bayern App..
         /// </summary>
-        public static string ChangeLog3_0_298 {
+        public static string ChangeLog_3_0_298 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_298", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_298", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Bugfix: Bluetooth lock control works again on Android 12..
         /// </summary>
-        public static string ChangeLog3_0_299 {
+        public static string ChangeLog_3_0_299 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_299", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_299", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Extended tariffs supported..
         /// </summary>
-        public static string ChangeLog3_0_301 {
+        public static string ChangeLog_3_0_301 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_301", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_301", resourceCulture);
             }
         }
         
@@ -1328,72 +1337,72 @@ namespace TINK.MultilingualResources {
         ///- layout of Wort-Bild-Marke amended
         ///.
         /// </summary>
-        public static string ChangeLog3_0_312 {
+        public static string ChangeLog_3_0_312 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_312", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_312", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Support for new lock type added..
         /// </summary>
-        public static string ChangeLog3_0_318 {
+        public static string ChangeLog_3_0_318 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_318", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_318", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Mein konrad design improved..
         /// </summary>
-        public static string ChangeLog3_0_324 {
+        public static string ChangeLog_3_0_324 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_324", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_324", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to For Mein konrad users: Battery charging level is displayed for ebikes and is queried after return of bike..
         /// </summary>
-        public static string ChangeLog3_0_326 {
+        public static string ChangeLog_3_0_326 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_326", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_326", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Lastenrad Bayern users: battery charging level is displayed for ebikes..
         /// </summary>
-        public static string ChangeLog3_0_334 {
+        public static string ChangeLog_3_0_334 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_334", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_334", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Sharee.bike design improved..
         /// </summary>
-        public static string ChangeLog3_0_335 {
+        public static string ChangeLog_3_0_335 {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_335", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_335", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to You will now be informed if the charge of the bike battery was last indicated as very low. To ensure the reliability of the battery level indicator in the app, please enter the current charge level in the app at the end of your ride with an e-bike..
         /// </summary>
-        public static string ChangeLog3_0_337_MK {
+        public static string ChangeLog_3_0_337_MK {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_337_MK", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_337_MK", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to The app has a new design! --- You are a beta tester? Give us helpful feedback anytime via ‘Contact - Feedback about the App’. Not a beta tester yet? Become one and get great new features before anyone else!.
         /// </summary>
-        public static string ChangeLog3_0_337_SB {
+        public static string ChangeLog_3_0_337_SB {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_337_SB", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_337_SB", resourceCulture);
             }
         }
         
@@ -1403,9 +1412,9 @@ namespace TINK.MultilingualResources {
         ///- For communication with the app developers, select &quot;Feedback about the App&quot;.
         ///To better analyze and improve processes in the app, please accept attaching your log file to your message. We appreciate both critical and positive feedback!.
         /// </summary>
-        public static string ChangeLog3_0_338_LB_MK {
+        public static string ChangeLog_3_0_338_LB_MK {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_338_LB_MK", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_338_LB_MK", resourceCulture);
             }
         }
         
@@ -1417,9 +1426,9 @@ namespace TINK.MultilingualResources {
         ///
         ///In addition: Small graphics let you see at a glance what type of bike it is..
         /// </summary>
-        public static string ChangeLog3_0_338_SB {
+        public static string ChangeLog_3_0_338_SB {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_338_SB", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_338_SB", resourceCulture);
             }
         }
         
@@ -1428,29 +1437,50 @@ namespace TINK.MultilingualResources {
         ///
         ///You can now see at a glance which app version you have installed: in the menu at the very bottom. Please update the app regularly to be up to date in functionality and design!.
         /// </summary>
-        public static string ChangeLog3_0_339_MK {
+        public static string ChangeLog_3_0_339_MK {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_339_MK", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_339_MK", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to You can now see at a glance which app version you have installed: in the menu at the very bottom. Please update the app regularly to be up to date in functionality and design!.
         /// </summary>
-        public static string ChangeLog3_0_339_SB_LB {
+        public static string ChangeLog_3_0_339_SB_LB {
             get {
-                return ResourceManager.GetString("ChangeLog3_0_339_SB_LB", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_339_SB_LB", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to We could not assign the bike to any station. For this we need your location information while you are standing right next to the bike. Only then your rental can be terminated!
-        ///
-        ///Approach the bike, turn on Bluetooth and Location services and try again..
+        ///   Looks up a localized string similar to Changes in the return process: FIRST you must always complete the &quot;Close lock&quot; process. Only THEN you can finish the rental! If your rental was successfully ended, you will see a confirmation dialog..
         /// </summary>
-        public static string Error_ReturnBike_Station_Location_Message {
+        public static string ChangeLog_3_0_367_MK_SB {
             get {
-                return ResourceManager.GetString("Error_ReturnBike_Station_Location_Message", resourceCulture);
+                return ResourceManager.GetString("ChangeLog_3_0_367_MK_SB", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Attention! We have changed the process of how the rental is terminated:&lt;br/&gt;
+        ///1. &lt;b&gt;Close lock&lt;/b&gt; first and follow the process to the end.&lt;br/&gt;
+        ///2. Decide whether to&lt;br/&gt;
+        ///  - Park bike (to ride on later, the chargeable rental continues!) or&lt;br/&gt;
+        ///  - End rental (provided you are at a suitable station).&lt;br/&gt;
+        ///3. After choosing &lt;b&gt;End rental&lt;/b&gt;: Follow the process, fill in the feedback and &lt;b&gt;wait for the end of rental confirmation!&lt;/b&gt;.
+        /// </summary>
+        public static string ChangeLog_3_0_370 {
+            get {
+                return ResourceManager.GetString("ChangeLog_3_0_370", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Your session has expired. Please login new and try again..
+        /// </summary>
+        public static string ErrorAccountInvalidAuthorization {
+            get {
+                return ResourceManager.GetString("ErrorAccountInvalidAuthorization", resourceCulture);
             }
         }
         
@@ -1464,86 +1494,35 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again..
+        ///   Looks up a localized string similar to Reservation could not be canceled!.
         /// </summary>
-        public static string ErrorBookedSearchMessage {
+        public static string ErrorCancelReservationTitle {
             get {
-                return ResourceManager.GetString("ErrorBookedSearchMessage", resourceCulture);
+                return ResourceManager.GetString("ErrorCancelReservationTitle", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process..
+        ///   Looks up a localized string similar to Step close to the lock and try again or report bike to operator!
+        ///{0}.
         /// </summary>
-        public static string ErrorBookedSearchMessageEscalationLevel1 {
+        public static string ErrorCloseLock {
             get {
-                return ResourceManager.GetString("ErrorBookedSearchMessageEscalationLevel1", resourceCulture);
+                return ResourceManager.GetString("ErrorCloseLock", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to It is still not possible to establish a connection between your mobile device and the bike lock. Please contact operator!
-        ///
-        ///Alternative:
-        ///1. close app,
-        ///2. press the button at the top of the lock briefly and release it as soon as it starts flashing,
-        ///3. make sure that the lock is completely closed and remains closed.
-        ///4. send e-mail to operator (otherwise your chargeable rental will continue!): Please include problem description, bike-id and drop-off station..
+        ///   Looks up a localized string similar to Lock bolt is blocked. Make sure that no spoke or any other obstacle prevents the lock from closing and try again..
         /// </summary>
-        public static string ErrorBookedSearchMessageEscalationLevel2 {
+        public static string ErrorCloseLockBoltBlocked {
             get {
-                return ResourceManager.GetString("ErrorBookedSearchMessageEscalationLevel2", resourceCulture);
+                return ResourceManager.GetString("ErrorCloseLockBoltBlocked", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lock is blocked. Please ensure that no spoke or any other obstacle prevents the lock from closing and try again..
-        /// </summary>
-        public static string ErrorCloseLockBoldBlockedMessage {
-            get {
-                return ResourceManager.GetString("ErrorCloseLockBoldBlockedMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lock can only be closed if bike is not moving. Please park bike and try again..
-        /// </summary>
-        public static string ErrorCloseLockMovingMessage {
-            get {
-                return ResourceManager.GetString("ErrorCloseLockMovingMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lock cannot be closed until bike is near..
-        /// </summary>
-        public static string ErrorCloseLockOutOfReachMessage {
-            get {
-                return ResourceManager.GetString("ErrorCloseLockOutOfReachMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lock cannot be closed until bike is near.
-        ///Please try again to close bike or report bike to operator!.
-        /// </summary>
-        public static string ErrorCloseLockOutOfReachStateReservedMessage {
-            get {
-                return ResourceManager.GetString("ErrorCloseLockOutOfReachStateReservedMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to After try to close lock state open is reported..
-        /// </summary>
-        public static string ErrorCloseLockStillOpenMessage {
-            get {
-                return ResourceManager.GetString("ErrorCloseLockStillOpenMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lock can not be closed!.
+        ///   Looks up a localized string similar to Lock could not be closed!.
         /// </summary>
         public static string ErrorCloseLockTitle {
             get {
@@ -1552,216 +1531,73 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Lock reports state &quot;{0}&quot;..
+        ///   Looks up a localized string similar to Please step as close as possible to the bike lock and try again..
         /// </summary>
-        public static string ErrorCloseLockUnexpectedStateMessage {
+        public static string ErrorConnectLock {
             get {
-                return ResourceManager.GetString("ErrorCloseLockUnexpectedStateMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please try to lock again or report bike to operator!
-        ///{0}.
-        /// </summary>
-        public static string ErrorCloseLockUnkErrorMessage {
-            get {
-                return ResourceManager.GetString("ErrorCloseLockUnkErrorMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Communication error during lock search..
-        /// </summary>
-        public static string ErrorConnectLockGeneralErrorMessage {
-            get {
-                return ResourceManager.GetString("ErrorConnectLockGeneralErrorMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internet must be reachable to connect to lock of rented bike. Please establish an Internet connection!.
-        /// </summary>
-        public static string ErrorConnectLockRentedBikeNoWebMessage {
-            get {
-                return ResourceManager.GetString("ErrorConnectLockRentedBikeNoWebMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Internet must be reachable to connect to lock of reserved bike. Please establish an Internet connection!.
-        /// </summary>
-        public static string ErrorConnectLockReservedBikeNoWebMessage {
-            get {
-                return ResourceManager.GetString("ErrorConnectLockReservedBikeNoWebMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please turn Bluetooth on, otherwise lock cannot be connected..
-        /// </summary>
-        public static string ErrorFindLockBluetoothNotOn {
-            get {
-                return ResourceManager.GetString("ErrorFindLockBluetoothNotOn", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please turn location services on, otherwise lock cannot be connected..
-        /// </summary>
-        public static string ErrorFindLockLocationOff {
-            get {
-                return ResourceManager.GetString("ErrorFindLockLocationOff", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please grant location permissions, otherwise lock cannot be connected..
-        /// </summary>
-        public static string ErrorFindLockLocationPermissionMissing {
-            get {
-                return ResourceManager.GetString("ErrorFindLockLocationPermissionMissing", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lock can only be found when rented bike is nearby..
-        /// </summary>
-        public static string ErrorFindLockRentedBikeOutOfReachMessage {
-            get {
-                return ResourceManager.GetString("ErrorFindLockRentedBikeOutOfReachMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lock status of the reserved bike could not be determined..
-        /// </summary>
-        public static string ErrorFindLockReservedBikeNoStausMessage {
-            get {
-                return ResourceManager.GetString("ErrorFindLockReservedBikeNoStausMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lock can only be found when reserved bike is nearby..
-        /// </summary>
-        public static string ErrorFindLockReservedBikeOutOfReachMessage {
-            get {
-                return ResourceManager.GetString("ErrorFindLockReservedBikeOutOfReachMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Can not login user {0}. Mail address unknown or password invalid..
-        /// </summary>
-        public static string ErrorMessageInvalidAuthorizationResponseException {
-            get {
-                return ResourceManager.GetString("ErrorMessageInvalidAuthorizationResponseException", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Not connected to network..
-        /// </summary>
-        public static string ErrorNotConnectedToNetwork {
-            get {
-                return ResourceManager.GetString("ErrorNotConnectedToNetwork", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ensure that no obstacle prevents lock from opening and try again..
-        /// </summary>
-        public static string ErrorOpenLockBoldIsBlockedMessage {
-            get {
-                return ResourceManager.GetString("ErrorOpenLockBoldIsBlockedMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The lock could not be opened correctly. Try again!
-        ///
-        ///Attention! Your rental has already started.
-        ///If the lock still won&apos;t open, make sure the lock is closed and end rental.
-        ///Important: Send an email to the operator (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station..
-        /// </summary>
-        public static string ErrorOpenLockBoldStatusIsUnknownMessage {
-            get {
-                return ResourceManager.GetString("ErrorOpenLockBoldStatusIsUnknownMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lock cannot be opened until bike is near..
-        /// </summary>
-        public static string ErrorOpenLockOutOfReachMessage {
-            get {
-                return ResourceManager.GetString("ErrorOpenLockOutOfReachMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to After try to open lock state closed is reported..
-        /// </summary>
-        public static string ErrorOpenLockStillClosedMessage {
-            get {
-                return ResourceManager.GetString("ErrorOpenLockStillClosedMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lock can not be opened!.
-        /// </summary>
-        public static string ErrorOpenLockStillClosedTitle {
-            get {
-                return ResourceManager.GetString("ErrorOpenLockStillClosedTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error while opening lock!.
-        /// </summary>
-        public static string ErrorOpenLockTitle {
-            get {
-                return ResourceManager.GetString("ErrorOpenLockTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Location query failed.
-        /// </summary>
-        public static string ErrorQueryGeolocation {
-            get {
-                return ResourceManager.GetString("ErrorQueryGeolocation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again..
-        /// </summary>
-        public static string ErrorReservedSearchMessage {
-            get {
-                return ResourceManager.GetString("ErrorReservedSearchMessage", resourceCulture);
+                return ResourceManager.GetString("ErrorConnectLock", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process..
         /// </summary>
-        public static string ErrorReservedSearchMessageEscalationLevel1 {
+        public static string ErrorConnectLockEscalationLevel1 {
             get {
-                return ResourceManager.GetString("ErrorReservedSearchMessageEscalationLevel1", resourceCulture);
+                return ResourceManager.GetString("ErrorConnectLockEscalationLevel1", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to End rental at an unknown location is not possible.
-        ///Make sure you have granted location sharing permission and your location services are enabled.
-        ///Try again!.
+        ///   Looks up a localized string similar to It is still not possible to establish a connection between your mobile device and the bike lock. Please contact customer support!
+        ///
+        ///Alternative:
+        ///1. close app,
+        ///2. press the button at the top of the lock briefly and release it as soon as it starts flashing,
+        ///3. make sure that the lock is completely closed and remains closed.
+        ///4. send e-mail to operator (otherwise your chargeable rental will continue!): Please include problem description, bike-id and drop-off station..
         /// </summary>
-        public static string ErrorReturnBikeLockClosedGetGPSExceptionMessage {
+        public static string ErrorConnectLockEscalationLevel2 {
             get {
-                return ResourceManager.GetString("ErrorReturnBikeLockClosedGetGPSExceptionMessage", resourceCulture);
+                return ResourceManager.GetString("ErrorConnectLockEscalationLevel2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connection to the lock could not be established..
+        /// </summary>
+        public static string ErrorConnectLockTitle {
+            get {
+                return ResourceManager.GetString("ErrorConnectLockTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to End rental outside or at wrong station is not possible. Distance to next suitable station {0} is {1} m..
+        /// </summary>
+        public static string ErrorEndRentalNotAtStation {
+            get {
+                return ResourceManager.GetString("ErrorEndRentalNotAtStation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to We could not assign the bike to any station. For this we need your location information while you are standing right next to the bike. Only then your rental can be terminated!
+        ///
+        ///Approach the bike lock, turn on Bluetooth and Location services and try again..
+        /// </summary>
+        public static string ErrorEndRentalNotAtSuitableStation {
+            get {
+                return ResourceManager.GetString("ErrorEndRentalNotAtSuitableStation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Rental could not be terminated!.
+        /// </summary>
+        public static string ErrorEndRentalTitle {
+            get {
+                return ResourceManager.GetString("ErrorEndRentalTitle", resourceCulture);
             }
         }
         
@@ -1771,83 +1607,386 @@ namespace TINK.MultilingualResources {
         ///- location information is available when closing lock
         ///- bike is in reach and location information is available when pressing button &quot;End rental&quot;.
         /// </summary>
-        public static string ErrorReturnBikeLockClosedNoGPSMessage {
+        public static string ErrorEndRentalUnknownLocation {
             get {
-                return ResourceManager.GetString("ErrorReturnBikeLockClosedNoGPSMessage", resourceCulture);
+                return ResourceManager.GetString("ErrorEndRentalUnknownLocation", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to End rental at an unknown location is not possible.
-        ///Start getting geolocation failed..
+        ///   Looks up a localized string similar to Activate Bluetooth and try again..
         /// </summary>
-        public static string ErrorReturnBikeLockClosedStartGetGPSExceptionMessage {
+        public static string ErrorLockBluetoothNotOn {
             get {
-                return ResourceManager.GetString("ErrorReturnBikeLockClosedStartGetGPSExceptionMessage", resourceCulture);
+                return ResourceManager.GetString("ErrorLockBluetoothNotOn", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to End rental at an unknown location is not possible.
-        ///Rental can only be ended if bike is in reach and location information is available..
+        ///   Looks up a localized string similar to Attention: Lock is closed!
+        ///{0}
+        ///{1}.
         /// </summary>
-        public static string ErrorReturnBikeLockOpenNoGPSMessage {
+        public static string ErrorLockIsClosedThreeLines {
             get {
-                return ResourceManager.GetString("ErrorReturnBikeLockOpenNoGPSMessage", resourceCulture);
+                return ResourceManager.GetString("ErrorLockIsClosedThreeLines", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to End rental outside of station is not possible. Distance to station {0} is {1} m..
+        ///   Looks up a localized string similar to Attention: Lock is closed!
+        ///{0}.
         /// </summary>
-        public static string ErrorReturnBikeNotAtStationMessage {
+        public static string ErrorLockIsClosedTwoLines {
             get {
-                return ResourceManager.GetString("ErrorReturnBikeNotAtStationMessage", resourceCulture);
+                return ResourceManager.GetString("ErrorLockIsClosedTwoLines", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Internet must be available when ending rental. Please establish an Internet connection!.
+        ///   Looks up a localized string similar to Activate Location services and try again..
         /// </summary>
-        public static string ErrorReturnBikeNoWebMessage {
+        public static string ErrorLockLocationOff {
             get {
-                return ResourceManager.GetString("ErrorReturnBikeNoWebMessage", resourceCulture);
+                return ResourceManager.GetString("ErrorLockLocationOff", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection error when ending rental..
+        ///   Looks up a localized string similar to The process is motion sensitive. Step close to the lock, do not move, and try again..
         /// </summary>
-        public static string ErrorReturnBikeNoWebTitle {
+        public static string ErrorLockMoving {
             get {
-                return ResourceManager.GetString("ErrorReturnBikeNoWebTitle", resourceCulture);
+                return ResourceManager.GetString("ErrorLockMoving", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error at ending rental!.
+        ///   Looks up a localized string similar to Lock status could not be determined. Please contact customer support..
         /// </summary>
-        public static string ErrorReturnBikeTitle {
+        public static string ErrorLockNoStatus {
             get {
-                return ResourceManager.GetString("ErrorReturnBikeTitle", resourceCulture);
+                return ResourceManager.GetString("ErrorLockNoStatus", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Your feedback could not be send to server successfully..
+        ///   Looks up a localized string similar to Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again..
         /// </summary>
-        public static string ErrorReturnSubmitFeedbackMessage {
+        public static string ErrorLockOutOfReach {
             get {
-                return ResourceManager.GetString("ErrorReturnSubmitFeedbackMessage", resourceCulture);
+                return ResourceManager.GetString("ErrorLockOutOfReach", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Position of lock bolt is unknown. Lock could be closed or open. Please try again or report bike to operator!.
+        /// </summary>
+        public static string ErrorLockStatusUnknown {
+            get {
+                return ResourceManager.GetString("ErrorLockStatusUnknown", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Unexpected locking state &quot;{0}&quot; detected. Please try again or report bike to operator!.
+        /// </summary>
+        public static string ErrorLockUnexpectedState {
+            get {
+                return ResourceManager.GetString("ErrorLockUnexpectedState", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Can not login user {0}. Mail address unknown or password invalid..
+        /// </summary>
+        public static string ErrorLoginInvalidAuthorization {
+            get {
+                return ResourceManager.GetString("ErrorLoginInvalidAuthorization", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Login cookie must not be empty. {0}.
+        /// </summary>
+        public static string ErrorLoginNoCookie {
+            get {
+                return ResourceManager.GetString("ErrorLoginNoCookie", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Error while logging in!.
+        /// </summary>
+        public static string ErrorLoginTitle {
+            get {
+                return ResourceManager.GetString("ErrorLoginTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Error while logging out!.
+        /// </summary>
+        public static string ErrorLogoutTitle {
+            get {
+                return ResourceManager.GetString("ErrorLogoutTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Turn on your device&apos;s location services to center the map on your current location..
+        /// </summary>
+        public static string ErrorMapCenterLocationIsOff {
+            get {
+                return ResourceManager.GetString("ErrorMapCenterLocationIsOff", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please allow location sharing so that map can be centered.
+        ///Open sharing dialog?.
+        /// </summary>
+        public static string ErrorMapCenterNoLocationPermissionOpenDialog {
+            get {
+                return ResourceManager.GetString("ErrorMapCenterNoLocationPermissionOpenDialog", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Session has expired.
+        ///Please log in again..
+        /// </summary>
+        public static string ErrorMapPageAuthcookieUndefined {
+            get {
+                return ResourceManager.GetString("ErrorMapPageAuthcookieUndefined", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to An error occurred switching between cargo and city bikes.
+        ///{0}.
+        /// </summary>
+        public static string ErrorMapPageSwitchBikeType {
+            get {
+                return ResourceManager.GetString("ErrorMapPageSwitchBikeType", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connection to booking system not possible..
+        /// </summary>
+        public static string ErrorNoConnectionTitle {
+            get {
+                return ResourceManager.GetString("ErrorNoConnectionTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Grant Location permission, activate Location services and try again..
+        /// </summary>
+        public static string ErrorNoLocationPermission {
+            get {
+                return ResourceManager.GetString("ErrorNoLocationPermission", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again..
+        /// </summary>
+        public static string ErrorNoWeb {
+            get {
+                return ResourceManager.GetString("ErrorNoWeb", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Attention! Your rental has already started.
+        ///If the lock still won&apos;t open, make sure the lock is closed and end rental.
+        ///Important: Send an email to customer support (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station..
+        /// </summary>
+        public static string ErrorOpenLockBikeAlreadyBooked {
+            get {
+                return ResourceManager.GetString("ErrorOpenLockBikeAlreadyBooked", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Lock bolt is blocked. Make sure that no spoke presses against the lock bolt and try again..
+        /// </summary>
+        public static string ErrorOpenLockBoldBlocked {
+            get {
+                return ResourceManager.GetString("ErrorOpenLockBoldBlocked", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Position of lock bolt is unknown. Lock could be closed or open. Please try again!.
+        /// </summary>
+        public static string ErrorOpenLockStatusUnknown {
+            get {
+                return ResourceManager.GetString("ErrorOpenLockStatusUnknown", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Lock reports it is still closed. Please try again!.
+        /// </summary>
+        public static string ErrorOpenLockStillClosed {
+            get {
+                return ResourceManager.GetString("ErrorOpenLockStillClosed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Lock could not be opened!.
+        /// </summary>
+        public static string ErrorOpenLockTitle {
+            get {
+                return ResourceManager.GetString("ErrorOpenLockTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to An error occurred. Please try again..
+        /// </summary>
+        public static string ErrorPageNotLoaded {
+            get {
+                return ResourceManager.GetString("ErrorPageNotLoaded", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Page cannot be displayed..
+        /// </summary>
+        public static string ErrorPageNotLoadedTitle {
+            get {
+                return ResourceManager.GetString("ErrorPageNotLoadedTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Location query could not be started!.
+        /// </summary>
+        public static string ErrorQueryLocationStartTitle {
+            get {
+                return ResourceManager.GetString("ErrorQueryLocationStartTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Location could not be determined!.
+        /// </summary>
+        public static string ErrorQueryLocationTitle {
+            get {
+                return ResourceManager.GetString("ErrorQueryLocationTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The rental of bike {0} has failed..
+        /// </summary>
+        public static string ErrorRentingBike {
+            get {
+                return ResourceManager.GetString("ErrorRentingBike", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bike could not be rented!.
+        /// </summary>
+        public static string ErrorRentingBikeTitle {
+            get {
+                return ResourceManager.GetString("ErrorRentingBikeTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A rental of bike {0} was rejected because the maximum allowed number of {1} reservations/rentals had already been made..
+        /// </summary>
+        public static string ErrorRentingBikeTooManyReservationsRentals {
+            get {
+                return ResourceManager.GetString("ErrorRentingBikeTooManyReservationsRentals", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The rental of bike {0} has failed, the bike is currently unavailable. {1}.
+        /// </summary>
+        public static string ErrorRentingBikeUnavailalbe {
+            get {
+                return ResourceManager.GetString("ErrorRentingBikeUnavailalbe", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The reservation of bike {0} has failed..
+        /// </summary>
+        public static string ErrorReservingBike {
+            get {
+                return ResourceManager.GetString("ErrorReservingBike", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bike could not be reserved!.
+        /// </summary>
+        public static string ErrorReservingBikeTitle {
+            get {
+                return ResourceManager.GetString("ErrorReservingBikeTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to A reservation of bike {0} was rejected because the maximum allowed number of {1} reservations/rentals had already been made..
+        /// </summary>
+        public static string ErrorReservingBikeTooManyReservationsRentals {
+            get {
+                return ResourceManager.GetString("ErrorReservingBikeTooManyReservationsRentals", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The reservation of bike {0} has failed, the bike is currently unavailable. {1}.
+        /// </summary>
+        public static string ErrorReservingBikeUnavailalbe {
+            get {
+                return ResourceManager.GetString("ErrorReservingBikeUnavailalbe", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bike with id {0} may already be reserved by another user or it may be defective..
+        /// </summary>
+        public static string ErrorSelectBikeNoBikeFound {
+            get {
+                return ResourceManager.GetString("ErrorSelectBikeNoBikeFound", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The requested bike was not found..
+        /// </summary>
+        public static string ErrorSelectBikeTitle {
+            get {
+                return ResourceManager.GetString("ErrorSelectBikeTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to This step is not mandatory. If you still want to provide feedback on the bike, contact the operator..
+        /// </summary>
+        public static string ErrorSubmitFeedback {
+            get {
+                return ResourceManager.GetString("ErrorSubmitFeedback", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Submitting feedback failed!.
         /// </summary>
-        public static string ErrorReturnSubmitFeedbackTitle {
+        public static string ErrorSubmitFeedbackTitle {
             get {
-                return ResourceManager.GetString("ErrorReturnSubmitFeedbackTitle", resourceCulture);
+                return ResourceManager.GetString("ErrorSubmitFeedbackTitle", resourceCulture);
             }
         }
         
@@ -1879,56 +2018,11 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to The rental of bike {0} has failed..
+        ///   Looks up a localized string similar to Please try again..
         /// </summary>
-        public static string ExceptionTextRentingBikeFailedGeneral {
+        public static string ErrorTryAgain {
             get {
-                return ResourceManager.GetString("ExceptionTextRentingBikeFailedGeneral", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The rental of bike {0} has failed, the bike is currently unavailable. {1}.
-        /// </summary>
-        public static string ExceptionTextRentingBikeFailedUnavailalbe {
-            get {
-                return ResourceManager.GetString("ExceptionTextRentingBikeFailedUnavailalbe", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The reservation of bike {0} has failed..
-        /// </summary>
-        public static string ExceptionTextReservationBikeFailedGeneral {
-            get {
-                return ResourceManager.GetString("ExceptionTextReservationBikeFailedGeneral", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The reservation of bike {0} has failed, the bike is currently unavailable. {1}.
-        /// </summary>
-        public static string ExceptionTextReservationBikeFailedUnavailalbe {
-            get {
-                return ResourceManager.GetString("ExceptionTextReservationBikeFailedUnavailalbe", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to The session has expired. Please register again..
-        /// </summary>
-        public static string ExceptionTextSessionExpired {
-            get {
-                return ResourceManager.GetString("ExceptionTextSessionExpired", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Is WIFI/mobile network available and mobile data activated?.
-        /// </summary>
-        public static string ExceptionTextWebConnectFailureException {
-            get {
-                return ResourceManager.GetString("ExceptionTextWebConnectFailureException", resourceCulture);
+                return ResourceManager.GetString("ErrorTryAgain", resourceCulture);
             }
         }
         
@@ -1950,6 +2044,51 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Connectivity: Connection interrupted..
+        /// </summary>
+        public static string MarkingAccountConnectionInterrupted {
+            get {
+                return ResourceManager.GetString("MarkingAccountConnectionInterrupted", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Connectivity: Offline..
+        /// </summary>
+        public static string MarkingAccountConnectionOffline {
+            get {
+                return ResourceManager.GetString("MarkingAccountConnectionOffline", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Log out.
+        /// </summary>
+        public static string MarkingAccountPageManageLogout {
+            get {
+                return ResourceManager.GetString("MarkingAccountPageManageLogout", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Manage personal data.
+        /// </summary>
+        public static string MarkingAccountPageManagePersonalData {
+            get {
+                return ResourceManager.GetString("MarkingAccountPageManagePersonalData", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Currently {0} bikes reserved/ booked..
+        /// </summary>
+        public static string MarkingAccountReservedBookedBikes {
+            get {
+                return ResourceManager.GetString("MarkingAccountReservedBookedBikes", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Invalid state for bike {0} detected.
         ///Bike should always be disconnected when not reserved or rented.
@@ -1998,7 +2137,7 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Contact operator..
+        ///   Looks up a localized string similar to contact customer support..
         /// </summary>
         public static string MarkingBikeSharingOperatorNoOperatorInfoAvailable {
             get {
@@ -2106,7 +2245,7 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Current battery level:.
+        ///   Looks up a localized string similar to Transmit &lt;b&gt;battery level&lt;/b&gt; from the handlebar display:.
         /// </summary>
         public static string MarkingDriveBatteryTitel {
             get {
@@ -2352,9 +2491,9 @@ namespace TINK.MultilingualResources {
         /// <summary>
         ///   Looks up a localized string similar to Oops, there is no Internet connection..
         /// </summary>
-        public static string MarkingNoNetworkConnection {
+        public static string MarkingNoWeb {
             get {
-                return ResourceManager.GetString("MarkingNoNetworkConnection", resourceCulture);
+                return ResourceManager.GetString("MarkingNoWeb", resourceCulture);
             }
         }
         
@@ -2367,6 +2506,87 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Check if the lock is really closed!.
+        /// </summary>
+        public static string MarkingRentalProcessCloseLockCheckLock {
+            get {
+                return ResourceManager.GetString("MarkingRentalProcessCloseLockCheckLock", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Watch the lock as it is closing!.
+        /// </summary>
+        public static string MarkingRentalProcessCloseLockObserve {
+            get {
+                return ResourceManager.GetString("MarkingRentalProcessCloseLockObserve", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Lock closes..
+        /// </summary>
+        public static string MarkingRentalProcessCloseLockStepCloseLock {
+            get {
+                return ResourceManager.GetString("MarkingRentalProcessCloseLockStepCloseLock", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to GPS data is requested..
+        /// </summary>
+        public static string MarkingRentalProcessCloseLockStepGPS {
+            get {
+                return ResourceManager.GetString("MarkingRentalProcessCloseLockStepGPS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Status is being synchronized..
+        /// </summary>
+        public static string MarkingRentalProcessCloseLockStepUpload {
+            get {
+                return ResourceManager.GetString("MarkingRentalProcessCloseLockStepUpload", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Give feedback on the bike..
+        /// </summary>
+        public static string MarkingRentalProcessEndRentalStepFeedback {
+            get {
+                return ResourceManager.GetString("MarkingRentalProcessEndRentalStepFeedback", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Bike is assigned to station..
+        /// </summary>
+        public static string MarkingRentalProcessEndRentalStepGPS {
+            get {
+                return ResourceManager.GetString("MarkingRentalProcessEndRentalStepGPS", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Status is being synchronized..
+        /// </summary>
+        public static string MarkingRentalProcessEndRentalStepUpload {
+            get {
+                return ResourceManager.GetString("MarkingRentalProcessEndRentalStepUpload", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Wait for the end of rental confirmation!.
+        /// </summary>
+        public static string MarkingRentalProcessEndRentalWait {
+            get {
+                return ResourceManager.GetString("MarkingRentalProcessEndRentalWait", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Is bike okay?.
         /// </summary>
@@ -2538,24 +2758,6 @@ namespace TINK.MultilingualResources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Log out.
-        /// </summary>
-        public static string MessageAccountPageManageLogout {
-            get {
-                return ResourceManager.GetString("MessageAccountPageManageLogout", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Manage personal data.
-        /// </summary>
-        public static string MessageAccountPageManagePersonalData {
-            get {
-                return ResourceManager.GetString("MessageAccountPageManagePersonalData", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Cancel.
         /// </summary>
@@ -2565,6 +2767,33 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Contact support.
+        /// </summary>
+        public static string MessageAnswerContactSupport {
+            get {
+                return ResourceManager.GetString("MessageAnswerContactSupport", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to End other rentals.
+        /// </summary>
+        public static string MessageAnswerEndRentalOfMoreBikes {
+            get {
+                return ResourceManager.GetString("MessageAnswerEndRentalOfMoreBikes", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Finished.
+        /// </summary>
+        public static string MessageAnswerFinished {
+            get {
+                return ResourceManager.GetString("MessageAnswerFinished", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to No.
         /// </summary>
@@ -2755,43 +2984,6 @@ namespace TINK.MultilingualResources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Connection error when canceling the reservation!.
-        /// </summary>
-        public static string MessageCancelReservationBikeErrorConnectionTitle {
-            get {
-                return ResourceManager.GetString("MessageCancelReservationBikeErrorConnectionTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error when canceling the reservation!.
-        /// </summary>
-        public static string MessageCancelReservationBikeErrorGeneralTitle {
-            get {
-                return ResourceManager.GetString("MessageCancelReservationBikeErrorGeneralTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please allow location sharing so that map can be centered.
-        ///Open sharing dialog?.
-        /// </summary>
-        public static string MessageCenterMapLocationPermissionOpenDialog {
-            get {
-                return ResourceManager.GetString("MessageCenterMapLocationPermissionOpenDialog", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error when connecting with lock!.
-        /// </summary>
-        public static string MessageConnectLockErrorTitle {
-            get {
-                return ResourceManager.GetString("MessageConnectLockErrorTitle", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Questions? Remarks?.
         /// </summary>
@@ -2803,7 +2995,7 @@ namespace TINK.MultilingualResources {
         
         /// <summary>
         ///   Looks up a localized string similar to This version of the {0} App is not compatible with server detected.
-        ///Please contact operator for help..
+        ///Please contact customer support for help..
         /// </summary>
         public static string MessageCopriVersionIsOutdated {
             get {
@@ -2812,131 +3004,20 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error when connecting to lock!.
+        ///   Looks up a localized string similar to Hint.
         /// </summary>
-        public static string MessageErrorConnectTitle {
+        public static string MessageHintTitle {
             get {
-                return ResourceManager.GetString("MessageErrorConnectTitle", resourceCulture);
+                return ResourceManager.GetString("MessageHintTitle", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Turn on your device&apos;s location services to center the map on your current location..
+        ///   Looks up a localized string similar to Information.
         /// </summary>
-        public static string MessageErrorLocationIsOff {
+        public static string MessageInformationTitle {
             get {
-                return ResourceManager.GetString("MessageErrorLocationIsOff", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Attention: Lock is closed!
-        ///{0}
-        ///{1}.
-        /// </summary>
-        public static string MessageErrorLockIsClosedThreeLines {
-            get {
-                return ResourceManager.GetString("MessageErrorLockIsClosedThreeLines", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Attention: Lock is closed!
-        ///{0}.
-        /// </summary>
-        public static string MessageErrorLockIsClosedTwoLines {
-            get {
-                return ResourceManager.GetString("MessageErrorLockIsClosedTwoLines", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Closing the lock and ending the rental is not possible..
-        /// </summary>
-        public static string MessageErrorQueryLocationMessage {
-            get {
-                return ResourceManager.GetString("MessageErrorQueryLocationMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error start query location!.
-        /// </summary>
-        public static string MessageErrorQueryLocationStartTitle {
-            get {
-                return ResourceManager.GetString("MessageErrorQueryLocationStartTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error query location!.
-        /// </summary>
-        public static string MessageErrorQueryLocationTitle {
-            get {
-                return ResourceManager.GetString("MessageErrorQueryLocationTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No bike with id {0} found. It may already be reserved by another user or it may be defective..
-        /// </summary>
-        public static string MessageErrorSelectBikeNoBikeFound {
-            get {
-                return ResourceManager.GetString("MessageErrorSelectBikeNoBikeFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error Selecting Bike!.
-        /// </summary>
-        public static string MessageErrorSelectBikeTitle {
-            get {
-                return ResourceManager.GetString("MessageErrorSelectBikeTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Login cookie must not be empty. {0}.
-        /// </summary>
-        public static string MessageLoginConnectionErrorMessage {
-            get {
-                return ResourceManager.GetString("MessageLoginConnectionErrorMessage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection error during registration!.
-        /// </summary>
-        public static string MessageLoginConnectionErrorTitle {
-            get {
-                return ResourceManager.GetString("MessageLoginConnectionErrorTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Error while logging in!.
-        /// </summary>
-        public static string MessageLoginErrorTitle {
-            get {
-                return ResourceManager.GetString("MessageLoginErrorTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please connect to Internet to recover the password..
-        /// </summary>
-        public static string MessageLoginRecoverPassword {
-            get {
-                return ResourceManager.GetString("MessageLoginRecoverPassword", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Please connect to Internet to register..
-        /// </summary>
-        public static string MessageLoginRegisterNoNet {
-            get {
-                return ResourceManager.GetString("MessageLoginRegisterNoNet", resourceCulture);
+                return ResourceManager.GetString("MessageInformationTitle", resourceCulture);
             }
         }
         
@@ -2968,40 +3049,20 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error while logging out!.
+        ///   Looks up a localized string similar to User {0} successfully logged in..
         /// </summary>
-        public static string MessageLogoutErrorTitle {
+        public static string MessageLogoutGoodbye {
             get {
-                return ResourceManager.GetString("MessageLogoutErrorTitle", resourceCulture);
+                return ResourceManager.GetString("MessageLogoutGoodbye", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Session has expired.
-        ///Please log in again..
+        ///   Looks up a localized string similar to Goodbye!.
         /// </summary>
-        public static string MessageMapPageErrorAuthcookieUndefined {
+        public static string MessageLogoutGoodbyeTitle {
             get {
-                return ResourceManager.GetString("MessageMapPageErrorAuthcookieUndefined", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An error occurred switching between cargo and city bikes.
-        ///{0}.
-        /// </summary>
-        public static string MessageMapPageErrorSwitch {
-            get {
-                return ResourceManager.GetString("MessageMapPageErrorSwitch", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Connection error when opening the lock!.
-        /// </summary>
-        public static string MessageOpeningLockErrorConnectionTitle {
-            get {
-                return ResourceManager.GetString("MessageOpeningLockErrorConnectionTitle", resourceCulture);
+                return ResourceManager.GetString("MessageLogoutGoodbyeTitle", resourceCulture);
             }
         }
         
@@ -3015,65 +3076,58 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection error when renting the bike!.
+        ///   Looks up a localized string similar to Bike is parked. Your chargeable rental continues!.
         /// </summary>
-        public static string MessageRentingBikeErrorConnectionTitle {
+        public static string MessageRentalProcessCloseLockFinishedText {
             get {
-                return ResourceManager.GetString("MessageRentingBikeErrorConnectionTitle", resourceCulture);
+                return ResourceManager.GetString("MessageRentalProcessCloseLockFinishedText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error when renting the bike!.
+        ///   Looks up a localized string similar to Lock is closed.
         /// </summary>
-        public static string MessageRentingBikeErrorGeneralTitle {
+        public static string MessageRentalProcessCloseLockFinishedTitle {
             get {
-                return ResourceManager.GetString("MessageRentingBikeErrorGeneralTitle", resourceCulture);
+                return ResourceManager.GetString("MessageRentalProcessCloseLockFinishedTitle", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A rental of bike {0} was rejected because the maximum allowed number of {1} reservations/rentals had already been made..
+        ///   Looks up a localized string similar to Please try again or contact customer support..
         /// </summary>
-        public static string MessageRentingBikeErrorTooManyReservationsRentals {
+        public static string MessageRentalProcessCloseLockNotClosedText {
             get {
-                return ResourceManager.GetString("MessageRentingBikeErrorTooManyReservationsRentals", resourceCulture);
+                return ResourceManager.GetString("MessageRentalProcessCloseLockNotClosedText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to A reservation of bike {0} was rejected because the maximum allowed number of {1} reservations/rentals had already been made..
+        ///   Looks up a localized string similar to Lock is open!.
         /// </summary>
-        public static string MessageReservationBikeErrorTooManyReservationsRentals {
+        public static string MessageRentalProcessCloseLockNotClosedTitle {
             get {
-                return ResourceManager.GetString("MessageReservationBikeErrorTooManyReservationsRentals", resourceCulture);
+                return ResourceManager.GetString("MessageRentalProcessCloseLockNotClosedTitle", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection error when reserving the bike!.
+        ///   Looks up a localized string similar to Rental costs will be automatically debited within the next days. Ensure sufficient account coverage. You can view your rental history under Account.
+        ///
+        ///Thank you for your ride!.
         /// </summary>
-        public static string MessageReservingBikeErrorConnectionTitle {
+        public static string MessageRentalProcessEndRentalFinishedText {
             get {
-                return ResourceManager.GetString("MessageReservingBikeErrorConnectionTitle", resourceCulture);
+                return ResourceManager.GetString("MessageRentalProcessEndRentalFinishedText", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Error when reserving the bike!.
+        ///   Looks up a localized string similar to Rental is terminated.
         /// </summary>
-        public static string MessageReservingBikeErrorGeneralTitle {
+        public static string MessageRentalProcessEndRentalFinishedTitle {
             get {
-                return ResourceManager.GetString("MessageReservingBikeErrorGeneralTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Hint.
-        /// </summary>
-        public static string MessageTitleHint {
-            get {
-                return ResourceManager.GetString("MessageTitleHint", resourceCulture);
+                return ResourceManager.GetString("MessageRentalProcessEndRentalFinishedTitle", resourceCulture);
             }
         }
         
@@ -3122,24 +3176,6 @@ namespace TINK.MultilingualResources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to No.
-        /// </summary>
-        public static string QuestionAnswerNo {
-            get {
-                return ResourceManager.GetString("QuestionAnswerNo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Yes.
-        /// </summary>
-        public static string QuestionAnswerYes {
-            get {
-                return ResourceManager.GetString("QuestionAnswerYes", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Cancel reservation for bike {0}?.
         /// </summary>
@@ -3158,6 +3194,33 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Close lock or rent bike {0}?.
+        /// </summary>
+        public static string QuestionCloseOrBook {
+            get {
+                return ResourceManager.GetString("QuestionCloseOrBook", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Do you want to go to the login page?.
+        /// </summary>
+        public static string QuestionLogIn {
+            get {
+                return ResourceManager.GetString("QuestionLogIn", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to You are not logged in!.
+        /// </summary>
+        public static string QuestionLogInTitle {
+            get {
+                return ResourceManager.GetString("QuestionLogInTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Rent bike {0} and open lock?.
         /// </summary>
@@ -3167,6 +3230,42 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Park bike.
+        /// </summary>
+        public static string QuestionRentalProcessCloseLockContinueRentalAnswer {
+            get {
+                return ResourceManager.GetString("QuestionRentalProcessCloseLockContinueRentalAnswer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Do you want to park the bike to continue riding later or return the bike now and end the rental?.
+        /// </summary>
+        public static string QuestionRentalProcessCloseLockEndOrContinueText {
+            get {
+                return ResourceManager.GetString("QuestionRentalProcessCloseLockEndOrContinueText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Please choose.
+        /// </summary>
+        public static string QuestionRentalProcessCloseLockEndOrContinueTitle {
+            get {
+                return ResourceManager.GetString("QuestionRentalProcessCloseLockEndOrContinueTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to End rental.
+        /// </summary>
+        public static string QuestionRentalProcessCloseLockEndRentalAnswer {
+            get {
+                return ResourceManager.GetString("QuestionRentalProcessCloseLockEndRentalAnswer", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Reserve bike {0} free of charge for {1} min?.
         /// </summary>
@@ -3185,33 +3284,6 @@ namespace TINK.MultilingualResources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to {0} app request.
-        /// </summary>
-        public static string QuestionSupportmailAnswerApp {
-            get {
-                return ResourceManager.GetString("QuestionSupportmailAnswerApp", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No, do not attach file.
-        /// </summary>
-        public static string QuestionSupportmailAnswerNo {
-            get {
-                return ResourceManager.GetString("QuestionSupportmailAnswerNo", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} request.
-        /// </summary>
-        public static string QuestionSupportmailAnswerOperator {
-            get {
-                return ResourceManager.GetString("QuestionSupportmailAnswerOperator", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to I hereby consent to the transmission of my diagnostic file.
         ///
@@ -3223,30 +3295,12 @@ namespace TINK.MultilingualResources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Does your request/comment relate to the {0}-app or to a more general subject?.
-        /// </summary>
-        public static string QuestionSupportmailSubject {
-            get {
-                return ResourceManager.GetString("QuestionSupportmailSubject", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Consent.
         /// </summary>
-        public static string QuestionSupportmailTitle {
+        public static string QuestionSupportmailAttachmentTitle {
             get {
-                return ResourceManager.GetString("QuestionSupportmailTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Question.
-        /// </summary>
-        public static string QuestionTitle {
-            get {
-                return ResourceManager.GetString("QuestionTitle", resourceCulture);
+                return ResourceManager.GetString("QuestionSupportmailAttachmentTitle", resourceCulture);
             }
         }
         
@@ -3313,6 +3367,24 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Lock is closed.
+        /// </summary>
+        public static string StatusTextLockClosed {
+            get {
+                return ResourceManager.GetString("StatusTextLockClosed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Lock is open.
+        /// </summary>
+        public static string StatusTextLockOpened {
+            get {
+                return ResourceManager.GetString("StatusTextLockOpened", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The remaining power of the bike battery was low recently. Please check it on the bike display before riding. The rental can be canceled within 5 minutes free of charge..
         /// </summary>
@@ -3322,6 +3394,15 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Rental is terminated.
+        /// </summary>
+        public static string StatusTextRentalEnded {
+            get {
+                return ResourceManager.GetString("StatusTextRentalEnded", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Code {0}, location {1}, max. reservation time expired..
         /// </summary>
@@ -3403,6 +3484,15 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to {0}-app request: station {1}.
+        /// </summary>
+        public static string SupportmailSubjectAppmailWithStation {
+            get {
+                return ResourceManager.GetString("SupportmailSubjectAppmailWithStation", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to {0}-request: station {1}.
         /// </summary>
diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx
index a2672c7..c76fb85 100644
--- a/TINKLib/MultilingualResources/AppResources.de.resx
+++ b/TINKLib/MultilingualResources/AppResources.de.resx
@@ -12,8 +12,8 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ActionBookOrClose" xml:space="preserve">
-    <value>Rad mieten oder Schloss schließen</value>
+  <data name="ActionCloseOrBook" xml:space="preserve">
+    <value>Schloss schließen oder Rad mieten</value>
   </data>
   <data name="ActionCancelRequest" xml:space="preserve">
     <value>Reservierung aufheben</value>
@@ -63,15 +63,6 @@
   <data name="MessageAppVersionIsOutdated" xml:space="preserve">
     <value>Diese Version der {0} App ist veraltet. Bitte auf aktuelle Version aktualisieren.</value>
   </data>
-  <data name="QuestionSupportmailSubject" xml:space="preserve">
-    <value>Betrifft die Anfrage/Anmerkung die {0}-App oder ein allgemeines Thema?</value>
-  </data>
-  <data name="QuestionSupportmailAnswerApp" xml:space="preserve">
-    <value>{0}-App Anfrage</value>
-  </data>
-  <data name="QuestionSupportmailAnswerOperator" xml:space="preserve">
-    <value>{0} Anfrage</value>
-  </data>
   <data name="MarkingAbout" xml:space="preserve">
     <value>Rechtliches</value>
   </data>
@@ -99,17 +90,8 @@
   <data name="MarkingTabFees" xml:space="preserve">
     <value>Tarife</value>
   </data>
-  <data name="ErrorCloseLockBoldBlockedMessage" xml:space="preserve">
-    <value>Schloss ist blockiert. Bitte stellen Sie sicher, dass keine Speiche oder ein anderer Gegenstand das Schloss blockiert und wiederholen Sie den Vorgang.</value>
-  </data>
-  <data name="ErrorCloseLockMovingMessage" xml:space="preserve">
-    <value>Schloss kann erst geschlossen werden, wenn Rad nicht mehr bewegt wird. Bitte Rad abstellen und Vorgang wiederholen.</value>
-  </data>
-  <data name="ErrorBookedSearchMessage" xml:space="preserve">
-    <value>Ihr mobiles Gerät verbindet sich nicht mit dem Schloss. Bitte treten Sie möglichst nah an das Rad heran und probieren Sie es erneut. </value>
-  </data>
-  <data name="ErrorReservedSearchMessage" xml:space="preserve">
-    <value>Ihr mobiles Gerät verbindet sich nicht mit dem Schloss. Bitte treten Sie möglichst nah an das Rad heran und probieren Sie es erneut. </value>
+  <data name="ErrorLockMoving" xml:space="preserve">
+    <value>Der Vorgang ist bewegungssensibel. Treten Sie nah an das Schloss heran, bewegen Sie sich nicht und versuchen Sie es erneut.</value>
   </data>
   <data name="ActivityTextBikesAtStationGetBikes" xml:space="preserve">
     <value>Lade Räder an Station...</value>
@@ -126,21 +108,17 @@
   <data name="ActivityTextMapLoadingStationsAndBikes" xml:space="preserve">
     <value>Lade Stationen und Räder...</value>
   </data>
-  <data name="ErrorReturnBikeNotAtStationMessage" xml:space="preserve">
-    <value>Rückgabe außerhalb einer Station nicht möglich. Entfernung zur nächsten Station {0} beträgt {1} m.</value>
+  <data name="ErrorEndRentalNotAtStation" xml:space="preserve">
+    <value>Rückgabe außerhalb oder an einer falschen Station nicht möglich. Entfernung zur nächsten kompatiblen Station {0} beträgt {1} m.</value>
   </data>
-  <data name="ErrorReturnBikeTitle" xml:space="preserve">
-    <value>Fehler beim Beenden der Miete!</value>
+  <data name="ErrorEndRentalTitle" xml:space="preserve">
+    <value>Miete konnte nicht beendet werden!</value>
   </data>
-  <data name="ErrorReturnBikeLockClosedNoGPSMessage" xml:space="preserve">
+  <data name="ErrorEndRentalUnknownLocation" xml:space="preserve">
     <value>Beenden der Miete an unbekanntem Standort nicht möglich.
 Ein Mietende ist möglich, wenn
 - beim Schließen des Schlosses Standortinformation verfügbar ist
-- beim Drücken von "Miete beenden" das Rad in Reichweite ist und Standortinformation verfügbar ist</value>
-  </data>
-  <data name="ErrorReturnBikeLockOpenNoGPSMessage" xml:space="preserve">
-    <value>Beenden der Miete an unbekanntem Standort nicht möglich.
-Mietende ist nur möglich, wenn das Rad in Reichweite ist und Standortinformation verfügbar ist.</value>
+- beim Drücken von "Miete beenden" das Fahrrad in Reichweite ist und Standortinformation verfügbar ist</value>
   </data>
   <data name="ErrorSupportmailCreateAttachment" xml:space="preserve">
     <value>Anhang konnte nich erzeugt werden.</value>
@@ -160,21 +138,12 @@ Mietende ist nur möglich, wenn das Rad in Reichweite ist und Standortinformatio
   <data name="MessageWaring" xml:space="preserve">
     <value>Warnung</value>
   </data>
-  <data name="QuestionAnswerNo" xml:space="preserve">
-    <value>Nein</value>
-  </data>
-  <data name="QuestionAnswerYes" xml:space="preserve">
-    <value>Ja</value>
-  </data>
   <data name="QuestionSupportmailAttachment" xml:space="preserve">
     <value>Hiermit stimme ich der Übermittlung meiner Diagnosedatei zu.
 
 Die Diagnosedatei enthält Ihre App-Nutzungsdaten sowie Systeminformationen. Die Daten werden ausschließlich für Diagnosezwecke bzw. Verbesserung der App verwendet und werden anschließend gelöscht.</value>
   </data>
-  <data name="QuestionTitle" xml:space="preserve">
-    <value>Frage</value>
-  </data>
-  <data name="MessageMapPageErrorAuthcookieUndefined" xml:space="preserve">
+  <data name="ErrorMapPageAuthcookieUndefined" xml:space="preserve">
     <value>Sitzung ist abgelaufen.
 Bitte melden Sie sich erneut an.</value>
   </data>
@@ -187,7 +156,7 @@ Bitte melden Sie sich erneut an.</value>
 </value>
   </data>
   <data name="StatusTextBooked" xml:space="preserve">
-    <value>Rad ist gemietet.</value>
+    <value>Fahrrad ist gemietet.</value>
   </data>
   <data name="StatusTextBookedSince" xml:space="preserve">
     <value>Gemietet seit {0}.</value>
@@ -254,58 +223,29 @@ Bitte melden Sie sich erneut an.</value>
   <data name="MarkingLoginInstructionsTinkKonradTitle" xml:space="preserve">
     <value>Zur Information!</value>
   </data>
-  <data name="MessageLoginConnectionErrorMessage" xml:space="preserve">
+  <data name="ErrorLoginNoCookie" xml:space="preserve">
     <value>Anmeldungskeks darf nicht leer sein. {0}</value>
   </data>
-  <data name="MessageLoginConnectionErrorTitle" xml:space="preserve">
-    <value>Verbindungsfehler beim Registrieren!</value>
-  </data>
-  <data name="MessageLoginErrorTitle" xml:space="preserve">
+  <data name="ErrorLoginTitle" xml:space="preserve">
     <value>Fehler bei der Anmeldung!</value>
   </data>
-  <data name="MessageLoginRecoverPassword" xml:space="preserve">
-    <value>Zur Wiederherstellung des Passworts bitte mit dem Internet verbinden.</value>
-  </data>
-  <data name="MessageLoginRegisterNoNet" xml:space="preserve">
-    <value>Zur Registrierung bitte mit dem Internet verbinden.</value>
-  </data>
-  <data name="MessageTitleHint" xml:space="preserve">
-    <value>Hinweis</value>
-  </data>
-  <data name="ErrorOpenLockStillClosedMessage" xml:space="preserve">
-    <value>Nach Versuch das Schloss zu öffnen, wird Status "geschlossen" zurückgemeldet.</value>
-  </data>
-  <data name="ErrorOpenLockOutOfReachMessage" xml:space="preserve">
-    <value>Schloss kann erst geöffnet werden, wenn Rad in der Nähe ist.</value>
-  </data>
-  <data name="ErrorCloseLockOutOfReachMessage" xml:space="preserve">
-    <value>Schloss kann erst geschlossen werden, wenn Rad in der Nähe ist. </value>
-  </data>
-  <data name="ErrorCloseLockOutOfReachStateReservedMessage" xml:space="preserve">
-    <value>Schloss kann erst geschlossen werden, wenn Rad in der Nähe ist.
-Bitte Schließen nochmals versuchen oder Rad dem Betreiber melden!</value>
+  <data name="ErrorOpenLockStillClosed" xml:space="preserve">
+    <value>Schloss meldet, dass es immer noch geschlossen ist. Bitte versuchen Sie erneut!</value>
   </data>
   <data name="ErrorCloseLockTitle" xml:space="preserve">
-    <value>Schloss kann nicht geschlossen werden!</value>
+    <value>Schloss konnte nicht geschlossen werden!</value>
   </data>
-  <data name="ErrorCloseLockStillOpenMessage" xml:space="preserve">
-    <value>Nach Versuch Schloss zu schließen, wird Status "offen" zurückgemeldet.</value>
-  </data>
-  <data name="ErrorCloseLockUnexpectedStateMessage" xml:space="preserve">
-    <value>Schloss meldet Status "{0}".</value>
-  </data>
-  <data name="ErrorCloseLockUnkErrorMessage" xml:space="preserve">
-    <value>Bitte Schließen nochmals versuchen oder Rad dem Betreiber melden!
-{0}</value>
+  <data name="ErrorLockUnexpectedState" xml:space="preserve">
+    <value>Unerwarteter Schlosszustand "{0}" detektiert. Bitte versuchen Sie es erneut oder melden Sie das Fahrrad dem Betreiber!</value>
   </data>
   <data name="MessageBikesManagementLocationPermission" xml:space="preserve">
     <value>Bitte Standortfreigabe erlauben, damit Schloss/-schlösser verwaltet werden können.</value>
   </data>
   <data name="MessageBikesManagementLocationPermissionOpenDialog" xml:space="preserve">
-    <value>Bitte Standortfreigabe erlauben, damit Radschloss/-schlösser verwaltet werden können.
+    <value>Bitte Standortfreigabe erlauben, damit Fahrradschloss/-schlösser verwaltet werden können.
 Freigabedialog öffen?</value>
   </data>
-  <data name="MessageCenterMapLocationPermissionOpenDialog" xml:space="preserve">
+  <data name="ErrorMapCenterNoLocationPermissionOpenDialog" xml:space="preserve">
     <value>Bitte Standortfreigabe erlauben, damit Karte zentriert werden werden kann.
 Freigabedialog öffen?</value>
   </data>
@@ -349,21 +289,21 @@ Freigabedialog öffen?</value>
     <value>Um den Schlossstatus zu aktualisieren, wird Internet benötigt. Bitte stellen Sie eine Internetverbindung her!</value>
   </data>
   <data name="ActivityTextClosingLock" xml:space="preserve">
-    <value>&lt;h4&gt;&lt;b&gt;Schloss schließt.&lt;br/&gt;Bitte warten Sie, bis es komplett geschlossen ist.&lt;/b&gt;&lt;/h4&gt;</value>
+    <value>Bleiben Sie am Fahrrad stehen, bis das Schloss geschlossen ist.</value>
   </data>
-  <data name="ChangeLog3_0_203" xml:space="preserve">
+  <data name="ChangeLog_3_0_203" xml:space="preserve">
     <value>Aktualisierrt auf aktuelle Schloss-Firmware.</value>
   </data>
-  <data name="ChangeLog3_0_204" xml:space="preserve">
+  <data name="ChangeLog_3_0_204" xml:space="preserve">
     <value>Bluetooth Kommunikation verbessert.</value>
   </data>
-  <data name="ChangeLog3_0_205" xml:space="preserve">
+  <data name="ChangeLog_3_0_205" xml:space="preserve">
     <value>Stationssymbole verbessert.</value>
   </data>
-  <data name="ChangeLog3_0_206" xml:space="preserve">
+  <data name="ChangeLog_3_0_206" xml:space="preserve">
     <value>Bluetooth- und Geolocation-Funktionalität verbessert.</value>
   </data>
-  <data name="ChangeLog3_0_207" xml:space="preserve">
+  <data name="ChangeLog_3_0_207" xml:space="preserve">
     <value>Kleinere Fehlerbehebungen.
 Software Pakete aktualisiert.
 Zielplatform Android 11.</value>
@@ -375,45 +315,42 @@ Zielplatform Android 11.</value>
     <value>Akkustand kann nicht gelesen werden.</value>
   </data>
   <data name="ActivityTextErrorReadingChargingLevelOutOfReach" xml:space="preserve">
-    <value>Akkuladestand kann erst gelesen werden, wenn Rad in der Nähe ist.</value>
+    <value>Akkuladestand kann erst gelesen werden, wenn Fahrrad in der Nähe ist.</value>
   </data>
   <data name="ActivityTextRentingBike" xml:space="preserve">
     <value>Miete Rad...</value>
   </data>
-  <data name="MessageRentingBikeErrorConnectionTitle" xml:space="preserve">
-    <value>Verbingungsfehler beim Mieten des Rads!</value>
+  <data name="ErrorRentingBikeTitle" xml:space="preserve">
+    <value>Fahrrad konnte nicht gemietet werden!</value>
   </data>
-  <data name="MessageRentingBikeErrorGeneralTitle" xml:space="preserve">
-    <value>Fehler beim Mieten des Rads!</value>
+  <data name="ErrorRentingBikeTooManyReservationsRentals" xml:space="preserve">
+    <value>Eine Miete des Fahrrads {0} wurde abgelehnt, weil die maximal erlaubte Anzahl von {1} Reservierungen/Mieten bereits getätigt wurden.</value>
   </data>
-  <data name="MessageRentingBikeErrorTooManyReservationsRentals" xml:space="preserve">
-    <value>Eine Miete des Rads {0} wurde abgelehnt, weil die maximal erlaubte Anzahl von {1} Reservierungen/Mieten bereits getätigt wurden.</value>
+  <data name="ErrorReservingBikeTooManyReservationsRentals" xml:space="preserve">
+    <value>Eine Reservierung des Fahrrads {0} wurde abgelehnt, weil die maximal erlaubte Anzahl von {1} Reservierungen/Mieten bereits getätigt wurden.</value>
   </data>
-  <data name="MessageReservationBikeErrorTooManyReservationsRentals" xml:space="preserve">
-    <value>Eine Reservierung des Rads {0} wurde abgelehnt, weil die maximal erlaubte Anzahl von {1} Reservierungen/Mieten bereits getätigt wurden.</value>
-  </data>
-  <data name="MessageErrorLockIsClosedThreeLines" xml:space="preserve">
+  <data name="ErrorLockIsClosedThreeLines" xml:space="preserve">
     <value>Achtung: Schloss wird geschlossen!
 {0}
 {1}</value>
   </data>
-  <data name="MessageErrorLockIsClosedTwoLines" xml:space="preserve">
+  <data name="ErrorLockIsClosedTwoLines" xml:space="preserve">
     <value>Achtung: Schloss wird geschlossen!
 {0}</value>
   </data>
-  <data name="ExceptionTextRentingBikeFailedGeneral" xml:space="preserve">
-    <value>Die Miete des Rads {0} ist fehlgeschlagen.</value>
+  <data name="ErrorRentingBike" xml:space="preserve">
+    <value>Die Miete des Fahrrads {0} ist fehlgeschlagen.</value>
   </data>
-  <data name="ExceptionTextRentingBikeFailedUnavailalbe" xml:space="preserve">
-    <value>Die Miete des Rads {0} ist fehlgeschlagen, das Rad ist momentan nicht erreichbar.{1}</value>
+  <data name="ErrorRentingBikeUnavailalbe" xml:space="preserve">
+    <value>Die Miete des Fahrrads {0} ist fehlgeschlagen, das Fahrrad ist momentan nicht erreichbar.{1}</value>
   </data>
-  <data name="ExceptionTextReservationBikeFailedGeneral" xml:space="preserve">
-    <value>Die Reservierung des Rads {0} ist fehlgeschlagen.</value>
+  <data name="ErrorReservingBike" xml:space="preserve">
+    <value>Die Reservierung des Fahrrads {0} ist fehlgeschlagen.</value>
   </data>
-  <data name="ExceptionTextReservationBikeFailedUnavailalbe" xml:space="preserve">
-    <value>Die Reservierung des Rads {0} ist fehlgeschlagen, das Rad ist momentan nicht erreichbar.{1}</value>
+  <data name="ErrorReservingBikeUnavailalbe" xml:space="preserve">
+    <value>Die Reservierung des Fahrrads {0} ist fehlgeschlagen, das Fahrrad ist momentan nicht erreichbar.{1}</value>
   </data>
-  <data name="ChangeLog3_0_208" xml:space="preserve">
+  <data name="ChangeLog_3_0_208" xml:space="preserve">
     <value>Kleinere Fehlerbehebungen.</value>
   </data>
   <data name="ActivityTextDisconnectingLock" xml:space="preserve">
@@ -423,12 +360,12 @@ Zielplatform Android 11.</value>
     <value>Fehler beim Trennen...</value>
   </data>
   <data name="MarkingBikeInfoErrorStateDisposableClosedDetected" xml:space="preserve">
-    <value>Ungülitiger Status von Rad {0} erkannt.
-Ein nicht reserviertes oder gemietetes Rad sollte immer getrennt sein.
-Bitte App neu starten, um Radinfos zu bekommen.</value>
+    <value>Ungülitiger Status von Fahrrad {0} erkannt.
+Ein nicht reserviertes oder gemietetes Fahrrad sollte immer getrennt sein.
+Bitte App neu starten, um Fahrradinfos zu bekommen.</value>
   </data>
   <data name="MarkingBikeInfoErrorStateUnknownDetected" xml:space="preserve">
-    <value>Ungültiger Mietstatus von Rad {0} erkannt.
+    <value>Ungültiger Mietstatus von Fahrrad {0} erkannt.
 
 </value>
   </data>
@@ -438,7 +375,7 @@ Bitte App neu starten, um Radinfos zu bekommen.</value>
   <data name="QuestionCancelReservation" xml:space="preserve">
     <value>Reservierung für Rad {0} aufheben?</value>
   </data>
-  <data name="ChangeLog3_0_209" xml:space="preserve">
+  <data name="ChangeLog_3_0_209" xml:space="preserve">
     <value>Kleinere Fehlerbehebung: Verbindung wird getrennt, sobald Rad verfügbar ist.</value>
   </data>
   <data name="QuestionReserveBike" xml:space="preserve">
@@ -486,44 +423,44 @@ Bitte App neu starten, um Radinfos zu bekommen.</value>
   <data name="ActivityTextSearchingLock" xml:space="preserve">
     <value>Suche Schloss...</value>
   </data>
-  <data name="ChangeLog3_0_214" xml:space="preserve">
+  <data name="ChangeLog_3_0_214" xml:space="preserve">
     <value>Mehrbetreiber Unterstützung.</value>
   </data>
-  <data name="ChangeLog3_0_215" xml:space="preserve">
+  <data name="ChangeLog_3_0_215" xml:space="preserve">
     <value>Layout des "Whats New"-Dialos verbessert :-)</value>
   </data>
   <data name="MessageBikesManagementMaxFeeEuroPerDay" xml:space="preserve">
     <value>€/Tag</value>
   </data>
-  <data name="ChangeLog3_0_216" xml:space="preserve">
+  <data name="ChangeLog_3_0_216" xml:space="preserve">
     <value>Oberflächenlayout verbessert.</value>
   </data>
-  <data name="ChangeLog3_0_217" xml:space="preserve">
+  <data name="ChangeLog_3_0_217" xml:space="preserve">
     <value>Pakete aktualisiert.</value>
   </data>
-  <data name="ChangeLog3_0_219" xml:space="preserve">
+  <data name="ChangeLog_3_0_219" xml:space="preserve">
     <value>Icons zum Flyout-Menü hinzugefügt.</value>
   </data>
-  <data name="ChangeLog3_0_220" xml:space="preserve">
+  <data name="ChangeLog_3_0_220" xml:space="preserve">
     <value>Oberflächenlayout verbessert.</value>
   </data>
-  <data name="ChangeLog3_0_221" xml:space="preserve">
+  <data name="ChangeLog_3_0_221" xml:space="preserve">
     <value>Oberflächenlayout verbessert.</value>
   </data>
-  <data name="ChangeLog3_0_222" xml:space="preserve">
+  <data name="ChangeLog_3_0_222" xml:space="preserve">
     <value>Kleine Fehlerbehebungen und Verbesserungen.</value>
   </data>
-  <data name="MessageLogoutErrorTitle" xml:space="preserve">
+  <data name="ErrorLogoutTitle" xml:space="preserve">
     <value>Fehler beim Abmelden!</value>
   </data>
   <data name="MessageCopriVersionIsOutdated" xml:space="preserve">
     <value>Diese Version der {0} App ist nicht kompatibel mit dem erkannten Server. 
-Bitte kontaktieren sie den Betreiber!</value>
+Bitte kontaktieren sie den Kundensupport!</value>
   </data>
-  <data name="ChangeLog3_0_224" xml:space="preserve">
+  <data name="ChangeLog_3_0_224" xml:space="preserve">
     <value>Aktualisiert auf aktuelle Serverversion.</value>
   </data>
-  <data name="ChangeLog3_0_226" xml:space="preserve">
+  <data name="ChangeLog_3_0_226" xml:space="preserve">
     <value>Fehlerbehebungen
 - Stationssymbole werden nach dem An-/ Abmelden aktualisiert
 - Navigation von "Fahrradstandort X" auf "Anmelen"- Seite und andere Verknüpfungen korrigiert
@@ -535,7 +472,7 @@ Bitte kontaktieren sie den Betreiber!</value>
   <data name="ActivityTextErrorWebExceptionGeneralError" xml:space="preserve">
     <value>Verbindungsfehler. Statuscode: {0}.</value>
   </data>
-  <data name="ChangeLog3_0_227" xml:space="preserve">
+  <data name="ChangeLog_3_0_227" xml:space="preserve">
     <value>Seite zur Eingabe von Rückmeldungen hinzugefügt, der nach Rückgabe eines Rads angezeigt wird.</value>
   </data>
   <data name="ActivityTextConnectionStateOffline" xml:space="preserve">
@@ -544,40 +481,34 @@ Bitte kontaktieren sie den Betreiber!</value>
   <data name="ActivityTextException" xml:space="preserve">
     <value>Cache genutzt.</value>
   </data>
-  <data name="ErrorReturnSubmitFeedbackMessage" xml:space="preserve">
-    <value>Ihre Rückmeldung konnte nicht an den Server übermittelt werden.</value>
-  </data>
-  <data name="ErrorReturnSubmitFeedbackTitle" xml:space="preserve">
+  <data name="ErrorSubmitFeedbackTitle" xml:space="preserve">
     <value>Übermittlung der Rückmeldung fehlgeschlagen!</value>
   </data>
   <data name="ActivityTextUpdating" xml:space="preserve">
     <value>Aktualisiere....</value>
   </data>
-  <data name="ChangeLog3_0_231" xml:space="preserve">
+  <data name="ChangeLog_3_0_231" xml:space="preserve">
     <value>Kleine Verbesserungen.</value>
   </data>
-  <data name="ChangeLog3_0_232" xml:space="preserve">
+  <data name="ChangeLog_3_0_232" xml:space="preserve">
     <value>Menu geändert.</value>
   </data>
-  <data name="ChangeLog3_0_234" xml:space="preserve">
+  <data name="ChangeLog_3_0_234" xml:space="preserve">
     <value>Tarifinfo-Seite wird wieder korrekt angezeigt.
 Fehlerhandling verbessert.</value>
   </data>
-  <data name="ChangeLog3_0_235" xml:space="preserve">
+  <data name="ChangeLog_3_0_235" xml:space="preserve">
     <value>Veraltetes Objekt durch aktuelles ersetzt.</value>
   </data>
-  <data name="ErrorOpenLockTitle" xml:space="preserve">
-    <value>Fehler beim Öffnen des Schlosses!</value>
-  </data>
-  <data name="ChangeLog3_0_236" xml:space="preserve">
+  <data name="ChangeLog_3_0_236" xml:space="preserve">
     <value>Anzeige von Stationsnamen statt Nummern.
 Fehlermeldung beim Öffnen von Schloss verbessert.
 Layout Anzeige Radnamen und nummern verbessert.</value>
   </data>
-  <data name="ChangeLog3_0_237" xml:space="preserve">
+  <data name="ChangeLog_3_0_237" xml:space="preserve">
     <value>Hard- und software information werden an Backend übermittelt bei Radrückgabe.</value>
   </data>
-  <data name="ChangeLog3_0_239" xml:space="preserve">
+  <data name="ChangeLog_3_0_239" xml:space="preserve">
     <value>Fehlerbehebung: Radname wird wieder korrekt angezeigt.</value>
   </data>
   <data name="MarkingFindBike" xml:space="preserve">
@@ -589,7 +520,7 @@ Layout Anzeige Radnamen und nummern verbessert.</value>
   <data name="ActivityTextFindBikeLoadingBikes" xml:space="preserve">
     <value>Lade Räder...</value>
   </data>
-  <data name="ChangeLog3_0_240" xml:space="preserve">
+  <data name="ChangeLog_3_0_240" xml:space="preserve">
     <value>Wahl eines Rads über die Radnummer hinzugefügt.</value>
   </data>
   <data name="MarkingContactSupport" xml:space="preserve">
@@ -601,7 +532,7 @@ Layout Anzeige Radnamen und nummern verbessert.</value>
   <data name="MarkingContactNoStationInfoAvailableNoButton" xml:space="preserve">
     <value>Wählen Sie zunächst die Station, zu deren Betreiber Sie Kontakt aufnehmen möchten.</value>
   </data>
-  <data name="ChangeLog3_0_241" xml:space="preserve">
+  <data name="ChangeLog_3_0_241" xml:space="preserve">
     <value>Auf der Kontaktseite werden Kontaktinformationen betreiberspezifisch angezeigt.</value>
   </data>
   <data name="MarkingSelectStationPage" xml:space="preserve">
@@ -613,7 +544,7 @@ Layout Anzeige Radnamen und nummern verbessert.</value>
   <data name="MarkingContactPageTitle" xml:space="preserve">
     <value>Kontakt</value>
   </data>
-  <data name="ChangeLog3_0_242" xml:space="preserve">
+  <data name="ChangeLog_3_0_242" xml:space="preserve">
     <value>Seite zur Auswahl einer Station hinzugefügt zum Abrufen von Kontaktinformationen.</value>
   </data>
   <data name="MessagePhoneMail" xml:space="preserve">
@@ -631,7 +562,7 @@ Layout Anzeige Radnamen und nummern verbessert.</value>
   <data name="MiniSurveyEnterAnswer" xml:space="preserve">
     <value>Bitte Antwort hier eingeben.</value>
   </data>
-  <data name="ChangeLog3_0_243" xml:space="preserve">
+  <data name="ChangeLog_3_0_243" xml:space="preserve">
     <value>Miniumfrage implementiert.
 Kleinere Verbesserungen.</value>
   </data>
@@ -641,14 +572,11 @@ Kleinere Verbesserungen.</value>
   <data name="ActivityTextQueryLocation" xml:space="preserve">
     <value>Abfrage Standort...</value>
   </data>
-  <data name="MessageErrorQueryLocationTitle" xml:space="preserve">
-    <value>Fehler bei Standortabfrage!</value>
+  <data name="ErrorQueryLocationTitle" xml:space="preserve">
+    <value>Standort konnte nicht bestimmt werden!</value>
   </data>
-  <data name="MessageErrorQueryLocationMessage" xml:space="preserve">
-    <value>Schloss schließen und Miete beenden ist nicht möglich.</value>
-  </data>
-  <data name="MessageErrorQueryLocationStartTitle" xml:space="preserve">
-    <value>Fehler beim Start der Standortabfrage!</value>
+  <data name="ErrorQueryLocationStartTitle" xml:space="preserve">
+    <value>Standortabfrage konnte nicht gestartet werden!</value>
   </data>
   <data name="ActivityTextErrorQueryLocationWhenAny" xml:space="preserve">
     <value>Keine Standortinfo verfügbar. Aktivieren Sie die Standortdienste Ihres Geräts.</value>
@@ -663,45 +591,42 @@ Kleinere Verbesserungen.</value>
     <value>Start Standortabfrage...</value>
   </data>
   <data name="QuestionCloseLockAndReturnBike" xml:space="preserve">
-    <value>Rad {0} abschließen und Miete beenden?</value>
+    <value>Fahrrad {0} abschließen und Miete beenden?</value>
   </data>
   <data name="QuestionReturnBike" xml:space="preserve">
-    <value>Miete von Rad {0} beenden?
+    <value>Miete von Fahrrad {0} beenden?
 </value>
   </data>
   <data name="ActivityTextReturningBike" xml:space="preserve">
     <value>Beende Miete...</value>
   </data>
   <data name="QuestionOpenLockAndBookBike" xml:space="preserve">
-    <value>Rad {0} mieten und Schloss öffnen?</value>
+    <value>Fahrrad {0} mieten und Schloss öffnen?</value>
   </data>
-  <data name="ErrorReturnBikeNoWebMessage" xml:space="preserve">
-    <value>Um die Miete zu beenden, wird Internet benötigt. Bitte stellen Sie eine Internetverbindung her!</value>
+  <data name="ErrorNoWeb" xml:space="preserve">
+    <value>Es wird eine stabile Internetverbindung benötigt. Verbinden Sie sich mit WIFI oder Mobilem Netzwerk und aktivieren Sie Mobile Daten. Versuchen Sie erneut.</value>
   </data>
-  <data name="ErrorReturnBikeNoWebTitle" xml:space="preserve">
-    <value>Verbingungsfehler beim Beenden der Miete!</value>
-  </data>
-  <data name="ChangeLog3_0_244" xml:space="preserve">
+  <data name="ChangeLog_3_0_244" xml:space="preserve">
     <value>Abschließen von Rad und Radrückgabe beschleunigt.</value>
   </data>
-  <data name="ChangeLog3_0_249" xml:space="preserve">
+  <data name="ChangeLog_3_0_249" xml:space="preserve">
     <value>Komponenten von Fremdanbietern aktualisiert.</value>
   </data>
   <data name="MarkingBikesAtStationStationId" xml:space="preserve">
     <value>ID: {0}</value>
   </data>
-  <data name="ChangeLog3_0_250" xml:space="preserve">
+  <data name="ChangeLog_3_0_250" xml:space="preserve">
     <value>Anzeige Stationskennung.
 Kartenzentrierfehler behoben.
 Kleine Verbesserungen.</value>
   </data>
-  <data name="ChangeLog3_0_263" xml:space="preserve">
+  <data name="ChangeLog_3_0_263" xml:space="preserve">
     <value>Bei Fahrrädern mit GPS-Schloss wird die CO2-Einsparung nach der Rückgabe des Fahrrads angezeigt.</value>
   </data>
-  <data name="ChangeLog3_0_264" xml:space="preserve">
+  <data name="ChangeLog_3_0_264" xml:space="preserve">
     <value>Fehler  "object reference not set ...." &lt;a href="https://dev.azure.com/TeilRad/sharee.bike%20App/_workitems/edit/186"&gt;185&lt;/a&gt; behoben.</value>
   </data>
-  <data name="ChangeLog3_0_265" xml:space="preserve">
+  <data name="ChangeLog_3_0_265" xml:space="preserve">
     <value>Filterfunktion Stadtrad/ Lastenrad verbessert.
 Layouting verbessert.
 Deep linking wird unterstützt.</value>
@@ -715,49 +640,37 @@ Deep linking wird unterstützt.</value>
   <data name="MessageBikesManagementTariffDescriptionTariffHeaderNameId" xml:space="preserve">
     <value>Tarif {0}, Nr. {1}</value>
   </data>
-  <data name="ChangeLog3_0_266" xml:space="preserve">
+  <data name="ChangeLog_3_0_266" xml:space="preserve">
     <value>Abfrage Erlaubnis für Zugriff azf Standort verbessert.</value>
   </data>
-  <data name="ChangeLog3_0_276" xml:space="preserve">
+  <data name="ChangeLog_3_0_276" xml:space="preserve">
     <value>Link auf Betreiber-AGB wird bei Bedarf angezeigt.
 Anzeige von Statusinformationen erweitert.
 Fehlerbehebung: Supportmails können wieder verschickt werden.</value>
   </data>
-  <data name="MessageMapPageErrorSwitch" xml:space="preserve">
+  <data name="ErrorMapPageSwitchBikeType" xml:space="preserve">
     <value>Beim Umschalten zwischen Lasten- und Stadträdern ist ein Fehler aufgetreten.
 {0}</value>
   </data>
-  <data name="MessageErrorSelectBikeNoBikeFound" xml:space="preserve">
-    <value>Kein Rad mit ID {0} gefunden. Möglicherweise ist es bereits durch einen anderen Nutzer / eine andere Nutzerin reserviert oder defekt.</value>
+  <data name="ErrorSelectBikeNoBikeFound" xml:space="preserve">
+    <value>Das Fahrrad mit ID {0} ist möglicherweise bereits durch einen anderen Nutzer / eine andere Nutzerin reserviert oder defekt.</value>
   </data>
-  <data name="MessageErrorSelectBikeTitle" xml:space="preserve">
-    <value>Fehler beim Auswählen des Rads!</value>
+  <data name="ErrorSelectBikeTitle" xml:space="preserve">
+    <value>Das angefragte Fahrrad wurde nicht gefunden.</value>
   </data>
-  <data name="ChangeLog3_0_277" xml:space="preserve">
+  <data name="ChangeLog_3_0_277" xml:space="preserve">
     <value>Fehlerbehebung: App schließt sich nicht mehr auf Fahrrad Wählen-Seite.</value>
   </data>
-  <data name="ErrorBookedSearchMessageEscalationLevel1" xml:space="preserve">
-    <value>Ihr mobiles Gerät verbindet sich immer noch nicht mit dem Schloss. Bitte starten Sie die App oder sogar Ihr mobiles Gerät neu und wiederholen Sie den Vorgang.</value>
-  </data>
   <data name="MessageAnswerCancel" xml:space="preserve">
     <value>Abbrechen</value>
   </data>
   <data name="MessageAnswerRetry" xml:space="preserve">
     <value>Wiederholen</value>
   </data>
-  <data name="MessageConnectLockErrorTitle" xml:space="preserve">
-    <value>Fehler beim Verbinden mit Schloss!</value>
+  <data name="ErrorConnectLockTitle" xml:space="preserve">
+    <value>Es konnte keine Verbindung zum Schloss aufgebaut werden.</value>
   </data>
-  <data name="ErrorBookedSearchMessageEscalationLevel2" xml:space="preserve">
-    <value>Es kann weiterhin keine Verbindung zwischen Ihrem mobilen Gerät und dem Schloss aufgebaut werden. Rufen Sie den Betreiber an!
-
-Alternativ: 
-1. App schließen,
-2. auf den Knopf oben am Schloss kurz drücken und sofort loslassen, sobald Knopf zu blinken beginnt,
-3. sicherstellen, dass das Schloss vollständig geschlossen ist und geschlossen bleibt. 
-4. E-Mail an Betreiber schicken (ansonsten läuft Ihre kostenpflichtige Miete weiter!): Bitte Problembeschreibung, Rad-ID und Abgabestation angeben.</value>
-  </data>
-  <data name="ChangeLog3_0_278" xml:space="preserve">
+  <data name="ChangeLog_3_0_278" xml:space="preserve">
     <value>Hinweise hinzugefügt, um das Schließen des Schlosses zu erleichtern, falls dies nicht beim ersten Versuch gelingt.</value>
   </data>
   <data name="ActivityTextLockIsOutOfReach" xml:space="preserve">
@@ -766,83 +679,51 @@ Alternativ:
   <data name="ActivityTextLockNotFound" xml:space="preserve">
     <value>Schloss nicht gefunden</value>
   </data>
-  <data name="ErrorFindLockRentedBikeOutOfReachMessage" xml:space="preserve">
-    <value>Schloss kann erst gefunden werden, wenn gemietetes Rad in der Nähe ist.</value>
+  <data name="ErrorLockNoStatus" xml:space="preserve">
+    <value>Schlossstatus konnte nicht ermittelt werden. Bitte kontaktieren Sie den Kundensupport.</value>
   </data>
-  <data name="ErrorFindLockReservedBikeOutOfReachMessage" xml:space="preserve">
-    <value>Schloss kann erst gefunden werden, wenn reserviertes Rad in der Nähe ist.</value>
+  <data name="ErrorLockBluetoothNotOn" xml:space="preserve">
+    <value>Aktivieren Sie Bluetooth und versuchen Sie es erneut.</value>
   </data>
-  <data name="MessageErrorConnectTitle" xml:space="preserve">
-    <value>Fehler beim Verbinden mit Schloss!</value>
+  <data name="ErrorLockLocationOff" xml:space="preserve">
+    <value>Aktivieren Sie Ihre Standortdienste und versuchen Sie es erneut.</value>
   </data>
-  <data name="ErrorConnectLockGeneralErrorMessage" xml:space="preserve">
-    <value>Kommunikationsfehler bei Schlosssuche.</value>
-  </data>
-  <data name="ErrorConnectLockRentedBikeNoWebMessage" xml:space="preserve">
-    <value>Internet muss erreichbar sein, um Verbindung mit Schloss für gemietetes Rad herzustellen. Bitte stellen Sie eine Internetverbindung her!</value>
-  </data>
-  <data name="ErrorConnectLockReservedBikeNoWebMessage" xml:space="preserve">
-    <value>Internet muss erreichbar sein, um Verbindung mit Schloss für reserviertes Rad herzustellen. Bitte stellen Sie eine Internetverbindung her!</value>
-  </data>
-  <data name="ErrorFindLockReservedBikeNoStausMessage" xml:space="preserve">
-    <value>Schlossstatus des reservierten Rads konnte nicht ermittelt werden.</value>
-  </data>
-  <data name="ErrorFindLockBluetoothNotOn" xml:space="preserve">
-    <value>Bitte Bluetooth anschalten, anderenfalls ist eine Verbindung mit dem Schloss nicht möglich.</value>
-  </data>
-  <data name="ErrorFindLockLocationPermissionMissing" xml:space="preserve">
-    <value>Bitte Standortfreigabe erteilen, anderenfalls ist eine Verbindung mit dem Schloss nicht möglich.
-
-</value>
-  </data>
-  <data name="ErrorFindLockLocationOff" xml:space="preserve">
-    <value>Bitte Standortdienste aktivieren, anderenfalls ist eine Verbindung mit dem Schloss nicht möglich.</value>
-  </data>
-  <data name="ChangeLog3_0_280" xml:space="preserve">
+  <data name="ChangeLog_3_0_280" xml:space="preserve">
     <value>Fehlermeldungen verbessert für die Fälle, dass 
 - Bluetooth deaktiviert ist, 
 - die Standortfreigabe nicht erteilt wurde oder 
 - die Standorterkennung deaktiviert ist.</value>
   </data>
-  <data name="ErrorReservedSearchMessageEscalationLevel1" xml:space="preserve">
-    <value>Ihr mobiles Gerät verbindet sich weiterhin nicht mit dem Schloss. Bitte starten Sie die App oder sogar Ihr mobiles Gerät neu und wiederholen Sie den Vorgang.</value>
-  </data>
-  <data name="ChangeLog3_0_282" xml:space="preserve">
+  <data name="ChangeLog_3_0_282" xml:space="preserve">
     <value>Freigabe-Erlaubnisanfragen unter iOS ausführlicher formuliert.
 Hinweise, um das Verbinden Schlosses zu erleichtern, falls dies nicht beim ersten Versuch gelingt, erweitert.</value>
   </data>
-  <data name="ExceptionTextSessionExpired" xml:space="preserve">
-    <value>Die Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.</value>
-  </data>
   <data name="ActivityTextAuthcookieNotDefinedException" xml:space="preserve">
     <value>Auth. abgelaufen</value>
   </data>
-  <data name="ChangeLog3_0_284" xml:space="preserve">
+  <data name="ChangeLog_3_0_284" xml:space="preserve">
     <value>Anzeige einer benutzerfreundlichen Meldung, wenn die Authentifizierung abgelaufen ist.</value>
   </data>
-  <data name="MessageAccountPageManageLogout" xml:space="preserve">
+  <data name="MarkingAccountPageManageLogout" xml:space="preserve">
     <value>Abmelden</value>
   </data>
-  <data name="MessageAccountPageManagePersonalData" xml:space="preserve">
+  <data name="MarkingAccountPageManagePersonalData" xml:space="preserve">
     <value>Persönliche Daten verwalten</value>
   </data>
-  <data name="ChangeLog3_0_285" xml:space="preserve">
+  <data name="ChangeLog_3_0_285" xml:space="preserve">
     <value>Framework aktualisiert. 
 Activity Indicator zu Konto-Verwaltungsseiten hinzugefügt und Logging erweitert.</value>
   </data>
   <data name="ActivityTextStartReturningBike" xml:space="preserve">
     <value>Starte Miete beenden...</value>
   </data>
-  <data name="ExceptionTextWebConnectFailureException" xml:space="preserve">
-    <value>Ist WLAN/Mobilfunknetz verfügbar und mobile Daten aktiviert?</value>
-  </data>
-  <data name="ChangeLog3_0_289" xml:space="preserve">
+  <data name="ChangeLog_3_0_289" xml:space="preserve">
     <value>Flyout-Menü Überschift verschönert.</value>
   </data>
-  <data name="ChangeLog3_0_290" xml:space="preserve">
+  <data name="ChangeLog_3_0_290" xml:space="preserve">
     <value>Der aktuelle Standort wird mit höherer Genauigkeit abgefragt.</value>
   </data>
-  <data name="ChangeLog3_0_293" xml:space="preserve">
+  <data name="ChangeLog_3_0_293" xml:space="preserve">
     <value>Target Android Framework von 11.0  auf 12.0 (Level 31 S) gesetzt.
 NuGet packages aktualisiert.
 Entwurf Unterstützung eines neuen Schlosstyps hinzugefügt.
@@ -870,19 +751,19 @@ Kleinere Fehlerbehebungen.
   <data name="MarkingWebsiteCaching" xml:space="preserve">
     <value>Zwischenspeicherung von Websiten</value>
   </data>
-  <data name="ChangeLog3_0_298" xml:space="preserve">
+  <data name="ChangeLog_3_0_298" xml:space="preserve">
     <value>Neue Wort-Bild-Marke in das Menü der Lastenrad Bayern App integriert.</value>
   </data>
-  <data name="ChangeLog3_0_299" xml:space="preserve">
+  <data name="ChangeLog_3_0_299" xml:space="preserve">
     <value>Fehlerbehebung: Bluetooth-Schlossansteuerung funktioniert wieder unter Android 12.</value>
   </data>
-  <data name="ChangeLog3_0_301" xml:space="preserve">
+  <data name="ChangeLog_3_0_301" xml:space="preserve">
     <value>Unterstützung erweiterte Tarife.</value>
   </data>
   <data name="MessageBikesManagementTariffDescriptionEuroPerMonth" xml:space="preserve">
     <value>€/Monat</value>
   </data>
-  <data name="ChangeLog3_0_312" xml:space="preserve">
+  <data name="ChangeLog_3_0_312" xml:space="preserve">
     <value>Für Lastenrad Bayern
 - fehlende Titeltexte werden angezeigt
 - neue Stationsmarker verfügbar
@@ -895,37 +776,28 @@ Kleinere Fehlerbehebungen.
   <data name="ErrorBikesAvailableResponseNotOk" xml:space="preserve">
     <value>Abfrage der verfügbaren Räder fehlgeschlagen.</value>
   </data>
-  <data name="ChangeLog3_0_318" xml:space="preserve">
+  <data name="ChangeLog_3_0_318" xml:space="preserve">
     <value>Neues Schloss unterstützt.</value>
   </data>
   <data name="ActionGiveFeedback" xml:space="preserve">
     <value>Rückmeldung geben</value>
   </data>
-  <data name="MessageReservingBikeErrorConnectionTitle" xml:space="preserve">
-    <value>Verbingungsfehler beim Reservieren des Rads!</value>
+  <data name="ErrorNoConnectionTitle" xml:space="preserve">
+    <value>Verbindung zum Buchungssystem nicht möglich.</value>
   </data>
-  <data name="MessageReservingBikeErrorGeneralTitle" xml:space="preserve">
-    <value>Fehler beim Reservieren des Rads!</value>
+  <data name="ErrorCancelReservationTitle" xml:space="preserve">
+    <value>Reservierung konnte nicht aufgehoben werden!</value>
   </data>
-  <data name="MessageCancelReservationBikeErrorGeneralTitle" xml:space="preserve">
-    <value>Fehler beim Aufheben der Reservierung!</value>
-  </data>
-  <data name="ErrorMessageInvalidAuthorizationResponseException" xml:space="preserve">
+  <data name="ErrorLoginInvalidAuthorization" xml:space="preserve">
     <value>Kann Benutzenden {0} nicht anmelden. Mailadresse unbekannt oder Passwort ungültig.</value>
   </data>
-  <data name="MessageCancelReservationBikeErrorConnectionTitle" xml:space="preserve">
-    <value>Verbingungsfehler beim Aufheben der Reservierung!</value>
-  </data>
-  <data name="MessageOpeningLockErrorConnectionTitle" xml:space="preserve">
-    <value>Verbindungsfehler beim Öffnen des Schlosses!</value>
-  </data>
   <data name="ActivityTextSubmittingFeedback" xml:space="preserve">
     <value>Sende Rückmeldung...</value>
   </data>
   <data name="MarkingFlyoutHeader" xml:space="preserve">
     <value>Menü</value>
   </data>
-  <data name="ChangeLog3_0_324" xml:space="preserve">
+  <data name="ChangeLog_3_0_324" xml:space="preserve">
     <value>Mein konrad Design verbessert.</value>
   </data>
   <data name="MarkingDriveBatteryChargingLevel" xml:space="preserve">
@@ -935,45 +807,45 @@ Kleinere Fehlerbehebungen.
     <value>Ladestand: -</value>
   </data>
   <data name="MarkingReturnBikeErrorDescriptionInputPlaceholder" xml:space="preserve">
-    <value>Bitte technischen Defekt des Rads hier beschreiben.</value>
+    <value>Bitte technischen Defekt des Fahrrads hier beschreiben.</value>
   </data>
   <data name="MarkingReturnBikeMainMessage" xml:space="preserve">
-    <value>Rad erfolgreich zurückgegeben!</value>
+    <value>Fahrrad erfolgreich zurückgegeben!</value>
   </data>
   <data name="MarkingDriveBatteryTitel" xml:space="preserve">
-    <value>Aktueller Akkuladestand:</value>
+    <value>&lt;b&gt;Akkuladestand&lt;/b&gt; vom Lenker-Display übertragen:</value>
   </data>
-  <data name="ChangeLog3_0_326" xml:space="preserve">
+  <data name="ChangeLog_3_0_326" xml:space="preserve">
     <value>Für Mein konrad Nutzer: Anzeige des Akkuladestands für E-Bikes und Abfrage des Ladestands nach Radrückgabe.</value>
   </data>
   <data name="StatusTextLowBatteryLevel" xml:space="preserve">
     <value>Die verbleibende Ladung des Fahrradakkus war zuletzt niedrig. Bitte überprüfen Sie diese vor der Fahrt auf dem Fahrraddisplay. Die Miete kann innerhalb 5 Minuten kostenlos abgebrochen werden.</value>
   </data>
   <data name="StatusTextCopriLock" xml:space="preserve">
-    <value>Zur Fahrpause schließen Sie das Schloss manuell, nicht über die App. Zum Beenden der kostenpflichtigen Miete schieben Sie das Rad in eine zugelassene Station und bestätigen das Mietende in der App; das Schloss schließt automatisch.</value>
+    <value>Zur Fahrpause schließen Sie das Schloss manuell, nicht über die App. Zum Beenden der kostenpflichtigen Miete schieben Sie das Fahrrad in eine zugelassene Station und bestätigen das Mietende in der App; das Schloss schließt automatisch.</value>
   </data>
-  <data name="ChangeLog3_0_335" xml:space="preserve">
+  <data name="ChangeLog_3_0_335" xml:space="preserve">
     <value>Sharee.bike Design verbessert.</value>
   </data>
-  <data name="ChangeLog3_0_334" xml:space="preserve">
+  <data name="ChangeLog_3_0_334" xml:space="preserve">
     <value>Für Lastenrad Bayern Nutzende: Akkuladestand für E-Bikes wird angezeigt.</value>
   </data>
-  <data name="ChangeLog3_0_337_MK" xml:space="preserve">
-    <value>Sie werden nun informiert, wenn die Ladung des Radakkus zuletzt als sehr niedrig angegeben wurde. Um die Zuverlässigkeit der Akkustandanzeige in der App zu gewährleisten, geben Sie bitte am Ende Ihrer Fahrt mit einem E-Lastenrad den aktuellen Ladestand in die App ein.</value>
+  <data name="ChangeLog_3_0_337_MK" xml:space="preserve">
+    <value>Sie werden nun informiert, wenn die Ladung des Fahrradakkus zuletzt als sehr niedrig angegeben wurde. Um die Zuverlässigkeit der Akkustandanzeige in der App zu gewährleisten, geben Sie bitte am Ende Ihrer Fahrt mit einem E-Lastenrad den aktuellen Ladestand in die App ein.</value>
   </data>
-  <data name="ChangeLog3_0_337_SB" xml:space="preserve">
+  <data name="ChangeLog_3_0_337_SB" xml:space="preserve">
     <value>Die App hat ein neues Design! --- Sie sind Beta-Tester? Geben Sie uns jederzeit hilfreiche Rückmeldung über 'Kontakt - Rückmeldung zur App'. Sie sind noch kein Beta-Tester? Werden Sie es und erhalten Sie tolle neue Features vor allen anderen!</value>
   </data>
   <data name="ChangeLog_MinorBugFixes" xml:space="preserve">
     <value>- Wir haben ein paar kleine Fehler behoben. Genießen Sie die Fahrt!</value>
   </data>
-  <data name="ChangeLog3_0_338_LB_MK" xml:space="preserve">
+  <data name="ChangeLog_3_0_338_LB_MK" xml:space="preserve">
     <value>Neben kleineren Fehlerbehebungen haben wir die Kontaktaufnahme vereinfacht:
 - Bei akuten Fragen/Problemen zum Rad bzw. Mietvorgang bitte den Flottenbetreiber kontaktieren.
 - Für eine Kommunikation mit den App-Entwicklern, wählen Sie "Rückmeldung zur App".
 Um Prozesse in der App besser analysieren und verbessern zu können, akzeptieren Sie bitte das Anhängen Ihrer Protokolldatei an Ihre Nachricht. Wir freuen uns sowohl über kritische als auch über positive Rückmeldungen!</value>
   </data>
-  <data name="ChangeLog3_0_338_SB" xml:space="preserve">
+  <data name="ChangeLog_3_0_338_SB" xml:space="preserve">
     <value>Neben kleineren Fehlerbehebungen haben wir die Kontaktaufnahme vereinfacht: 
 - Bei akuten Fragen/Problemen zum Rad bzw. Mietvorgang bitte den Flottenbetreiber kontaktieren.
 - Für eine Kommunikation mit den App-Entwicklern, wählen Sie "Rückmeldung zur App".
@@ -987,21 +859,18 @@ Außerdem: Kleine Grafiken lassen auf einen Blick erkennen um was für einen Rad
   <data name="SupportmailSubjectOperatormail" xml:space="preserve">
     <value>{0}-Anfrage: Station {1}</value>
   </data>
-  <data name="QuestionSupportmailAnswerNo" xml:space="preserve">
-    <value>Nein, Datei nicht anhängen</value>
-  </data>
-  <data name="QuestionSupportmailTitle" xml:space="preserve">
+  <data name="QuestionSupportmailAttachmentTitle" xml:space="preserve">
     <value>Einwilligung</value>
   </data>
   <data name="PlaceholderFindBike" xml:space="preserve">
     <value>Präfix und Nr., z.B. TR15</value>
   </data>
-  <data name="ChangeLog3_0_339_MK" xml:space="preserve">
+  <data name="ChangeLog_3_0_339_MK" xml:space="preserve">
     <value>Die Lastenräder aus den Vororten zeigen nun ihre Heimatstation im Namen an. Diese Räder müssen dort wieder abgeben werden!
 
 Sie können nun auf einen Blick sehen, welche App-Version Sie installiert haben: im Menü ganz unten. Bitte aktualisieren Sie die App regelmäßig, um in Funktionalität und Design auf dem neuesten Stand zu sein!</value>
   </data>
-  <data name="ChangeLog3_0_339_SB_LB" xml:space="preserve">
+  <data name="ChangeLog_3_0_339_SB_LB" xml:space="preserve">
     <value>Sie können nun auf einen Blick sehen, welche App-Version Sie installiert haben: im Menü ganz unten. Bitte aktualisieren Sie die App regelmäßig, um in Funktionalität und Design auf dem neuesten Stand zu sein!</value>
   </data>
   <data name="ChangeLog_MinorDesignImprovements" xml:space="preserve">
@@ -1045,9 +914,6 @@ Kleinere Verbesserungen.&lt;br/&gt;
 
 </value>
   </data>
-  <data name="ErrorNotConnectedToNetwork" xml:space="preserve">
-    <value>Keine Verbindung zum Netzwerk.</value>
-  </data>
   <data name="ChangeLog_3_0_347_SB" xml:space="preserve">
     <value>&lt;i&gt;Rad auswählen&lt;/i&gt;- Seite überarbeitet.&lt;br/&gt;
 Einstellung hinzugefügt mit der festgelegt werden kann, ob die App mit der Seite
@@ -1071,7 +937,7 @@ Beim Login können Sie nun Ihr eingegebenes Passwort einsehen.&lt;br/&gt;
 &lt;br/&gt;
 Probieren Sie es aus!</value>
   </data>
-  <data name="MessageErrorLocationIsOff" xml:space="preserve">
+  <data name="ErrorMapCenterLocationIsOff" xml:space="preserve">
     <value>Schalten Sie die Standortdienste Ihres Geräts ein, um die Karte auf Ihren aktuellen Standort zu zentrieren.</value>
   </data>
   <data name="ChangeLog_3_0_353_MK_SB" xml:space="preserve">
@@ -1096,28 +962,17 @@ Probieren Sie es aus!</value>
   <data name="MarkingMyBikesNoBikesReservedRented" xml:space="preserve">
     <value>Momentan sind keine Räder von Nutzer {0} reserviert/gemietet.</value>
   </data>
-  <data name="MessageTitleInformation" xml:space="preserve">
-    <value>Information</value>
-  </data>
   <data name="ChangeLog_MinorImprovements" xml:space="preserve">
     <value>- Kleine Verbesserungen.</value>
   </data>
-  <data name="ErrorOpenLockBoldStatusIsUnknownMessage" xml:space="preserve">
-    <value>Das Schloss konnte nicht korrekt geöffnet werden. Bitte versuchen Sie es erneut.
-
-Achtung! Ihre Miete hat bereits begonnen.
-
-Wenn sich das Schloss weiterhin nicht öffnen lässt, vergewissern Sie sich, dass das Schloss geschlossen ist und geben Sie das Rad zurück. 
-Wichtig: Schicken Sie eine E-Mail an den Betreiber (ansonsten läuft Ihre kostenpflichtige Miete weiter!): Problembeschreibung, Radnummer, Abgabestation.</value>
+  <data name="ErrorOpenLockStatusUnknown" xml:space="preserve">
+    <value>Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder geöffnet sein. Bitte versuchen Sie es erneut!</value>
   </data>
-  <data name="ErrorOpenLockStillClosedTitle" xml:space="preserve">
-    <value>Schloss kann nicht geöffnet werden!</value>
+  <data name="ErrorOpenLockTitle" xml:space="preserve">
+    <value>Schloss konnte nicht geöffnet werden!</value>
   </data>
-  <data name="ErrorOpenLockBoldIsBlockedMessage" xml:space="preserve">
-    <value>Stellen Sie sicher, dass kein Hindernis das Öffnen des Schlosses verhindert und versuchen Sie es erneut.</value>
-  </data>
-  <data name="MarkingNoNetworkConnection" xml:space="preserve">
-    <value>Ups, es ist keine Internetverbindung vorhanden.</value>
+  <data name="ErrorOpenLockBoldBlocked" xml:space="preserve">
+    <value>Der Schlossbügel ist blockiert. Stellen Sie sicher, dass keine Speiche gegen den Bügel drückt und versuchen Sie es erneut.</value>
   </data>
   <data name="ChangeLog_3_0_358_MK_SB" xml:space="preserve">
     <value>Neue Funktionen:&lt;ul&gt;&lt;li&gt;Wenn Ihr Gerät nicht mit dem Internet verbunden ist, wird dies nun oben angezeigt.&lt;/li&gt;&lt;li&gt;Sie können jetzt Ihre Fahrradansicht aktualisieren, indem Sie von oben nach unten ziehen. Das ist besonders nützlich, wenn Sie sich wieder mit dem Internet verbunden haben.&lt;/li&gt;&lt;/ul&gt;
@@ -1126,19 +981,13 @@ Wichtig: Schicken Sie eine E-Mail an den Betreiber (ansonsten läuft Ihre kosten
   <data name="ChangeLog_3_0_361_MK_SB" xml:space="preserve">
     <value>Wenn Sie ein Rad reserviert oder gemietet haben, wird dies Ihnen nun auf der Kartenseite als Symbol angezeigt. Ein Klick darauf führt Sie direkt zur Seite 'Meine Räder'. Wir haben außerdem kleine Designänderungen vorgenommen.</value>
   </data>
-  <data name="ErrorReturnBikeLockClosedStartGetGPSExceptionMessage" xml:space="preserve">
-    <value>Beenden der Miete an unbekanntem Standort is nicht möglich.
-Fehler beim Start der Standortabfrage!</value>
+  <data name="ErrorNoLocationPermission" xml:space="preserve">
+    <value>Erteilen Sie die Standortberechtigung, aktivieren Sie die Standortdienste und versuchen Sie es erneut.</value>
   </data>
-  <data name="ErrorReturnBikeLockClosedGetGPSExceptionMessage" xml:space="preserve">
-    <value>Beenden der Miete an unbekanntem Standort is nicht möglich.
-Stellen Sie sicher, dass Sie die Erlaubnis zur Standortfreigabe erteilt haben und Ihre Standortdienste aktiviert sind.
-Versuchen Sie erneut!</value>
-  </data>
-  <data name="Error_ReturnBike_Station_Location_Message" xml:space="preserve">
-    <value>Wir konnten das Rad keiner Station zuordnen. Dazu benötigen wir Ihre Standortinformationen, während Sie direkt neben dem Rad stehen. Nur dann kann Ihre Miete beendet werden!
+  <data name="ErrorEndRentalNotAtSuitableStation" xml:space="preserve">
+    <value>Wir konnten das Fahrrad keiner Station zuordnen. Dazu benötigen wir Ihre Standortinformationen, während Sie direkt neben dem Fahrrad stehen. Nur dann kann Ihre Miete beendet werden!
 
-Treten Sie an das Rad heran, schalten Sie Bluetooth und Standortdienste ein und versuchen Sie es erneut.</value>
+Treten Sie an das Fahrradschloss heran, schalten Sie Bluetooth und Standortdienste ein und versuchen Sie es erneut.</value>
   </data>
   <data name="ChangeLog_3_0_362_MK_SB" xml:space="preserve">
     <value>Einige Bezeichnungen wurden vereinheitlicht, z.B:&lt;br/&gt;
@@ -1159,16 +1008,16 @@ Außerdem:&lt;br/&gt;
 - Paketaktualisierungen</value>
   </data>
   <data name="MarkingFindBikeLabel" xml:space="preserve">
-    <value>Rad-ID</value>
+    <value>Fahrrad-ID</value>
   </data>
   <data name="MarkingSearchBike" xml:space="preserve">
     <value>Rad suchen</value>
   </data>
   <data name="MarkingReturnBikeBikeIsStateOkQuestion" xml:space="preserve">
-    <value>Ist das Rad in Ordnung?</value>
+    <value>Fahrrad ist in Ordnung?</value>
   </data>
   <data name="MarkingReturnBikeBikeStateIsOK" xml:space="preserve">
-    <value>Rad ist in Ordnung</value>
+    <value>Fahrrad ist in Ordnung</value>
   </data>
   <data name="MarkingReturnBikeFeedbackInputPlaceholder" xml:space="preserve">
     <value>Bei Bedarf bitte hier Rückmeldung eingeben.</value>
@@ -1191,8 +1040,40 @@ Außerdem:&lt;br/&gt;
   <data name="ChangeLog_3_0_366_MK_SB" xml:space="preserve">
     <value>Auf der Seite "Rad auswählen" können Sie nun nacheinander mehrere Räder suchen und mieten. Im Anschluss finden Sie diese unter "Meine Räder".</value>
   </data>
-  <data name="ErrorQueryGeolocation" xml:space="preserve">
-    <value>Standortabfrage fehlgeschlagen</value>
+  <data name="MessageRentalProcessEndRentalFinishedText" xml:space="preserve">
+    <value>Die Mietkosten werden in den nächsten Tagen automatisch abgebucht. Sorgen Sie für ausreichende Kontodeckung. Ihre Miethistorie können Sie unter Konto einsehen.
+
+Vielen Dank für Ihre Fahrt!</value>
+  </data>
+  <data name="MessageRentalProcessEndRentalFinishedTitle" xml:space="preserve">
+    <value>Miete ist beendet</value>
+  </data>
+  <data name="MessageAnswerEndRentalOfMoreBikes" xml:space="preserve">
+    <value>Weitere Mieten beenden</value>
+  </data>
+  <data name="MessageAnswerFinished" xml:space="preserve">
+    <value>Fertig</value>
+  </data>
+  <data name="MarkingRentalProcessCloseLockStepGPS" xml:space="preserve">
+    <value>GPS-Daten werden abgefragt.</value>
+  </data>
+  <data name="MarkingRentalProcessCloseLockStepCloseLock" xml:space="preserve">
+    <value>Schloss schließt.</value>
+  </data>
+  <data name="MarkingRentalProcessCloseLockStepUpload" xml:space="preserve">
+    <value>Status wird synchronisiert.</value>
+  </data>
+  <data name="MarkingRentalProcessEndRentalStepGPS" xml:space="preserve">
+    <value>Fahrrad wird Station zugeordnet.</value>
+  </data>
+  <data name="MarkingRentalProcessEndRentalStepFeedback" xml:space="preserve">
+    <value>Geben Sie Rückmeldung zum Fahrrad.</value>
+  </data>
+  <data name="MarkingRentalProcessEndRentalStepUpload" xml:space="preserve">
+    <value>Status wird synchronisiert.</value>
+  </data>
+  <data name="ChangeLog_3_0_367_MK_SB" xml:space="preserve">
+    <value>Änderungen beim Rückgabeprozess: ZUERST müssen Sie immer den Vorgang "Schloss schließen" abschließen. Erst DANN können Sie die Miete beenden! Wurde Ihre Miete erfolgreich beendet, sehen Sie einen Bestätigungsdialog.</value>
   </data>
   <data name="MarkingContactCustomerSupportTitle" xml:space="preserve">
     <value>Kundensupport</value>
@@ -1214,4 +1095,147 @@ Außerdem:&lt;br/&gt;
  &lt;ul&gt;&lt;li&gt;Bitte kontaktieren Sie bei Problemen bei der Fahrradmiete umgehend den Kundensupport!
 &lt;/li&gt;&lt;li&gt;Für die Diagnose eines Problems können Sie über "Diagnosedatei übermitteln" Ihre App-Nutzungsdaten an uns senden. Ohne Ihr aktives Zusenden zeichnen wir keine Ihrer Daten auf!&lt;/li&gt;&lt;/ul&gt;</value>
   </data>
+  <data name="StatusTextLockClosed" xml:space="preserve">
+    <value>Schloss ist geschlossen</value>
+  </data>
+  <data name="StatusTextLockOpened" xml:space="preserve">
+    <value>Schloss ist offen</value>
+  </data>
+  <data name="StatusTextRentalEnded" xml:space="preserve">
+    <value>Miete ist beendet</value>
+  </data>
+  <data name="MarkingRentalProcessCloseLockObserve" xml:space="preserve">
+    <value>Beobachten Sie das Schloss beim Schließen!</value>
+  </data>
+  <data name="MarkingRentalProcessEndRentalWait" xml:space="preserve">
+    <value>Warten Sie auf die Mietende-Bestätigung!</value>
+  </data>
+  <data name="MessageAnswerContactSupport" xml:space="preserve">
+    <value>Support kontaktieren</value>
+  </data>
+  <data name="MessageRentalProcessCloseLockFinishedText" xml:space="preserve">
+    <value>Fahrrad ist geparkt. Ihre kostenpflichtige Miete läuft weiter!</value>
+  </data>
+  <data name="MessageRentalProcessCloseLockFinishedTitle" xml:space="preserve">
+    <value>Schloss ist geschlossen</value>
+  </data>
+  <data name="MessageRentalProcessCloseLockNotClosedText" xml:space="preserve">
+    <value>Versuchen Sie es bitte erneut oder kontaktieren Sie den Kundensupport.</value>
+  </data>
+  <data name="MessageRentalProcessCloseLockNotClosedTitle" xml:space="preserve">
+    <value>Schloss ist offen!</value>
+  </data>
+  <data name="QuestionRentalProcessCloseLockContinueRentalAnswer" xml:space="preserve">
+    <value>Fahrrad parken</value>
+  </data>
+  <data name="QuestionRentalProcessCloseLockEndOrContinueText" xml:space="preserve">
+    <value>Möchten Sie das Fahrrad parken, um später weiterzufahren, oder wollen Sie das Fahrrad jetzt zurückgeben und die Miete beenden?</value>
+  </data>
+  <data name="QuestionRentalProcessCloseLockEndOrContinueTitle" xml:space="preserve">
+    <value>Bitte entscheiden Sie</value>
+  </data>
+  <data name="QuestionRentalProcessCloseLockEndRentalAnswer" xml:space="preserve">
+    <value>Miete beenden</value>
+  </data>
+  <data name="MarkingRentalProcessCloseLockCheckLock" xml:space="preserve">
+    <value>Schauen Sie, ob das Schloss wirklich zu ist!</value>
+  </data>
+  <data name="SupportmailSubjectAppmailWithStation" xml:space="preserve">
+    <value>{0}-App Anfrage: Station {1}</value>
+  </data>
+  <data name="ErrorConnectLock" xml:space="preserve">
+    <value>Bitte treten Sie so nah wie möglich an das Fahrradschloss heran und versuchen Sie es erneut.</value>
+  </data>
+  <data name="ErrorCloseLockBoltBlocked" xml:space="preserve">
+    <value>Der Schlossbügel ist blockiert. Vergewissern Sie sich, dass keine Speiche oder ein anderes Hindernis das Schließen des Schlosses verhindert, und versuchen Sie es erneut.</value>
+  </data>
+  <data name="MessageHintTitle" xml:space="preserve">
+    <value>Hinweis</value>
+  </data>
+  <data name="ErrorLockOutOfReach" xml:space="preserve">
+    <value>Stellen Sie sicher, dass Sie der App die Bluetooth-Freigabe erteilt haben. Treten Sie so nah wie möglich an das Fahrradschloss heran und versuchen Sie es erneut.</value>
+  </data>
+  <data name="ErrorCloseLock" xml:space="preserve">
+    <value>Treten Sie nah an das Schloss heran und versuchen Sie es erneut oder melden Sie das Fahrrad dem Betreiber!
+{0}</value>
+  </data>
+  <data name="ErrorConnectLockEscalationLevel1" xml:space="preserve">
+    <value>Ihr mobiles Gerät verbindet sich immer noch nicht mit dem Fahrradschloss. Bitte starten Sie die App oder sogar Ihr mobiles Gerät neu und wiederholen Sie den Vorgang.</value>
+  </data>
+  <data name="ErrorConnectLockEscalationLevel2" xml:space="preserve">
+    <value>Es ist immer noch nicht möglich, eine Verbindung zwischen Ihrem mobilen Gerät und dem Fahrradschloss herzustellen. Bitte kontaktieren Sie den Kundensupport!
+
+Alternativ:
+1. App schließen,
+2. Drücken Sie kurz auf den Knopf oben am Schloss und lassen Sie ihn los, sobald er zu blinken beginnt,
+3. sicherstellen, dass das Schloss vollständig geschlossen ist und bleibt.
+4. E-Mail an den Kundensupport senden (sonst wird die kostenpflichtige Miete fortgesetzt!): Bitte Problembeschreibung, Fahrrad-ID und Rückgabestation angeben.</value>
+  </data>
+  <data name="ErrorReservingBikeTitle" xml:space="preserve">
+    <value>Fahrrad konnte nicht reserviert werden!</value>
+  </data>
+  <data name="MessageInformationTitle" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="MarkingNoWeb" xml:space="preserve">
+    <value>Ups, keine Internetverbindung vorhanden.</value>
+  </data>
+  <data name="ErrorLockStatusUnknown" xml:space="preserve">
+    <value>Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder offen sein. Bitte versuchen Sie es erneut oder melden Sie das Fahrrad dem Betreiber!</value>
+  </data>
+  <data name="ErrorTryAgain" xml:space="preserve">
+    <value>Bitte versuchen Sie es erneut.</value>
+  </data>
+  <data name="ErrorAccountInvalidAuthorization" xml:space="preserve">
+    <value>Ihre Sitzung ist abgelaufen. Bitte melden Sie sich neu an und versuchen Sie es erneut.</value>
+  </data>
+  <data name="ErrorSubmitFeedback" xml:space="preserve">
+    <value>Dieser Schritt ist nicht zwingend erforderlich. Möchten Sie dennoch Rückmeldung zum Fahrrad geben, kontaktieren Sie den Kundensupport.</value>
+  </data>
+  <data name="ActionBook" xml:space="preserve">
+    <value>Rad mieten</value>
+  </data>
+  <data name="QuestionLogIn" xml:space="preserve">
+    <value>Möchten Sie zur Anmeldeseite wechseln?</value>
+  </data>
+  <data name="QuestionLogInTitle" xml:space="preserve">
+    <value>Sie sind nicht angemeldet!</value>
+  </data>
+  <data name="QuestionCloseOrBook" xml:space="preserve">
+    <value>Schloss schließen oder Rad {0} mieten?</value>
+  </data>
+  <data name="ErrorOpenLockBikeAlreadyBooked" xml:space="preserve">
+    <value>Achtung! Ihre Miete hat bereits begonnen.
+Wenn sich das Schloss immer noch nicht öffnen lässt, vergewissern Sie sich, dass das Schloss geschlossen ist und beenden Sie die Miete.
+Wichtig: Senden Sie eine E-Mail an den Kundensupport (sonst wird Ihre bezahlte Miete fortgesetzt!) mit: Problembeschreibung, Fahrradnummer, Rückgabestation.</value>
+  </data>
+  <data name="MarkingAccountReservedBookedBikes" xml:space="preserve">
+    <value>Aktuell {0} Fahrräder reserviert/ gebucht.</value>
+  </data>
+  <data name="MessageLogoutGoodbye" xml:space="preserve">
+    <value>NutzerIn {0} erfolgreich abgemeldet.</value>
+  </data>
+  <data name="MessageLogoutGoodbyeTitle" xml:space="preserve">
+    <value>Auf Wiedersehen!</value>
+  </data>
+  <data name="ErrorPageNotLoaded" xml:space="preserve">
+    <value>Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut.</value>
+  </data>
+  <data name="ErrorPageNotLoadedTitle" xml:space="preserve">
+    <value>Seite kann nicht angezeigt werden.</value>
+  </data>
+  <data name="MarkingAccountConnectionInterrupted" xml:space="preserve">
+    <value>Verbindungsstatus: Verbindung unterbrochen.</value>
+  </data>
+  <data name="MarkingAccountConnectionOffline" xml:space="preserve">
+    <value>Verbindungsstatus: Offline.</value>
+  </data>
+  <data name="ChangeLog_3_0_370" xml:space="preserve">
+    <value>Achtung! Wir haben den Vorgang, wie die Miete beendet wird, verändert:&lt;br/&gt;
+1. Zuerst &lt;b&gt;Schloss schließen&lt;/b&gt; und den Prozess bis zum Ende begleiten.&lt;br/&gt;
+2. Entscheiden, ob:&lt;br/&gt;
+  - Fahrrad parken (um später weiterzufahren, die kostenpflichtige Miete läuft dabei weiter!), oder&lt;br/&gt;
+  - Miete beenden (vorausgesetzt Sie befinden sich an einer passenden Station).&lt;br/&gt;
+3. Nach Wahl von &lt;b&gt;Miete beenden&lt;/b&gt;: Prozess verfolgen, Rückmeldung ausfüllen und &lt;b&gt;unbedingt die Mietende-Bestätigung abwarten!&lt;/b&gt;</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx
index f19f10a..1be65cc 100644
--- a/TINKLib/MultilingualResources/AppResources.resx
+++ b/TINKLib/MultilingualResources/AppResources.resx
@@ -117,11 +117,11 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="ActionBookOrClose" xml:space="preserve">
-    <value>Rent bike or close lock</value>
+  <data name="ActionCloseOrBook" xml:space="preserve">
+    <value>Close lock or rent bike</value>
   </data>
   <data name="ActionCancelRequest" xml:space="preserve">
-    <value>Cancel bike reservation</value>
+    <value>Cancel reservation</value>
   </data>
   <data name="ActionClose" xml:space="preserve">
     <value>Close lock</value>
@@ -147,33 +147,26 @@
   <data name="ActivityTextMapLoadingStationsAndBikes" xml:space="preserve">
     <value>Loading Stations and Bikes...</value>
   </data>
-  <data name="ErrorBookedSearchMessage" xml:space="preserve">
-    <value>Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.</value>
+  <data name="ErrorConnectLock" xml:space="preserve">
+    <value>Please step as close as possible to the bike lock and try again.</value>
   </data>
-  <data name="ErrorCloseLockBoldBlockedMessage" xml:space="preserve">
-    <value>Lock is blocked. Please ensure that no spoke or any other obstacle prevents the lock from closing and try again.</value>
+  <data name="ErrorCloseLockBoltBlocked" xml:space="preserve">
+    <value>Lock bolt is blocked. Make sure that no spoke or any other obstacle prevents the lock from closing and try again.</value>
   </data>
-  <data name="ErrorCloseLockMovingMessage" xml:space="preserve">
-    <value>Lock can only be closed if bike is not moving. Please park bike and try again.</value>
+  <data name="ErrorLockMoving" xml:space="preserve">
+    <value>The process is motion sensitive. Step close to the lock, do not move, and try again.</value>
   </data>
-  <data name="ErrorReservedSearchMessage" xml:space="preserve">
-    <value>Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.</value>
-  </data>
-  <data name="ErrorReturnBikeLockClosedNoGPSMessage" xml:space="preserve">
+  <data name="ErrorEndRentalUnknownLocation" xml:space="preserve">
     <value>End rental at an unknown location is not possible.
 Rental can be ended if
 - location information is available when closing lock
 - bike is in reach and location information is available when pressing button "End rental"</value>
   </data>
-  <data name="ErrorReturnBikeLockOpenNoGPSMessage" xml:space="preserve">
-    <value>End rental at an unknown location is not possible.
-Rental can only be ended if bike is in reach and location information is available.</value>
+  <data name="ErrorEndRentalNotAtStation" xml:space="preserve">
+    <value>End rental outside or at wrong station is not possible. Distance to next suitable station {0} is {1} m.</value>
   </data>
-  <data name="ErrorReturnBikeNotAtStationMessage" xml:space="preserve">
-    <value>End rental outside of station is not possible. Distance to station {0} is {1} m.</value>
-  </data>
-  <data name="ErrorReturnBikeTitle" xml:space="preserve">
-    <value>Error at ending rental!</value>
+  <data name="ErrorEndRentalTitle" xml:space="preserve">
+    <value>Rental could not be terminated!</value>
   </data>
   <data name="ErrorSupportmailCreateAttachment" xml:space="preserve">
     <value>Attachment could not be created.</value>
@@ -241,7 +234,7 @@ Rental can only be ended if bike is in reach and location information is availab
   <data name="MessageLoginWelcomeTitleGroup" xml:space="preserve">
     <value>Welcome to {0}!</value>
   </data>
-  <data name="MessageMapPageErrorAuthcookieUndefined" xml:space="preserve">
+  <data name="ErrorMapPageAuthcookieUndefined" xml:space="preserve">
     <value>Session has expired.
 Please log in again.</value>
   </data>
@@ -251,29 +244,17 @@ Please log in again.</value>
   <data name="MessageWaring" xml:space="preserve">
     <value>Warning</value>
   </data>
-  <data name="QuestionAnswerNo" xml:space="preserve">
+  <data name="MessageAnswerNo" xml:space="preserve">
     <value>No</value>
   </data>
-  <data name="QuestionAnswerYes" xml:space="preserve">
+  <data name="MessageAnswerYes" xml:space="preserve">
     <value>Yes</value>
   </data>
-  <data name="QuestionSupportmailAnswerApp" xml:space="preserve">
-    <value>{0} app request</value>
-  </data>
-  <data name="QuestionSupportmailAnswerOperator" xml:space="preserve">
-    <value>{0} request</value>
-  </data>
   <data name="QuestionSupportmailAttachment" xml:space="preserve">
     <value>I hereby consent to the transmission of my diagnostic file.
 
 The diagnostic file contains your app usage data as well as system information. The data will only be used for diagnostic purposes or to improve the app and is then deleted.</value>
   </data>
-  <data name="QuestionSupportmailSubject" xml:space="preserve">
-    <value>Does your request/comment relate to the {0}-app or to a more general subject?</value>
-  </data>
-  <data name="QuestionTitle" xml:space="preserve">
-    <value>Question</value>
-  </data>
   <data name="ActivityTextBikesAtStationGetBikes" xml:space="preserve">
     <value>Loading bikes located at station...</value>
   </data>
@@ -356,51 +337,38 @@ The diagnostic file contains your app usage data as well as system information.
   <data name="MarkingLoginPasswordPlaceholder" xml:space="preserve">
     <value>Password</value>
   </data>
-  <data name="MessageLoginConnectionErrorMessage" xml:space="preserve">
+  <data name="ErrorLoginNoCookie" xml:space="preserve">
     <value>Login cookie must not be empty. {0}</value>
   </data>
-  <data name="MessageLoginConnectionErrorTitle" xml:space="preserve">
-    <value>Connection error during registration!</value>
+  <data name="ErrorNoConnectionTitle" xml:space="preserve">
+    <value>Connection to booking system not possible.</value>
   </data>
-  <data name="MessageLoginErrorTitle" xml:space="preserve">
+  <data name="ErrorLoginTitle" xml:space="preserve">
     <value>Error while logging in!</value>
   </data>
-  <data name="MessageLoginRecoverPassword" xml:space="preserve">
-    <value>Please connect to Internet to recover the password.</value>
+  <data name="ErrorNoWeb" xml:space="preserve">
+    <value>A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.</value>
   </data>
-  <data name="MessageLoginRegisterNoNet" xml:space="preserve">
-    <value>Please connect to Internet to register.</value>
-  </data>
-  <data name="MessageTitleHint" xml:space="preserve">
+  <data name="MessageHintTitle" xml:space="preserve">
     <value>Hint</value>
   </data>
-  <data name="ErrorOpenLockStillClosedMessage" xml:space="preserve">
-    <value>After try to open lock state closed is reported.</value>
+  <data name="ErrorOpenLockStillClosed" xml:space="preserve">
+    <value>Lock reports it is still closed. Please try again!</value>
   </data>
-  <data name="ErrorOpenLockOutOfReachMessage" xml:space="preserve">
-    <value>Lock cannot be opened until bike is near.</value>
+  <data name="ErrorLockOutOfReach" xml:space="preserve">
+    <value>Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.</value>
   </data>
   <data name="ErrorOpenLockTitle" xml:space="preserve">
-    <value>Error while opening lock!</value>
-  </data>
-  <data name="ErrorCloseLockOutOfReachMessage" xml:space="preserve">
-    <value>Lock cannot be closed until bike is near.</value>
-  </data>
-  <data name="ErrorCloseLockOutOfReachStateReservedMessage" xml:space="preserve">
-    <value>Lock cannot be closed until bike is near.
-Please try again to close bike or report bike to operator!</value>
+    <value>Lock could not be opened!</value>
   </data>
   <data name="ErrorCloseLockTitle" xml:space="preserve">
-    <value>Lock can not be closed!</value>
+    <value>Lock could not be closed!</value>
   </data>
-  <data name="ErrorCloseLockStillOpenMessage" xml:space="preserve">
-    <value>After try to close lock state open is reported.</value>
+  <data name="ErrorLockUnexpectedState" xml:space="preserve">
+    <value>Unexpected locking state "{0}" detected. Please try again or report bike to operator!</value>
   </data>
-  <data name="ErrorCloseLockUnexpectedStateMessage" xml:space="preserve">
-    <value>Lock reports state "{0}".</value>
-  </data>
-  <data name="ErrorCloseLockUnkErrorMessage" xml:space="preserve">
-    <value>Please try to lock again or report bike to operator!
+  <data name="ErrorCloseLock" xml:space="preserve">
+    <value>Step close to the lock and try again or report bike to operator!
 {0}</value>
   </data>
   <data name="MessageBikesManagementLocationPermission" xml:space="preserve">
@@ -410,16 +378,10 @@ Please try again to close bike or report bike to operator!</value>
     <value>Please allow location sharing so that bike lock/locks can be managed.
 Open sharing dialog?</value>
   </data>
-  <data name="MessageCenterMapLocationPermissionOpenDialog" xml:space="preserve">
+  <data name="ErrorMapCenterNoLocationPermissionOpenDialog" xml:space="preserve">
     <value>Please allow location sharing so that map can be centered.
 Open sharing dialog?</value>
   </data>
-  <data name="MessageAnswerNo" xml:space="preserve">
-    <value>No</value>
-  </data>
-  <data name="MessageAnswerYes" xml:space="preserve">
-    <value>Yes</value>
-  </data>
   <data name="MessageBikesManagementBluetoothActivation" xml:space="preserve">
     <value>Please enable Bluetooth to manage bike lock/locks.</value>
   </data>
@@ -454,21 +416,21 @@ Open sharing dialog?</value>
     <value>Internet must be available for updating lock status. Please establish an Internet connection!</value>
   </data>
   <data name="ActivityTextClosingLock" xml:space="preserve">
-    <value>&lt;h4&gt;&lt;b&gt;Lock is closing.&lt;br/&gt;Please wait until it is completely closed.&lt;/b&gt;&lt;/h4&gt;</value>
+    <value>Stay with the bike until the lock is closed.</value>
   </data>
-  <data name="ChangeLog3_0_203" xml:space="preserve">
+  <data name="ChangeLog_3_0_203" xml:space="preserve">
     <value>Updated to latest lock firmware.</value>
   </data>
-  <data name="ChangeLog3_0_204" xml:space="preserve">
+  <data name="ChangeLog_3_0_204" xml:space="preserve">
     <value>Bluetooth communication inproved.</value>
   </data>
-  <data name="ChangeLog3_0_205" xml:space="preserve">
+  <data name="ChangeLog_3_0_205" xml:space="preserve">
     <value>Nicer station markers for iOS.</value>
   </data>
-  <data name="ChangeLog3_0_206" xml:space="preserve">
+  <data name="ChangeLog_3_0_206" xml:space="preserve">
     <value>Bluetooth and geolocation functionality improved.</value>
   </data>
-  <data name="ChangeLog3_0_207" xml:space="preserve">
+  <data name="ChangeLog_3_0_207" xml:space="preserve">
     <value>Minor fixes related to renting functionality.
 Software packages updated.
 Targets Android 11.</value>
@@ -488,40 +450,37 @@ Targets Android 11.</value>
   <data name="ActivityTextRentingBike" xml:space="preserve">
     <value>Renting bike...</value>
   </data>
-  <data name="MessageRentingBikeErrorConnectionTitle" xml:space="preserve">
-    <value>Connection error when renting the bike!</value>
+  <data name="ErrorRentingBikeTitle" xml:space="preserve">
+    <value>Bike could not be rented!</value>
   </data>
-  <data name="MessageRentingBikeErrorGeneralTitle" xml:space="preserve">
-    <value>Error when renting the bike!</value>
-  </data>
-  <data name="MessageRentingBikeErrorTooManyReservationsRentals" xml:space="preserve">
+  <data name="ErrorRentingBikeTooManyReservationsRentals" xml:space="preserve">
     <value>A rental of bike {0} was rejected because the maximum allowed number of {1} reservations/rentals had already been made.</value>
   </data>
-  <data name="MessageReservationBikeErrorTooManyReservationsRentals" xml:space="preserve">
+  <data name="ErrorReservingBikeTooManyReservationsRentals" xml:space="preserve">
     <value>A reservation of bike {0} was rejected because the maximum allowed number of {1} reservations/rentals had already been made.</value>
   </data>
-  <data name="MessageErrorLockIsClosedThreeLines" xml:space="preserve">
+  <data name="ErrorLockIsClosedThreeLines" xml:space="preserve">
     <value>Attention: Lock is closed!
 {0}
 {1}</value>
   </data>
-  <data name="MessageErrorLockIsClosedTwoLines" xml:space="preserve">
+  <data name="ErrorLockIsClosedTwoLines" xml:space="preserve">
     <value>Attention: Lock is closed!
 {0}</value>
   </data>
-  <data name="ExceptionTextRentingBikeFailedGeneral" xml:space="preserve">
+  <data name="ErrorRentingBike" xml:space="preserve">
     <value>The rental of bike {0} has failed.</value>
   </data>
-  <data name="ExceptionTextRentingBikeFailedUnavailalbe" xml:space="preserve">
+  <data name="ErrorRentingBikeUnavailalbe" xml:space="preserve">
     <value>The rental of bike {0} has failed, the bike is currently unavailable. {1}</value>
   </data>
-  <data name="ExceptionTextReservationBikeFailedGeneral" xml:space="preserve">
+  <data name="ErrorReservingBike" xml:space="preserve">
     <value>The reservation of bike {0} has failed.</value>
   </data>
-  <data name="ExceptionTextReservationBikeFailedUnavailalbe" xml:space="preserve">
+  <data name="ErrorReservingBikeUnavailalbe" xml:space="preserve">
     <value>The reservation of bike {0} has failed, the bike is currently unavailable. {1}</value>
   </data>
-  <data name="ChangeLog3_0_208" xml:space="preserve">
+  <data name="ChangeLog_3_0_208" xml:space="preserve">
     <value>Minor fixes.</value>
   </data>
   <data name="ActivityTextDisconnectingLock" xml:space="preserve">
@@ -544,7 +503,7 @@ Please restart app in order to get bike info.</value>
   <data name="QuestionCancelReservation" xml:space="preserve">
     <value>Cancel reservation for bike {0}?</value>
   </data>
-  <data name="ChangeLog3_0_209" xml:space="preserve">
+  <data name="ChangeLog_3_0_209" xml:space="preserve">
     <value>Minor fix: Bikes are disconnected as soon as becoming disposable.</value>
   </data>
   <data name="QuestionReserveBike" xml:space="preserve">
@@ -595,44 +554,44 @@ Please restart app in order to get bike info.</value>
   <data name="ActivityTextSearchingLock" xml:space="preserve">
     <value>Searching lock...</value>
   </data>
-  <data name="ChangeLog3_0_214" xml:space="preserve">
+  <data name="ChangeLog_3_0_214" xml:space="preserve">
     <value>Multiple operators support.</value>
   </data>
-  <data name="ChangeLog3_0_215" xml:space="preserve">
+  <data name="ChangeLog_3_0_215" xml:space="preserve">
     <value>Layout of "Whats New"-dialog improved :-)</value>
   </data>
   <data name="MessageBikesManagementMaxFeeEuroPerDay" xml:space="preserve">
     <value>€/day</value>
   </data>
-  <data name="ChangeLog3_0_216" xml:space="preserve">
+  <data name="ChangeLog_3_0_216" xml:space="preserve">
     <value>GUI layout improved.</value>
   </data>
-  <data name="ChangeLog3_0_217" xml:space="preserve">
+  <data name="ChangeLog_3_0_217" xml:space="preserve">
     <value>Packages updated.</value>
   </data>
-  <data name="ChangeLog3_0_219" xml:space="preserve">
+  <data name="ChangeLog_3_0_219" xml:space="preserve">
     <value>Icons added to flyout menu.</value>
   </data>
-  <data name="ChangeLog3_0_220" xml:space="preserve">
+  <data name="ChangeLog_3_0_220" xml:space="preserve">
     <value>GUI layout improved.</value>
   </data>
-  <data name="ChangeLog3_0_221" xml:space="preserve">
+  <data name="ChangeLog_3_0_221" xml:space="preserve">
     <value>GUI layout improved.</value>
   </data>
-  <data name="ChangeLog3_0_222" xml:space="preserve">
+  <data name="ChangeLog_3_0_222" xml:space="preserve">
     <value>Minor bugfix and improvements.</value>
   </data>
-  <data name="MessageLogoutErrorTitle" xml:space="preserve">
+  <data name="ErrorLogoutTitle" xml:space="preserve">
     <value>Error while logging out!</value>
   </data>
   <data name="MessageCopriVersionIsOutdated" xml:space="preserve">
     <value>This version of the {0} App is not compatible with server detected.
-Please contact operator for help.</value>
+Please contact customer support for help.</value>
   </data>
-  <data name="ChangeLog3_0_224" xml:space="preserve">
+  <data name="ChangeLog_3_0_224" xml:space="preserve">
     <value>Updated for latest server version.</value>
   </data>
-  <data name="ChangeLog3_0_226" xml:space="preserve">
+  <data name="ChangeLog_3_0_226" xml:space="preserve">
     <value>Fixes
 - station markers are updated correctly after login/ logout if required
 - routing from "bikes at station" to "login" page and other routings corrected</value>
@@ -640,7 +599,7 @@ Please contact operator for help.</value>
   <data name="ActivityTextErrorWebExceptionProtocolError" xml:space="preserve">
     <value>Connection error. Status description: {0}.</value>
   </data>
-  <data name="ChangeLog3_0_227" xml:space="preserve">
+  <data name="ChangeLog_3_0_227" xml:space="preserve">
     <value>Feedback dialog added which is shown after ending rental.</value>
   </data>
   <data name="ActivityTextConnectionStateOffline" xml:space="preserve">
@@ -649,50 +608,40 @@ Please contact operator for help.</value>
   <data name="ActivityTextException" xml:space="preserve">
     <value>Cache used.</value>
   </data>
-  <data name="ErrorReturnSubmitFeedbackMessage" xml:space="preserve">
-    <value>Your feedback could not be send to server successfully.</value>
-  </data>
-  <data name="ErrorReturnSubmitFeedbackTitle" xml:space="preserve">
+  <data name="ErrorSubmitFeedbackTitle" xml:space="preserve">
     <value>Submitting feedback failed!</value>
   </data>
   <data name="ActivityTextUpdating" xml:space="preserve">
     <value>Updating....</value>
   </data>
-  <data name="ChangeLog3_0_231" xml:space="preserve">
+  <data name="ChangeLog_3_0_231" xml:space="preserve">
     <value>Minor improvements.</value>
   </data>
-  <data name="ChangeLog3_0_232" xml:space="preserve">
+  <data name="ChangeLog_3_0_232" xml:space="preserve">
     <value>Menu modified.</value>
   </data>
-  <data name="ChangeLog3_0_234" xml:space="preserve">
+  <data name="ChangeLog_3_0_234" xml:space="preserve">
     <value>Tariff info page is displayed correctly again.
 Error handling improved.</value>
   </data>
-  <data name="ChangeLog3_0_235" xml:space="preserve">
+  <data name="ChangeLog_3_0_235" xml:space="preserve">
     <value>Obsolete object replaced with up-to-date one.</value>
   </data>
-  <data name="ErrorOpenLockBoldIsBlockedMessage" xml:space="preserve">
-    <value>Ensure that no obstacle prevents lock from opening and try again.</value>
+  <data name="ErrorOpenLockBoldBlocked" xml:space="preserve">
+    <value>Lock bolt is blocked. Make sure that no spoke presses against the lock bolt and try again.</value>
   </data>
-  <data name="ErrorOpenLockBoldStatusIsUnknownMessage" xml:space="preserve">
-    <value>The lock could not be opened correctly. Try again!
-
-Attention! Your rental has already started.
-If the lock still won't open, make sure the lock is closed and end rental.
-Important: Send an email to the operator (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.</value>
+  <data name="ErrorOpenLockStatusUnknown" xml:space="preserve">
+    <value>Position of lock bolt is unknown. Lock could be closed or open. Please try again!</value>
   </data>
-  <data name="ErrorOpenLockStillClosedTitle" xml:space="preserve">
-    <value>Lock can not be opened!</value>
-  </data>
-  <data name="ChangeLog3_0_236" xml:space="preserve">
+  <data name="ChangeLog_3_0_236" xml:space="preserve">
     <value>Stations names instead descriptions shown on page title.
 Error message when opening lock fails improved.
 Layout of bike names and id display improved.</value>
   </data>
-  <data name="ChangeLog3_0_237" xml:space="preserve">
+  <data name="ChangeLog_3_0_237" xml:space="preserve">
     <value>Hard- and software information send to backend when ending rental.</value>
   </data>
-  <data name="ChangeLog3_0_239" xml:space="preserve">
+  <data name="ChangeLog_3_0_239" xml:space="preserve">
     <value>Bugfix: Bike description is displayed correctly again.</value>
   </data>
   <data name="MarkingFindBike" xml:space="preserve">
@@ -704,7 +653,7 @@ Layout of bike names and id display improved.</value>
   <data name="ActivityTextFindBikeLoadingBikes" xml:space="preserve">
     <value>Loading Bikes...</value>
   </data>
-  <data name="ChangeLog3_0_240" xml:space="preserve">
+  <data name="ChangeLog_3_0_240" xml:space="preserve">
     <value>Find bike by id functionality added.</value>
   </data>
   <data name="MarkingContactNoStationInfoAvailableNoButton" xml:space="preserve">
@@ -719,7 +668,7 @@ Layout of bike names and id display improved.</value>
   <data name="MarkingContactPageTitle" xml:space="preserve">
     <value>Contact</value>
   </data>
-  <data name="ChangeLog3_0_241" xml:space="preserve">
+  <data name="ChangeLog_3_0_241" xml:space="preserve">
     <value>Bike sharing system operator specific support info displayed on contact page.</value>
   </data>
   <data name="ActionSelectStation" xml:space="preserve">
@@ -728,14 +677,14 @@ Layout of bike names and id display improved.</value>
   <data name="MarkingSelectStationPage" xml:space="preserve">
     <value>Select Station</value>
   </data>
-  <data name="ChangeLog3_0_242" xml:space="preserve">
+  <data name="ChangeLog_3_0_242" xml:space="preserve">
     <value>Select station page added to ease getting operator specific contact information.</value>
   </data>
   <data name="MarkingBikeSharingOperator" xml:space="preserve">
     <value>Operator: {0}.</value>
   </data>
   <data name="MarkingBikeSharingOperatorNoOperatorInfoAvailable" xml:space="preserve">
-    <value>Contact operator.</value>
+    <value>contact customer support.</value>
   </data>
   <data name="MiniSurveyAskForAnswer" xml:space="preserve">
     <value>Select an answer please.</value>
@@ -743,7 +692,7 @@ Layout of bike names and id display improved.</value>
   <data name="MiniSurveyEnterAnswer" xml:space="preserve">
     <value>Enter answer here please.</value>
   </data>
-  <data name="ChangeLog3_0_243" xml:space="preserve">
+  <data name="ChangeLog_3_0_243" xml:space="preserve">
     <value>Mini survey implemented.
 Minor fixes.</value>
   </data>
@@ -765,14 +714,11 @@ Minor fixes.</value>
   <data name="ActivityTextQueryLocationStart" xml:space="preserve">
     <value>Start query location...</value>
   </data>
-  <data name="MessageErrorQueryLocationMessage" xml:space="preserve">
-    <value>Closing the lock and ending the rental is not possible.</value>
+  <data name="ErrorQueryLocationStartTitle" xml:space="preserve">
+    <value>Location query could not be started!</value>
   </data>
-  <data name="MessageErrorQueryLocationStartTitle" xml:space="preserve">
-    <value>Error start query location!</value>
-  </data>
-  <data name="MessageErrorQueryLocationTitle" xml:space="preserve">
-    <value>Error query location!</value>
+  <data name="ErrorQueryLocationTitle" xml:space="preserve">
+    <value>Location could not be determined!</value>
   </data>
   <data name="QuestionCloseLockAndReturnBike" xml:space="preserve">
     <value>Close lock and end rental of bike {0}?</value>
@@ -783,33 +729,27 @@ Minor fixes.</value>
   <data name="QuestionReturnBike" xml:space="preserve">
     <value>End rental of bike {0}?</value>
   </data>
-  <data name="ChangeLog3_0_244" xml:space="preserve">
+  <data name="ChangeLog_3_0_244" xml:space="preserve">
     <value>Closing lock and returning bike speeded up.</value>
   </data>
-  <data name="ErrorReturnBikeNoWebMessage" xml:space="preserve">
-    <value>Internet must be available when ending rental. Please establish an Internet connection!</value>
-  </data>
-  <data name="ErrorReturnBikeNoWebTitle" xml:space="preserve">
-    <value>Connection error when ending rental.</value>
-  </data>
-  <data name="ChangeLog3_0_249" xml:space="preserve">
+  <data name="ChangeLog_3_0_249" xml:space="preserve">
     <value>Third-party components updated.</value>
   </data>
   <data name="MarkingBikesAtStationStationId" xml:space="preserve">
     <value>ID: {0}</value>
   </data>
-  <data name="ChangeLog3_0_250" xml:space="preserve">
+  <data name="ChangeLog_3_0_250" xml:space="preserve">
     <value>Station id displayed.
 Center map to current position issue fixed.
 Minor improvements.</value>
   </data>
-  <data name="ChangeLog3_0_263" xml:space="preserve">
+  <data name="ChangeLog_3_0_263" xml:space="preserve">
     <value>CO2 saving is displayed for  bikes with GPS-lock after returning bike.</value>
   </data>
-  <data name="ChangeLog3_0_264" xml:space="preserve">
+  <data name="ChangeLog_3_0_264" xml:space="preserve">
     <value>Bug "object reference not set ...." &lt;a href="https://dev.azure.com/TeilRad/sharee.bike%20App/_workitems/edit/186"&gt;185&lt;/a&gt; fixed.</value>
   </data>
-  <data name="ChangeLog3_0_265" xml:space="preserve">
+  <data name="ChangeLog_3_0_265" xml:space="preserve">
     <value>Filter functionality city bike/ cargo bike improved.
 Layouting improved.
 App supports deep linking.</value>
@@ -823,28 +763,28 @@ App supports deep linking.</value>
   <data name="MessageBikesManagementTariffDescriptionTariffHeaderNameId" xml:space="preserve">
     <value>Tariff {0}, nr. {1}</value>
   </data>
-  <data name="ChangeLog3_0_266" xml:space="preserve">
+  <data name="ChangeLog_3_0_266" xml:space="preserve">
     <value>Location permissions handling improved.</value>
   </data>
-  <data name="ChangeLog3_0_276" xml:space="preserve">
+  <data name="ChangeLog_3_0_276" xml:space="preserve">
     <value>Link to operator AGB is displayed if required.
 Display of status information extended.
 Bugfix: Sending support mails works again. </value>
   </data>
-  <data name="MessageMapPageErrorSwitch" xml:space="preserve">
+  <data name="ErrorMapPageSwitchBikeType" xml:space="preserve">
     <value>An error occurred switching between cargo and city bikes.
 {0}</value>
   </data>
-  <data name="MessageErrorSelectBikeNoBikeFound" xml:space="preserve">
-    <value>No bike with id {0} found. It may already be reserved by another user or it may be defective.</value>
+  <data name="ErrorSelectBikeNoBikeFound" xml:space="preserve">
+    <value>Bike with id {0} may already be reserved by another user or it may be defective.</value>
   </data>
-  <data name="MessageErrorSelectBikeTitle" xml:space="preserve">
-    <value>Error Selecting Bike!</value>
+  <data name="ErrorSelectBikeTitle" xml:space="preserve">
+    <value>The requested bike was not found.</value>
   </data>
-  <data name="ChangeLog3_0_277" xml:space="preserve">
+  <data name="ChangeLog_3_0_277" xml:space="preserve">
     <value>Bugfix: No more closing of app on Select Bike page.</value>
   </data>
-  <data name="ErrorBookedSearchMessageEscalationLevel1" xml:space="preserve">
+  <data name="ErrorConnectLockEscalationLevel1" xml:space="preserve">
     <value>Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process.</value>
   </data>
   <data name="MessageAnswerCancel" xml:space="preserve">
@@ -853,11 +793,11 @@ Bugfix: Sending support mails works again. </value>
   <data name="MessageAnswerRetry" xml:space="preserve">
     <value>Retry</value>
   </data>
-  <data name="MessageConnectLockErrorTitle" xml:space="preserve">
-    <value>Error when connecting with lock!</value>
+  <data name="ErrorConnectLockTitle" xml:space="preserve">
+    <value>Connection to the lock could not be established.</value>
   </data>
-  <data name="ErrorBookedSearchMessageEscalationLevel2" xml:space="preserve">
-    <value>It is still not possible to establish a connection between your mobile device and the bike lock. Please contact operator!
+  <data name="ErrorConnectLockEscalationLevel2" xml:space="preserve">
+    <value>It is still not possible to establish a connection between your mobile device and the bike lock. Please contact customer support!
 
 Alternative:
 1. close app,
@@ -865,7 +805,7 @@ Alternative:
 3. make sure that the lock is completely closed and remains closed.
 4. send e-mail to operator (otherwise your chargeable rental will continue!): Please include problem description, bike-id and drop-off station.</value>
   </data>
-  <data name="ChangeLog3_0_278" xml:space="preserve">
+  <data name="ChangeLog_3_0_278" xml:space="preserve">
     <value>Hints added to ease closing of lock in case closing does not succeed on first try.</value>
   </data>
   <data name="ActivityTextLockIsOutOfReach" xml:space="preserve">
@@ -874,81 +814,54 @@ Alternative:
   <data name="ActivityTextLockNotFound" xml:space="preserve">
     <value>Lock not found</value>
   </data>
-  <data name="ErrorFindLockRentedBikeOutOfReachMessage" xml:space="preserve">
-    <value>Lock can only be found when rented bike is nearby.</value>
+  <data name="ErrorLockNoStatus" xml:space="preserve">
+    <value>Lock status could not be determined. Please contact customer support.</value>
   </data>
-  <data name="ErrorFindLockReservedBikeOutOfReachMessage" xml:space="preserve">
-    <value>Lock can only be found when reserved bike is nearby.</value>
+  <data name="ErrorLockBluetoothNotOn" xml:space="preserve">
+    <value>Activate Bluetooth and try again.</value>
   </data>
-  <data name="MessageErrorConnectTitle" xml:space="preserve">
-    <value>Error when connecting to lock!</value>
+  <data name="ErrorNoLocationPermission" xml:space="preserve">
+    <value>Grant Location permission, activate Location services and try again.</value>
   </data>
-  <data name="ErrorConnectLockGeneralErrorMessage" xml:space="preserve">
-    <value>Communication error during lock search.</value>
+  <data name="ErrorLockLocationOff" xml:space="preserve">
+    <value>Activate Location services and try again.</value>
   </data>
-  <data name="ErrorConnectLockRentedBikeNoWebMessage" xml:space="preserve">
-    <value>Internet must be reachable to connect to lock of rented bike. Please establish an Internet connection!</value>
-  </data>
-  <data name="ErrorConnectLockReservedBikeNoWebMessage" xml:space="preserve">
-    <value>Internet must be reachable to connect to lock of reserved bike. Please establish an Internet connection!</value>
-  </data>
-  <data name="ErrorFindLockReservedBikeNoStausMessage" xml:space="preserve">
-    <value>Lock status of the reserved bike could not be determined.</value>
-  </data>
-  <data name="ErrorFindLockBluetoothNotOn" xml:space="preserve">
-    <value>Please turn Bluetooth on, otherwise lock cannot be connected.</value>
-  </data>
-  <data name="ErrorFindLockLocationPermissionMissing" xml:space="preserve">
-    <value>Please grant location permissions, otherwise lock cannot be connected.</value>
-  </data>
-  <data name="ErrorFindLockLocationOff" xml:space="preserve">
-    <value>Please turn location services on, otherwise lock cannot be connected.</value>
-  </data>
-  <data name="ChangeLog3_0_280" xml:space="preserve">
+  <data name="ChangeLog_3_0_280" xml:space="preserve">
     <value>Errormessages improved for szenarios when 
 - bluetooth is off, 
 - location permission is not granted or 
 - location is off.</value>
   </data>
-  <data name="ErrorReservedSearchMessageEscalationLevel1" xml:space="preserve">
-    <value>Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process.</value>
-  </data>
-  <data name="ChangeLog3_0_282" xml:space="preserve">
+  <data name="ChangeLog_3_0_282" xml:space="preserve">
     <value>Permission requests messages on iOS formulated in more detail.
 Hints to ease connecting to lock in case connecting does not succeed on first try improved.</value>
   </data>
-  <data name="ExceptionTextSessionExpired" xml:space="preserve">
-    <value>The session has expired. Please register again.</value>
-  </data>
   <data name="ActivityTextAuthcookieNotDefinedException" xml:space="preserve">
     <value>Auth. expired</value>
   </data>
-  <data name="ChangeLog3_0_284" xml:space="preserve">
+  <data name="ChangeLog_3_0_284" xml:space="preserve">
     <value>User friendly message is shown if authentication expired.</value>
   </data>
-  <data name="MessageAccountPageManageLogout" xml:space="preserve">
+  <data name="MarkingAccountPageManageLogout" xml:space="preserve">
     <value>Log out</value>
   </data>
-  <data name="MessageAccountPageManagePersonalData" xml:space="preserve">
+  <data name="MarkingAccountPageManagePersonalData" xml:space="preserve">
     <value>Manage personal data</value>
   </data>
-  <data name="ChangeLog3_0_285" xml:space="preserve">
+  <data name="ChangeLog_3_0_285" xml:space="preserve">
     <value>Framework updated. 
 Activity indicator added account management pages and logging extended.</value>
   </data>
   <data name="ActivityTextStartReturningBike" xml:space="preserve">
     <value>Starting end rental...</value>
   </data>
-  <data name="ExceptionTextWebConnectFailureException" xml:space="preserve">
-    <value>Is WIFI/mobile network available and mobile data activated?</value>
-  </data>
-  <data name="ChangeLog3_0_289" xml:space="preserve">
+  <data name="ChangeLog_3_0_289" xml:space="preserve">
     <value>Flyout menu header improved.</value>
   </data>
-  <data name="ChangeLog3_0_290" xml:space="preserve">
+  <data name="ChangeLog_3_0_290" xml:space="preserve">
     <value>Geolocation is queried with higher accuracy.</value>
   </data>
-  <data name="ChangeLog3_0_293" xml:space="preserve">
+  <data name="ChangeLog_3_0_293" xml:space="preserve">
     <value>Target Android framework set from 11.0  to 12.0 (Level 31 S).
 NuGet packages updated.
 Started adding support for new lock type.
@@ -975,19 +888,19 @@ Minor bugfixes.</value>
   <data name="MarkingWebsiteCaching" xml:space="preserve">
     <value>Website caching</value>
   </data>
-  <data name="ChangeLog3_0_298" xml:space="preserve">
+  <data name="ChangeLog_3_0_298" xml:space="preserve">
     <value>New Wort-Bild-Marke integrated in flyout menu for Lastenrad Bayern App.</value>
   </data>
-  <data name="ChangeLog3_0_299" xml:space="preserve">
+  <data name="ChangeLog_3_0_299" xml:space="preserve">
     <value>Bugfix: Bluetooth lock control works again on Android 12.</value>
   </data>
-  <data name="ChangeLog3_0_301" xml:space="preserve">
+  <data name="ChangeLog_3_0_301" xml:space="preserve">
     <value>Extended tariffs supported.</value>
   </data>
   <data name="MessageBikesManagementTariffDescriptionEuroPerMonth" xml:space="preserve">
     <value>€/month</value>
   </data>
-  <data name="ChangeLog3_0_312" xml:space="preserve">
+  <data name="ChangeLog_3_0_312" xml:space="preserve">
     <value>For Lastenrad Bayern users
 - missing titles added to several pages
 - new station markers availabe
@@ -1000,37 +913,25 @@ Minor bugfixes.</value>
   <data name="ErrorBikesAvailableResponseNotOk" xml:space="preserve">
     <value>Failed to query available bikes.</value>
   </data>
-  <data name="ChangeLog3_0_318" xml:space="preserve">
+  <data name="ChangeLog_3_0_318" xml:space="preserve">
     <value>Support for new lock type added.</value>
   </data>
   <data name="ActionGiveFeedback" xml:space="preserve">
     <value>Give feedback</value>
   </data>
-  <data name="MessageReservingBikeErrorConnectionTitle" xml:space="preserve">
-    <value>Connection error when reserving the bike!</value>
+  <data name="ErrorReservingBikeTitle" xml:space="preserve">
+    <value>Bike could not be reserved!</value>
   </data>
-  <data name="MessageReservingBikeErrorGeneralTitle" xml:space="preserve">
-    <value>Error when reserving the bike!</value>
-  </data>
-  <data name="MessageCancelReservationBikeErrorGeneralTitle" xml:space="preserve">
-    <value>Error when canceling the reservation!</value>
-  </data>
-  <data name="ErrorMessageInvalidAuthorizationResponseException" xml:space="preserve">
+  <data name="ErrorLoginInvalidAuthorization" xml:space="preserve">
     <value>Can not login user {0}. Mail address unknown or password invalid.</value>
   </data>
-  <data name="MessageCancelReservationBikeErrorConnectionTitle" xml:space="preserve">
-    <value>Connection error when canceling the reservation!</value>
-  </data>
-  <data name="MessageOpeningLockErrorConnectionTitle" xml:space="preserve">
-    <value>Connection error when opening the lock!</value>
-  </data>
   <data name="ActivityTextSubmittingFeedback" xml:space="preserve">
     <value>Submitting feedback...</value>
   </data>
   <data name="MarkingFlyoutHeader" xml:space="preserve">
     <value>Menu</value>
   </data>
-  <data name="ChangeLog3_0_324" xml:space="preserve">
+  <data name="ChangeLog_3_0_324" xml:space="preserve">
     <value>Mein konrad design improved.</value>
   </data>
   <data name="MarkingDriveBatteryChargingLevel" xml:space="preserve">
@@ -1046,9 +947,9 @@ Minor bugfixes.</value>
     <value>Rental successfully ended!</value>
   </data>
   <data name="MarkingDriveBatteryTitel" xml:space="preserve">
-    <value>Current battery level:</value>
+    <value>Transmit &lt;b&gt;battery level&lt;/b&gt; from the handlebar display:</value>
   </data>
-  <data name="ChangeLog3_0_326" xml:space="preserve">
+  <data name="ChangeLog_3_0_326" xml:space="preserve">
     <value>For Mein konrad users: Battery charging level is displayed for ebikes and is queried after return of bike.</value>
   </data>
   <data name="StatusTextLowBatteryLevel" xml:space="preserve">
@@ -1057,28 +958,28 @@ Minor bugfixes.</value>
   <data name="StatusTextCopriLock" xml:space="preserve">
     <value>At pausing ride, you close the bike lock manually, not via the app. To end the chargeable rental, slide the bike into an authorized station and confirm the end of the rental in the app; the lock closes automatically.</value>
   </data>
-  <data name="ChangeLog3_0_334" xml:space="preserve">
+  <data name="ChangeLog_3_0_334" xml:space="preserve">
     <value>Lastenrad Bayern users: battery charging level is displayed for ebikes.</value>
   </data>
-  <data name="ChangeLog3_0_335" xml:space="preserve">
+  <data name="ChangeLog_3_0_335" xml:space="preserve">
     <value>Sharee.bike design improved.</value>
   </data>
-  <data name="ChangeLog3_0_337_MK" xml:space="preserve">
+  <data name="ChangeLog_3_0_337_MK" xml:space="preserve">
     <value>You will now be informed if the charge of the bike battery was last indicated as very low. To ensure the reliability of the battery level indicator in the app, please enter the current charge level in the app at the end of your ride with an e-bike.</value>
   </data>
-  <data name="ChangeLog3_0_337_SB" xml:space="preserve">
+  <data name="ChangeLog_3_0_337_SB" xml:space="preserve">
     <value>The app has a new design! --- You are a beta tester? Give us helpful feedback anytime via ‘Contact - Feedback about the App’. Not a beta tester yet? Become one and get great new features before anyone else!</value>
   </data>
   <data name="ChangeLog_MinorBugFixes" xml:space="preserve">
     <value>- We have fixed a few minor bugs. Enjoy the ride!</value>
   </data>
-  <data name="ChangeLog3_0_338_LB_MK" xml:space="preserve">
+  <data name="ChangeLog_3_0_338_LB_MK" xml:space="preserve">
     <value>Besides minor bug fixes we have simplified the contact procedure:
 - For acute questions/problems about the bike or rental process, please contact the fleet operator.
 - For communication with the app developers, select "Feedback about the App".
 To better analyze and improve processes in the app, please accept attaching your log file to your message. We appreciate both critical and positive feedback!</value>
   </data>
-  <data name="ChangeLog3_0_338_SB" xml:space="preserve">
+  <data name="ChangeLog_3_0_338_SB" xml:space="preserve">
     <value>Besides minor bug fixes we have simplified the contact procedure:
 - For acute questions/problems about the bike or rental process, please contact the fleet operator.
 - For communication with the app developers, select "Feedback about the App".
@@ -1086,27 +987,24 @@ To better analyze and improve processes in the app, please accept attaching your
 
 In addition: Small graphics let you see at a glance what type of bike it is.</value>
   </data>
-  <data name="SupportmailSubjectAppmail" xml:space="preserve">
-    <value>{0}-app request</value>
+  <data name="SupportmailSubjectAppmailWithStation" xml:space="preserve">
+    <value>{0}-app request: station {1}</value>
   </data>
   <data name="SupportmailSubjectOperatormail" xml:space="preserve">
     <value>{0}-request: station {1}</value>
   </data>
-  <data name="QuestionSupportmailAnswerNo" xml:space="preserve">
-    <value>No, do not attach file</value>
-  </data>
-  <data name="QuestionSupportmailTitle" xml:space="preserve">
+  <data name="QuestionSupportmailAttachmentTitle" xml:space="preserve">
     <value>Consent</value>
   </data>
   <data name="PlaceholderFindBike" xml:space="preserve">
     <value>Prefix and No., e.g. TR15</value>
   </data>
-  <data name="ChangeLog3_0_339_MK" xml:space="preserve">
+  <data name="ChangeLog_3_0_339_MK" xml:space="preserve">
     <value>The cargo bikes from the suburbs now show their home station in their name. These bikes must be returned there!
 
 You can now see at a glance which app version you have installed: in the menu at the very bottom. Please update the app regularly to be up to date in functionality and design!</value>
   </data>
-  <data name="ChangeLog3_0_339_SB_LB" xml:space="preserve">
+  <data name="ChangeLog_3_0_339_SB_LB" xml:space="preserve">
     <value>You can now see at a glance which app version you have installed: in the menu at the very bottom. Please update the app regularly to be up to date in functionality and design!</value>
   </data>
   <data name="ChangeLog_MinorDesignImprovements" xml:space="preserve">
@@ -1158,9 +1056,6 @@ Setting added to select whether the app starts up showing either
 page.&lt;br/&gt;
 Minor improvements.&lt;br/&gt;</value>
   </data>
-  <data name="ErrorNotConnectedToNetwork" xml:space="preserve">
-    <value>Not connected to network.</value>
-  </data>
   <data name="ChangeLog_3_0_348" xml:space="preserve">
     <value>App ugraded to target api level 31 (Android 12).</value>
   </data>
@@ -1174,7 +1069,7 @@ When logging in, you can now view the password you entered. &lt;br/&gt;
 &lt;br/&gt;
 Try it out!</value>
   </data>
-  <data name="MessageErrorLocationIsOff" xml:space="preserve">
+  <data name="ErrorMapCenterLocationIsOff" xml:space="preserve">
     <value>Turn on your device's location services to center the map on your current location.</value>
   </data>
   <data name="ChangeLog_3_0_353_MK_SB" xml:space="preserve">
@@ -1199,7 +1094,7 @@ Try it out!</value>
   <data name="MarkingMyBikesNoBikesReservedRented" xml:space="preserve">
     <value>There are currently no bikes reserved/rented by user {0}.</value>
   </data>
-  <data name="MessageTitleInformation" xml:space="preserve">
+  <data name="MessageInformationTitle" xml:space="preserve">
     <value>Information</value>
   </data>
   <data name="ChangeLog_3_0_358_MK_SB" xml:space="preserve">
@@ -1209,25 +1104,16 @@ Try it out!</value>
   <data name="ChangeLog_MinorImprovements" xml:space="preserve">
     <value>- Minor improvements.</value>
   </data>
-  <data name="MarkingNoNetworkConnection" xml:space="preserve">
+  <data name="MarkingNoWeb" xml:space="preserve">
     <value>Oops, there is no Internet connection.</value>
   </data>
   <data name="ChangeLog_3_0_361_MK_SB" xml:space="preserve">
     <value>If you have reserved or rented a bike, this will now be shown to you as an icon on the map page. Clicking on it will take you directly to the 'My bikes' page. We have also made small design changes.</value>
   </data>
-  <data name="ErrorReturnBikeLockClosedStartGetGPSExceptionMessage" xml:space="preserve">
-    <value>End rental at an unknown location is not possible.
-Start getting geolocation failed.</value>
-  </data>
-  <data name="ErrorReturnBikeLockClosedGetGPSExceptionMessage" xml:space="preserve">
-    <value>End rental at an unknown location is not possible.
-Make sure you have granted location sharing permission and your location services are enabled.
-Try again!</value>
-  </data>
-  <data name="Error_ReturnBike_Station_Location_Message" xml:space="preserve">
+  <data name="ErrorEndRentalNotAtSuitableStation" xml:space="preserve">
     <value>We could not assign the bike to any station. For this we need your location information while you are standing right next to the bike. Only then your rental can be terminated!
 
-Approach the bike, turn on Bluetooth and Location services and try again.</value>
+Approach the bike lock, turn on Bluetooth and Location services and try again.</value>
   </data>
   <data name="ChangeLog_3_0_362_MK_SB" xml:space="preserve">
     <value>Some terms have been standardized, e.g:&lt;br/&gt;
@@ -1253,6 +1139,9 @@ Also:&lt;br/&gt;
   <data name="MarkingSearchBike" xml:space="preserve">
     <value>Search bike</value>
   </data>
+  <data name="QuestionRentalProcessCloseLockContinueRentalAnswer" xml:space="preserve">
+    <value>Park bike</value>
+  </data>
   <data name="MarkingReturnBikeBikeIsStateOkQuestion" xml:space="preserve">
     <value>Is bike okay?</value>
   </data>
@@ -1280,8 +1169,49 @@ Also:&lt;br/&gt;
   <data name="ChangeLog_3_0_366_MK_SB" xml:space="preserve">
     <value>On the "Select bike" page you can now search and rent several bikes one after the other. Afterwards you will find them under "My bikes".</value>
   </data>
-  <data name="ErrorQueryGeolocation" xml:space="preserve">
-    <value>Location query failed</value>
+  <data name="MarkingRentalProcessCloseLockStepGPS" xml:space="preserve">
+    <value>GPS data is requested.</value>
+  </data>
+  <data name="MarkingRentalProcessCloseLockStepCloseLock" xml:space="preserve">
+    <value>Lock closes.</value>
+  </data>
+  <data name="MarkingRentalProcessCloseLockObserve" xml:space="preserve">
+    <value>Watch the lock as it is closing!</value>
+  </data>
+  <data name="MarkingRentalProcessCloseLockStepUpload" xml:space="preserve">
+    <value>Status is being synchronized.</value>
+  </data>
+  <data name="MarkingRentalProcessEndRentalStepGPS" xml:space="preserve">
+    <value>Bike is assigned to station.</value>
+  </data>
+  <data name="MarkingRentalProcessEndRentalStepFeedback" xml:space="preserve">
+    <value>Give feedback on the bike.</value>
+  </data>
+  <data name="MarkingRentalProcessEndRentalStepUpload" xml:space="preserve">
+    <value>Status is being synchronized.</value>
+  </data>
+  <data name="MessageRentalProcessCloseLockFinishedText" xml:space="preserve">
+    <value>Bike is parked. Your chargeable rental continues!</value>
+  </data>
+  <data name="MessageRentalProcessCloseLockFinishedTitle" xml:space="preserve">
+    <value>Lock is closed</value>
+  </data>
+  <data name="MessageAnswerEndRentalOfMoreBikes" xml:space="preserve">
+    <value>End other rentals</value>
+  </data>
+  <data name="MessageAnswerFinished" xml:space="preserve">
+    <value>Finished</value>
+  </data>
+  <data name="MessageRentalProcessEndRentalFinishedText" xml:space="preserve">
+    <value>Rental costs will be automatically debited within the next days. Ensure sufficient account coverage. You can view your rental history under Account.
+
+Thank you for your ride!</value>
+  </data>
+  <data name="MessageRentalProcessEndRentalFinishedTitle" xml:space="preserve">
+    <value>Rental is terminated</value>
+  </data>
+  <data name="ChangeLog_3_0_367_MK_SB" xml:space="preserve">
+    <value>Changes in the return process: FIRST you must always complete the "Close lock" process. Only THEN you can finish the rental! If your rental was successfully ended, you will see a confirmation dialog.</value>
   </data>
   <data name="ActionSelectAnotherStation" xml:space="preserve">
     <value>Select another station</value>
@@ -1303,4 +1233,101 @@ Also:&lt;br/&gt;
  &lt;ul&gt;&lt;li&gt;Please contact the customer support immediately in case of problems with the bike rental!
 &lt;/li&gt;&lt;li&gt;To diagnose a problem, you can send us your app usage data via "Transfer diagnostic file". Without your active sending we do not record any of your data!&lt;/li&gt;&lt;/ul&gt;</value>
   </data>
+  <data name="StatusTextLockClosed" xml:space="preserve">
+    <value>Lock is closed</value>
+  </data>
+  <data name="StatusTextLockOpened" xml:space="preserve">
+    <value>Lock is open</value>
+  </data>
+  <data name="StatusTextRentalEnded" xml:space="preserve">
+    <value>Rental is terminated</value>
+  </data>
+  <data name="MarkingRentalProcessEndRentalWait" xml:space="preserve">
+    <value>Wait for the end of rental confirmation!</value>
+  </data>
+  <data name="MessageAnswerContactSupport" xml:space="preserve">
+    <value>Contact support</value>
+  </data>
+  <data name="MessageRentalProcessCloseLockNotClosedText" xml:space="preserve">
+    <value>Please try again or contact customer support.</value>
+  </data>
+  <data name="MessageRentalProcessCloseLockNotClosedTitle" xml:space="preserve">
+    <value>Lock is open!</value>
+  </data>
+  <data name="QuestionRentalProcessCloseLockEndOrContinueText" xml:space="preserve">
+    <value>Do you want to park the bike to continue riding later or return the bike now and end the rental?</value>
+  </data>
+  <data name="QuestionRentalProcessCloseLockEndOrContinueTitle" xml:space="preserve">
+    <value>Please choose</value>
+  </data>
+  <data name="QuestionRentalProcessCloseLockEndRentalAnswer" xml:space="preserve">
+    <value>End rental</value>
+  </data>
+  <data name="MarkingRentalProcessCloseLockCheckLock" xml:space="preserve">
+    <value>Check if the lock is really closed!</value>
+  </data>
+  <data name="SupportmailSubjectAppmail" xml:space="preserve">
+    <value>{0}-app request</value>
+  </data>
+  <data name="ErrorLockStatusUnknown" xml:space="preserve">
+    <value>Position of lock bolt is unknown. Lock could be closed or open. Please try again or report bike to operator!</value>
+  </data>
+  <data name="ErrorCancelReservationTitle" xml:space="preserve">
+    <value>Reservation could not be canceled!</value>
+  </data>
+  <data name="ErrorTryAgain" xml:space="preserve">
+    <value>Please try again.</value>
+  </data>
+  <data name="ErrorAccountInvalidAuthorization" xml:space="preserve">
+    <value>Your session has expired. Please login new and try again.</value>
+  </data>
+  <data name="ErrorSubmitFeedback" xml:space="preserve">
+    <value>This step is not mandatory. If you still want to provide feedback on the bike, contact the operator.</value>
+  </data>
+  <data name="ActionBook" xml:space="preserve">
+    <value>Rent bike</value>
+  </data>
+  <data name="ErrorOpenLockBikeAlreadyBooked" xml:space="preserve">
+    <value>Attention! Your rental has already started.
+If the lock still won't open, make sure the lock is closed and end rental.
+Important: Send an email to customer support (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.</value>
+  </data>
+  <data name="QuestionCloseOrBook" xml:space="preserve">
+    <value>Close lock or rent bike {0}?</value>
+  </data>
+  <data name="QuestionLogIn" xml:space="preserve">
+    <value>Do you want to go to the login page?</value>
+  </data>
+  <data name="QuestionLogInTitle" xml:space="preserve">
+    <value>You are not logged in!</value>
+  </data>
+  <data name="ErrorPageNotLoaded" xml:space="preserve">
+    <value>An error occurred. Please try again.</value>
+  </data>
+  <data name="ErrorPageNotLoadedTitle" xml:space="preserve">
+    <value>Page cannot be displayed.</value>
+  </data>
+  <data name="MarkingAccountReservedBookedBikes" xml:space="preserve">
+    <value>Currently {0} bikes reserved/ booked.</value>
+  </data>
+  <data name="MessageLogoutGoodbye" xml:space="preserve">
+    <value>User {0} successfully logged in.</value>
+  </data>
+  <data name="MessageLogoutGoodbyeTitle" xml:space="preserve">
+    <value>Goodbye!</value>
+  </data>
+  <data name="MarkingAccountConnectionInterrupted" xml:space="preserve">
+    <value>Connectivity: Connection interrupted.</value>
+  </data>
+  <data name="MarkingAccountConnectionOffline" xml:space="preserve">
+    <value>Connectivity: Offline.</value>
+  </data>
+  <data name="ChangeLog_3_0_370" xml:space="preserve">
+    <value>Attention! We have changed the process of how the rental is terminated:&lt;br/&gt;
+1. &lt;b&gt;Close lock&lt;/b&gt; first and follow the process to the end.&lt;br/&gt;
+2. Decide whether to&lt;br/&gt;
+  - Park bike (to ride on later, the chargeable rental continues!) or&lt;br/&gt;
+  - End rental (provided you are at a suitable station).&lt;br/&gt;
+3. After choosing &lt;b&gt;End rental&lt;/b&gt;: Follow the process, fill in the feedback and &lt;b&gt;wait for the end of rental confirmation!&lt;/b&gt;</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf
index 5c1d473..df8fb01 100644
--- a/TINKLib/MultilingualResources/TINKLib.de.xlf
+++ b/TINKLib/MultilingualResources/TINKLib.de.xlf
@@ -6,13 +6,13 @@
     </header>
     <body>
       <group id="TINKLIB/MULTILINGUALRESOURCES/APPRESOURCES.RESX" datatype="resx">
-        <trans-unit id="ActionBookOrClose" translate="yes" xml:space="preserve">
-          <source>Rent bike or close lock</source>
-          <target state="final">Rad mieten oder Schloss schließen</target>
+        <trans-unit id="ActionCloseOrBook" translate="yes" xml:space="preserve">
+          <source>Close lock or rent bike</source>
+          <target state="translated">Schloss schließen oder Rad mieten</target>
         </trans-unit>
         <trans-unit id="ActionCancelRequest" translate="yes" xml:space="preserve">
-          <source>Cancel bike reservation</source>
-          <target state="final">Reservierung aufheben</target>
+          <source>Cancel reservation</source>
+          <target state="translated">Reservierung aufheben</target>
         </trans-unit>
         <trans-unit id="ActionClose" translate="yes" xml:space="preserve">
           <source>Close lock</source>
@@ -74,18 +74,6 @@
           <source>This version of the {0} App is outdated. Please update to the latest version.</source>
           <target state="final">Diese Version der {0} App ist veraltet. Bitte auf aktuelle Version aktualisieren.</target>
         </trans-unit>
-        <trans-unit id="QuestionSupportmailSubject" translate="yes" xml:space="preserve">
-          <source>Does your request/comment relate to the {0}-app or to a more general subject?</source>
-          <target state="translated">Betrifft die Anfrage/Anmerkung die {0}-App oder ein allgemeines Thema?</target>
-        </trans-unit>
-        <trans-unit id="QuestionSupportmailAnswerApp" translate="yes" xml:space="preserve">
-          <source>{0} app request</source>
-          <target state="final">{0}-App Anfrage</target>
-        </trans-unit>
-        <trans-unit id="QuestionSupportmailAnswerOperator" translate="yes" xml:space="preserve">
-          <source>{0} request</source>
-          <target state="final">{0} Anfrage</target>
-        </trans-unit>
         <trans-unit id="MarkingAbout" translate="yes" xml:space="preserve">
           <source>Legal Information</source>
           <target state="final">Rechtliches</target>
@@ -122,21 +110,9 @@
           <source>Pricing</source>
           <target state="translated">Tarife</target>
         </trans-unit>
-        <trans-unit id="ErrorCloseLockBoldBlockedMessage" translate="yes" xml:space="preserve">
-          <source>Lock is blocked. Please ensure that no spoke or any other obstacle prevents the lock from closing and try again.</source>
-          <target state="translated">Schloss ist blockiert. Bitte stellen Sie sicher, dass keine Speiche oder ein anderer Gegenstand das Schloss blockiert und wiederholen Sie den Vorgang.</target>
-        </trans-unit>
-        <trans-unit id="ErrorCloseLockMovingMessage" translate="yes" xml:space="preserve">
-          <source>Lock can only be closed if bike is not moving. Please park bike and try again.</source>
-          <target state="final">Schloss kann erst geschlossen werden, wenn Rad nicht mehr bewegt wird. Bitte Rad abstellen und Vorgang wiederholen.</target>
-        </trans-unit>
-        <trans-unit id="ErrorBookedSearchMessage" translate="yes" xml:space="preserve">
-          <source>Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.</source>
-          <target state="translated">Ihr mobiles Gerät verbindet sich nicht mit dem Schloss. Bitte treten Sie möglichst nah an das Rad heran und probieren Sie es erneut. </target>
-        </trans-unit>
-        <trans-unit id="ErrorReservedSearchMessage" translate="yes" xml:space="preserve">
-          <source>Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.</source>
-          <target state="translated">Ihr mobiles Gerät verbindet sich nicht mit dem Schloss. Bitte treten Sie möglichst nah an das Rad heran und probieren Sie es erneut. </target>
+        <trans-unit id="ErrorLockMoving" translate="yes" xml:space="preserve">
+          <source>The process is motion sensitive. Step close to the lock, do not move, and try again.</source>
+          <target state="translated">Der Vorgang ist bewegungssensibel. Treten Sie nah an das Schloss heran, bewegen Sie sich nicht und versuchen Sie es erneut.</target>
         </trans-unit>
         <trans-unit id="ActivityTextBikesAtStationGetBikes" translate="yes" xml:space="preserve">
           <source>Loading bikes located at station...</source>
@@ -158,15 +134,15 @@
           <source>Loading Stations and Bikes...</source>
           <target state="translated">Lade Stationen und Räder...</target>
         </trans-unit>
-        <trans-unit id="ErrorReturnBikeNotAtStationMessage" translate="yes" xml:space="preserve">
-          <source>End rental outside of station is not possible. Distance to station {0} is {1} m.</source>
-          <target state="translated">Rückgabe außerhalb einer Station nicht möglich. Entfernung zur nächsten Station {0} beträgt {1} m.</target>
+        <trans-unit id="ErrorEndRentalNotAtStation" translate="yes" xml:space="preserve">
+          <source>End rental outside or at wrong station is not possible. Distance to next suitable station {0} is {1} m.</source>
+          <target state="translated">Rückgabe außerhalb oder an einer falschen Station nicht möglich. Entfernung zur nächsten kompatiblen Station {0} beträgt {1} m.</target>
         </trans-unit>
-        <trans-unit id="ErrorReturnBikeTitle" translate="yes" xml:space="preserve">
-          <source>Error at ending rental!</source>
-          <target state="translated">Fehler beim Beenden der Miete!</target>
+        <trans-unit id="ErrorEndRentalTitle" translate="yes" xml:space="preserve">
+          <source>Rental could not be terminated!</source>
+          <target state="translated">Miete konnte nicht beendet werden!</target>
         </trans-unit>
-        <trans-unit id="ErrorReturnBikeLockClosedNoGPSMessage" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorEndRentalUnknownLocation" translate="yes" xml:space="preserve">
           <source>End rental at an unknown location is not possible.
 Rental can be ended if
 - location information is available when closing lock
@@ -174,13 +150,7 @@ Rental can be ended if
           <target state="translated">Beenden der Miete an unbekanntem Standort nicht möglich.
 Ein Mietende ist möglich, wenn
 - beim Schließen des Schlosses Standortinformation verfügbar ist
-- beim Drücken von "Miete beenden" das Rad in Reichweite ist und Standortinformation verfügbar ist</target>
-        </trans-unit>
-        <trans-unit id="ErrorReturnBikeLockOpenNoGPSMessage" translate="yes" xml:space="preserve">
-          <source>End rental at an unknown location is not possible.
-Rental can only be ended if bike is in reach and location information is available.</source>
-          <target state="translated">Beenden der Miete an unbekanntem Standort nicht möglich.
-Mietende ist nur möglich, wenn das Rad in Reichweite ist und Standortinformation verfügbar ist.</target>
+- beim Drücken von "Miete beenden" das Fahrrad in Reichweite ist und Standortinformation verfügbar ist</target>
         </trans-unit>
         <trans-unit id="ErrorSupportmailCreateAttachment" translate="yes" xml:space="preserve">
           <source>Attachment could not be created.</source>
@@ -206,14 +176,6 @@ Mietende ist nur möglich, wenn das Rad in Reichweite ist und Standortinformatio
           <source>Warning</source>
           <target state="translated">Warnung</target>
         </trans-unit>
-        <trans-unit id="QuestionAnswerNo" translate="yes" xml:space="preserve">
-          <source>No</source>
-          <target state="translated">Nein</target>
-        </trans-unit>
-        <trans-unit id="QuestionAnswerYes" translate="yes" xml:space="preserve">
-          <source>Yes</source>
-          <target state="translated">Ja</target>
-        </trans-unit>
         <trans-unit id="QuestionSupportmailAttachment" translate="yes" xml:space="preserve">
           <source>I hereby consent to the transmission of my diagnostic file.
 
@@ -222,11 +184,7 @@ The diagnostic file contains your app usage data as well as system information.
 
 Die Diagnosedatei enthält Ihre App-Nutzungsdaten sowie Systeminformationen. Die Daten werden ausschließlich für Diagnosezwecke bzw. Verbesserung der App verwendet und werden anschließend gelöscht.</target>
         </trans-unit>
-        <trans-unit id="QuestionTitle" translate="yes" xml:space="preserve">
-          <source>Question</source>
-          <target state="translated">Frage</target>
-        </trans-unit>
-        <trans-unit id="MessageMapPageErrorAuthcookieUndefined" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorMapPageAuthcookieUndefined" translate="yes" xml:space="preserve">
           <source>Session has expired.
 Please log in again.</source>
           <target state="translated">Sitzung ist abgelaufen.
@@ -244,7 +202,7 @@ Bitte melden Sie sich erneut an.</target>
         </trans-unit>
         <trans-unit id="StatusTextBooked" translate="yes" xml:space="preserve">
           <source>Bike is rented.</source>
-          <target state="translated">Rad ist gemietet.</target>
+          <target state="translated">Fahrrad ist gemietet.</target>
         </trans-unit>
         <trans-unit id="StatusTextBookedSince" translate="yes" xml:space="preserve">
           <source>Rented since {0}.</source>
@@ -332,65 +290,25 @@ Bitte melden Sie sich erneut an.</target>
 </source>
           <target state="translated">Zur Information!</target>
         </trans-unit>
-        <trans-unit id="MessageLoginConnectionErrorMessage" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorLoginNoCookie" translate="yes" xml:space="preserve">
           <source>Login cookie must not be empty. {0}</source>
           <target state="translated">Anmeldungskeks darf nicht leer sein. {0}</target>
         </trans-unit>
-        <trans-unit id="MessageLoginConnectionErrorTitle" translate="yes" xml:space="preserve">
-          <source>Connection error during registration!</source>
-          <target state="translated">Verbindungsfehler beim Registrieren!</target>
-        </trans-unit>
-        <trans-unit id="MessageLoginErrorTitle" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorLoginTitle" translate="yes" xml:space="preserve">
           <source>Error while logging in!</source>
           <target state="translated">Fehler bei der Anmeldung!</target>
         </trans-unit>
-        <trans-unit id="MessageLoginRecoverPassword" translate="yes" xml:space="preserve">
-          <source>Please connect to Internet to recover the password.</source>
-          <target state="translated">Zur Wiederherstellung des Passworts bitte mit dem Internet verbinden.</target>
-        </trans-unit>
-        <trans-unit id="MessageLoginRegisterNoNet" translate="yes" xml:space="preserve">
-          <source>Please connect to Internet to register.</source>
-          <target state="translated">Zur Registrierung bitte mit dem Internet verbinden.</target>
-        </trans-unit>
-        <trans-unit id="MessageTitleHint" translate="yes" xml:space="preserve">
-          <source>Hint</source>
-          <target state="translated">Hinweis</target>
-        </trans-unit>
-        <trans-unit id="ErrorOpenLockStillClosedMessage" translate="yes" xml:space="preserve">
-          <source>After try to open lock state closed is reported.</source>
-          <target state="translated">Nach Versuch das Schloss zu öffnen, wird Status "geschlossen" zurückgemeldet.</target>
-        </trans-unit>
-        <trans-unit id="ErrorOpenLockOutOfReachMessage" translate="yes" xml:space="preserve">
-          <source>Lock cannot be opened until bike is near.</source>
-          <target state="translated">Schloss kann erst geöffnet werden, wenn Rad in der Nähe ist.</target>
-        </trans-unit>
-        <trans-unit id="ErrorCloseLockOutOfReachMessage" translate="yes" xml:space="preserve">
-          <source>Lock cannot be closed until bike is near.</source>
-          <target state="translated">Schloss kann erst geschlossen werden, wenn Rad in der Nähe ist. </target>
-        </trans-unit>
-        <trans-unit id="ErrorCloseLockOutOfReachStateReservedMessage" translate="yes" xml:space="preserve">
-          <source>Lock cannot be closed until bike is near.
-Please try again to close bike or report bike to operator!</source>
-          <target state="translated">Schloss kann erst geschlossen werden, wenn Rad in der Nähe ist.
-Bitte Schließen nochmals versuchen oder Rad dem Betreiber melden!</target>
+        <trans-unit id="ErrorOpenLockStillClosed" translate="yes" xml:space="preserve">
+          <source>Lock reports it is still closed. Please try again!</source>
+          <target state="translated">Schloss meldet, dass es immer noch geschlossen ist. Bitte versuchen Sie erneut!</target>
         </trans-unit>
         <trans-unit id="ErrorCloseLockTitle" translate="yes" xml:space="preserve">
-          <source>Lock can not be closed!</source>
-          <target state="translated">Schloss kann nicht geschlossen werden!</target>
+          <source>Lock could not be closed!</source>
+          <target state="translated">Schloss konnte nicht geschlossen werden!</target>
         </trans-unit>
-        <trans-unit id="ErrorCloseLockStillOpenMessage" translate="yes" xml:space="preserve">
-          <source>After try to close lock state open is reported.</source>
-          <target state="translated">Nach Versuch Schloss zu schließen, wird Status "offen" zurückgemeldet.</target>
-        </trans-unit>
-        <trans-unit id="ErrorCloseLockUnexpectedStateMessage" translate="yes" xml:space="preserve">
-          <source>Lock reports state "{0}".</source>
-          <target state="translated">Schloss meldet Status "{0}".</target>
-        </trans-unit>
-        <trans-unit id="ErrorCloseLockUnkErrorMessage" translate="yes" xml:space="preserve">
-          <source>Please try to lock again or report bike to operator!
-{0}</source>
-          <target state="translated">Bitte Schließen nochmals versuchen oder Rad dem Betreiber melden!
-{0}</target>
+        <trans-unit id="ErrorLockUnexpectedState" translate="yes" xml:space="preserve">
+          <source>Unexpected locking state "{0}" detected. Please try again or report bike to operator!</source>
+          <target state="translated">Unerwarteter Schlosszustand "{0}" detektiert. Bitte versuchen Sie es erneut oder melden Sie das Fahrrad dem Betreiber!</target>
         </trans-unit>
         <trans-unit id="MessageBikesManagementLocationPermission" translate="yes" xml:space="preserve">
           <source>Please allow location sharing so that bike lock/locks can be managed.</source>
@@ -399,10 +317,10 @@ Bitte Schließen nochmals versuchen oder Rad dem Betreiber melden!</target>
         <trans-unit id="MessageBikesManagementLocationPermissionOpenDialog" translate="yes" xml:space="preserve">
           <source>Please allow location sharing so that bike lock/locks can be managed.
 Open sharing dialog?</source>
-          <target state="translated">Bitte Standortfreigabe erlauben, damit Radschloss/-schlösser verwaltet werden können.
+          <target state="translated">Bitte Standortfreigabe erlauben, damit Fahrradschloss/-schlösser verwaltet werden können.
 Freigabedialog öffen?</target>
         </trans-unit>
-        <trans-unit id="MessageCenterMapLocationPermissionOpenDialog" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorMapCenterNoLocationPermissionOpenDialog" translate="yes" xml:space="preserve">
           <source>Please allow location sharing so that map can be centered.
 Open sharing dialog?</source>
           <target state="translated">Bitte Standortfreigabe erlauben, damit Karte zentriert werden werden kann.
@@ -461,26 +379,26 @@ Freigabedialog öffen?</target>
           <target state="translated">Um den Schlossstatus zu aktualisieren, wird Internet benötigt. Bitte stellen Sie eine Internetverbindung her!</target>
         </trans-unit>
         <trans-unit id="ActivityTextClosingLock" translate="yes" xml:space="preserve">
-          <source><bpt id="1">&lt;h4&gt;</bpt><bpt id="2">&lt;b&gt;</bpt>Lock is closing.&lt;br/&gt;Please wait until it is completely closed.<ept id="2">&lt;/b&gt;</ept><ept id="1">&lt;/h4&gt;</ept></source>
-          <target state="translated"><bpt id="1">&lt;h4&gt;</bpt><bpt id="2">&lt;b&gt;</bpt>Schloss schließt.&lt;br/&gt;Bitte warten Sie, bis es komplett geschlossen ist.<ept id="2">&lt;/b&gt;</ept><ept id="1">&lt;/h4&gt;</ept></target>
+          <source>Stay with the bike until the lock is closed.</source>
+          <target state="translated">Bleiben Sie am Fahrrad stehen, bis das Schloss geschlossen ist.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_203" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_203" translate="yes" xml:space="preserve">
           <source>Updated to latest lock firmware.</source>
           <target state="translated">Aktualisierrt auf aktuelle Schloss-Firmware.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_204" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_204" translate="yes" xml:space="preserve">
           <source>Bluetooth communication inproved.</source>
           <target state="translated">Bluetooth Kommunikation verbessert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_205" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_205" translate="yes" xml:space="preserve">
           <source>Nicer station markers for iOS.</source>
           <target state="translated">Stationssymbole verbessert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_206" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_206" translate="yes" xml:space="preserve">
           <source>Bluetooth and geolocation functionality improved.</source>
           <target state="translated">Bluetooth- und Geolocation-Funktionalität verbessert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_207" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_207" translate="yes" xml:space="preserve">
           <source>Minor fixes related to renting functionality.
 Software packages updated.
 Targets Android 11.</source>
@@ -498,29 +416,25 @@ Zielplatform Android 11.</target>
         </trans-unit>
         <trans-unit id="ActivityTextErrorReadingChargingLevelOutOfReach" translate="yes" xml:space="preserve">
           <source>Battery status can only be read when bike is nearby.</source>
-          <target state="translated">Akkuladestand kann erst gelesen werden, wenn Rad in der Nähe ist.</target>
+          <target state="translated">Akkuladestand kann erst gelesen werden, wenn Fahrrad in der Nähe ist.</target>
         </trans-unit>
         <trans-unit id="ActivityTextRentingBike" translate="yes" xml:space="preserve">
           <source>Renting bike...</source>
           <target state="translated">Miete Rad...</target>
         </trans-unit>
-        <trans-unit id="MessageRentingBikeErrorConnectionTitle" translate="yes" xml:space="preserve">
-          <source>Connection error when renting the bike!</source>
-          <target state="translated">Verbingungsfehler beim Mieten des Rads!</target>
+        <trans-unit id="ErrorRentingBikeTitle" translate="yes" xml:space="preserve">
+          <source>Bike could not be rented!</source>
+          <target state="translated">Fahrrad konnte nicht gemietet werden!</target>
         </trans-unit>
-        <trans-unit id="MessageRentingBikeErrorGeneralTitle" translate="yes" xml:space="preserve">
-          <source>Error when renting the bike!</source>
-          <target state="translated">Fehler beim Mieten des Rads!</target>
-        </trans-unit>
-        <trans-unit id="MessageRentingBikeErrorTooManyReservationsRentals" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorRentingBikeTooManyReservationsRentals" translate="yes" xml:space="preserve">
           <source>A rental of bike {0} was rejected because the maximum allowed number of {1} reservations/rentals had already been made.</source>
-          <target state="translated">Eine Miete des Rads {0} wurde abgelehnt, weil die maximal erlaubte Anzahl von {1} Reservierungen/Mieten bereits getätigt wurden.</target>
+          <target state="translated">Eine Miete des Fahrrads {0} wurde abgelehnt, weil die maximal erlaubte Anzahl von {1} Reservierungen/Mieten bereits getätigt wurden.</target>
         </trans-unit>
-        <trans-unit id="MessageReservationBikeErrorTooManyReservationsRentals" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorReservingBikeTooManyReservationsRentals" translate="yes" xml:space="preserve">
           <source>A reservation of bike {0} was rejected because the maximum allowed number of {1} reservations/rentals had already been made.</source>
-          <target state="translated">Eine Reservierung des Rads {0} wurde abgelehnt, weil die maximal erlaubte Anzahl von {1} Reservierungen/Mieten bereits getätigt wurden.</target>
+          <target state="translated">Eine Reservierung des Fahrrads {0} wurde abgelehnt, weil die maximal erlaubte Anzahl von {1} Reservierungen/Mieten bereits getätigt wurden.</target>
         </trans-unit>
-        <trans-unit id="MessageErrorLockIsClosedThreeLines" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorLockIsClosedThreeLines" translate="yes" xml:space="preserve">
           <source>Attention: Lock is closed!
 {0}
 {1}</source>
@@ -528,29 +442,29 @@ Zielplatform Android 11.</target>
 {0}
 {1}</target>
         </trans-unit>
-        <trans-unit id="MessageErrorLockIsClosedTwoLines" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorLockIsClosedTwoLines" translate="yes" xml:space="preserve">
           <source>Attention: Lock is closed!
 {0}</source>
           <target state="translated">Achtung: Schloss wird geschlossen!
 {0}</target>
         </trans-unit>
-        <trans-unit id="ExceptionTextRentingBikeFailedGeneral" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorRentingBike" translate="yes" xml:space="preserve">
           <source>The rental of bike {0} has failed.</source>
-          <target state="translated">Die Miete des Rads {0} ist fehlgeschlagen.</target>
+          <target state="translated">Die Miete des Fahrrads {0} ist fehlgeschlagen.</target>
         </trans-unit>
-        <trans-unit id="ExceptionTextRentingBikeFailedUnavailalbe" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorRentingBikeUnavailalbe" translate="yes" xml:space="preserve">
           <source>The rental of bike {0} has failed, the bike is currently unavailable. {1}</source>
-          <target state="translated">Die Miete des Rads {0} ist fehlgeschlagen, das Rad ist momentan nicht erreichbar.{1}</target>
+          <target state="translated">Die Miete des Fahrrads {0} ist fehlgeschlagen, das Fahrrad ist momentan nicht erreichbar.{1}</target>
         </trans-unit>
-        <trans-unit id="ExceptionTextReservationBikeFailedGeneral" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorReservingBike" translate="yes" xml:space="preserve">
           <source>The reservation of bike {0} has failed.</source>
-          <target state="translated">Die Reservierung des Rads {0} ist fehlgeschlagen.</target>
+          <target state="translated">Die Reservierung des Fahrrads {0} ist fehlgeschlagen.</target>
         </trans-unit>
-        <trans-unit id="ExceptionTextReservationBikeFailedUnavailalbe" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorReservingBikeUnavailalbe" translate="yes" xml:space="preserve">
           <source>The reservation of bike {0} has failed, the bike is currently unavailable. {1}</source>
-          <target state="translated">Die Reservierung des Rads {0} ist fehlgeschlagen, das Rad ist momentan nicht erreichbar.{1}</target>
+          <target state="translated">Die Reservierung des Fahrrads {0} ist fehlgeschlagen, das Fahrrad ist momentan nicht erreichbar.{1}</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_208" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_208" translate="yes" xml:space="preserve">
           <source>Minor fixes.</source>
           <target state="translated">Kleinere Fehlerbehebungen.</target>
         </trans-unit>
@@ -566,13 +480,13 @@ Zielplatform Android 11.</target>
           <source>Invalid state for bike {0} detected.
 Bike should always be disconnected when not reserved or rented.
 Please restart app in order to get bike info.</source>
-          <target state="translated">Ungülitiger Status von Rad {0} erkannt.
-Ein nicht reserviertes oder gemietetes Rad sollte immer getrennt sein.
-Bitte App neu starten, um Radinfos zu bekommen.</target>
+          <target state="translated">Ungülitiger Status von Fahrrad {0} erkannt.
+Ein nicht reserviertes oder gemietetes Fahrrad sollte immer getrennt sein.
+Bitte App neu starten, um Fahrradinfos zu bekommen.</target>
         </trans-unit>
         <trans-unit id="MarkingBikeInfoErrorStateUnknownDetected" translate="yes" xml:space="preserve">
           <source>Unknown status for bike {0} detected.</source>
-          <target state="translated">Ungültiger Mietstatus von Rad {0} erkannt.
+          <target state="translated">Ungültiger Mietstatus von Fahrrad {0} erkannt.
 
 </target>
         </trans-unit>
@@ -584,7 +498,7 @@ Bitte App neu starten, um Radinfos zu bekommen.</target>
           <source>Cancel reservation for bike {0}?</source>
           <target state="translated">Reservierung für Rad {0} aufheben?</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_209" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_209" translate="yes" xml:space="preserve">
           <source>Minor fix: Bikes are disconnected as soon as becoming disposable.</source>
           <target state="translated">Kleinere Fehlerbehebung: Verbindung wird getrennt, sobald Rad verfügbar ist.</target>
         </trans-unit>
@@ -650,11 +564,11 @@ Bitte App neu starten, um Radinfos zu bekommen.</target>
           <source>Searching lock...</source>
           <target state="translated">Suche Schloss...</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_214" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_214" translate="yes" xml:space="preserve">
           <source>Multiple operators support.</source>
           <target state="translated">Mehrbetreiber Unterstützung.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_215" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_215" translate="yes" xml:space="preserve">
           <source>Layout of "Whats New"-dialog improved :-)</source>
           <target state="translated">Layout des "Whats New"-Dialos verbessert :-)</target>
         </trans-unit>
@@ -662,45 +576,45 @@ Bitte App neu starten, um Radinfos zu bekommen.</target>
           <source>€/day</source>
           <target state="translated">€/Tag</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_216" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_216" translate="yes" xml:space="preserve">
           <source>GUI layout improved.</source>
           <target state="translated">Oberflächenlayout verbessert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_217" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_217" translate="yes" xml:space="preserve">
           <source>Packages updated.</source>
           <target state="translated">Pakete aktualisiert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_219" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_219" translate="yes" xml:space="preserve">
           <source>Icons added to flyout menu.</source>
           <target state="translated">Icons zum Flyout-Menü hinzugefügt.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_220" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_220" translate="yes" xml:space="preserve">
           <source>GUI layout improved.</source>
           <target state="translated">Oberflächenlayout verbessert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_221" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_221" translate="yes" xml:space="preserve">
           <source>GUI layout improved.</source>
           <target state="translated">Oberflächenlayout verbessert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_222" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_222" translate="yes" xml:space="preserve">
           <source>Minor bugfix and improvements.</source>
           <target state="translated">Kleine Fehlerbehebungen und Verbesserungen.</target>
         </trans-unit>
-        <trans-unit id="MessageLogoutErrorTitle" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorLogoutTitle" translate="yes" xml:space="preserve">
           <source>Error while logging out!</source>
           <target state="translated">Fehler beim Abmelden!</target>
         </trans-unit>
         <trans-unit id="MessageCopriVersionIsOutdated" translate="yes" xml:space="preserve">
           <source>This version of the {0} App is not compatible with server detected.
-Please contact operator for help.</source>
+Please contact customer support for help.</source>
           <target state="translated">Diese Version der {0} App ist nicht kompatibel mit dem erkannten Server. 
-Bitte kontaktieren sie den Betreiber!</target>
+Bitte kontaktieren sie den Kundensupport!</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_224" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_224" translate="yes" xml:space="preserve">
           <source>Updated for latest server version.</source>
           <target state="translated">Aktualisiert auf aktuelle Serverversion.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_226" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_226" translate="yes" xml:space="preserve">
           <source>Fixes
 - station markers are updated correctly after login/ logout if required
 - routing from "bikes at station" to "login" page and other routings corrected</source>
@@ -717,7 +631,7 @@ Bitte kontaktieren sie den Betreiber!</target>
           <source>Connection error. Status code: {0}.</source>
           <target state="translated">Verbindungsfehler. Statuscode: {0}.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_227" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_227" translate="yes" xml:space="preserve">
           <source>Feedback dialog added which is shown after ending rental.</source>
           <target state="translated">Seite zur Eingabe von Rückmeldungen hinzugefügt, der nach Rückgabe eines Rads angezeigt wird.</target>
           <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
@@ -730,11 +644,7 @@ Bitte kontaktieren sie den Betreiber!</target>
           <source>Cache used.</source>
           <target state="translated">Cache genutzt.</target>
         </trans-unit>
-        <trans-unit id="ErrorReturnSubmitFeedbackMessage" translate="yes" xml:space="preserve">
-          <source>Your feedback could not be send to server successfully.</source>
-          <target state="translated">Ihre Rückmeldung konnte nicht an den Server übermittelt werden.</target>
-        </trans-unit>
-        <trans-unit id="ErrorReturnSubmitFeedbackTitle" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorSubmitFeedbackTitle" translate="yes" xml:space="preserve">
           <source>Submitting feedback failed!</source>
           <target state="translated">Übermittlung der Rückmeldung fehlgeschlagen!</target>
         </trans-unit>
@@ -742,29 +652,25 @@ Bitte kontaktieren sie den Betreiber!</target>
           <source>Updating....</source>
           <target state="translated">Aktualisiere....</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_231" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_231" translate="yes" xml:space="preserve">
           <source>Minor improvements.</source>
           <target state="translated">Kleine Verbesserungen.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_232" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_232" translate="yes" xml:space="preserve">
           <source>Menu modified.</source>
           <target state="translated">Menu geändert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_234" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_234" translate="yes" xml:space="preserve">
           <source>Tariff info page is displayed correctly again.
 Error handling improved.</source>
           <target state="translated">Tarifinfo-Seite wird wieder korrekt angezeigt.
 Fehlerhandling verbessert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_235" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_235" translate="yes" xml:space="preserve">
           <source>Obsolete object replaced with up-to-date one.</source>
           <target state="translated">Veraltetes Objekt durch aktuelles ersetzt.</target>
         </trans-unit>
-        <trans-unit id="ErrorOpenLockTitle" translate="yes" xml:space="preserve">
-          <source>Error while opening lock!</source>
-          <target state="translated">Fehler beim Öffnen des Schlosses!</target>
-        </trans-unit>
-        <trans-unit id="ChangeLog3_0_236" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_236" translate="yes" xml:space="preserve">
           <source>Stations names instead descriptions shown on page title.
 Error message when opening lock fails improved.
 Layout of bike names and id display improved.</source>
@@ -772,12 +678,12 @@ Layout of bike names and id display improved.</source>
 Fehlermeldung beim Öffnen von Schloss verbessert.
 Layout Anzeige Radnamen und nummern verbessert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_237" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_237" translate="yes" xml:space="preserve">
           <source>Hard- and software information send to backend when ending rental.</source>
           <target state="translated">Hard- und software information werden an Backend übermittelt bei Radrückgabe.</target>
           <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_239" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_239" translate="yes" xml:space="preserve">
           <source>Bugfix: Bike description is displayed correctly again.</source>
           <target state="translated">Fehlerbehebung: Radname wird wieder korrekt angezeigt.</target>
         </trans-unit>
@@ -793,7 +699,7 @@ Layout Anzeige Radnamen und nummern verbessert.</target>
           <source>Loading Bikes...</source>
           <target state="translated">Lade Räder...</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_240" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_240" translate="yes" xml:space="preserve">
           <source>Find bike by id functionality added.</source>
           <target state="translated">Wahl eines Rads über die Radnummer hinzugefügt.</target>
         </trans-unit>
@@ -809,7 +715,7 @@ Layout Anzeige Radnamen und nummern verbessert.</target>
           <source>First select the station whose operator you want to contact.</source>
           <target state="translated">Wählen Sie zunächst die Station, zu deren Betreiber Sie Kontakt aufnehmen möchten.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_241" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_241" translate="yes" xml:space="preserve">
           <source>Bike sharing system operator specific support info displayed on contact page.</source>
           <target state="translated">Auf der Kontaktseite werden Kontaktinformationen betreiberspezifisch angezeigt.</target>
         </trans-unit>
@@ -825,7 +731,7 @@ Layout Anzeige Radnamen und nummern verbessert.</target>
           <source>Contact</source>
           <target state="translated">Kontakt</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_242" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_242" translate="yes" xml:space="preserve">
           <source>Select station page added to ease getting operator specific contact information.</source>
           <target state="translated">Seite zur Auswahl einer Station hinzugefügt zum Abrufen von Kontaktinformationen.</target>
         </trans-unit>
@@ -838,7 +744,7 @@ Layout Anzeige Radnamen und nummern verbessert.</target>
           <target state="translated">Betreiber: {0}.</target>
         </trans-unit>
         <trans-unit id="MarkingBikeSharingOperatorNoOperatorInfoAvailable" translate="yes" xml:space="preserve">
-          <source>Contact operator.</source>
+          <source>contact customer support.</source>
           <target state="translated">Betreiber kontaktieren.</target>
         </trans-unit>
         <trans-unit id="MiniSurveyAskForAnswer" translate="yes" xml:space="preserve">
@@ -849,7 +755,7 @@ Layout Anzeige Radnamen und nummern verbessert.</target>
           <source>Enter answer here please.</source>
           <target state="translated">Bitte Antwort hier eingeben.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_243" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_243" translate="yes" xml:space="preserve">
           <source>Mini survey implemented.
 Minor fixes.</source>
           <target state="translated">Miniumfrage implementiert.
@@ -863,18 +769,13 @@ Kleinere Verbesserungen.</target>
           <source>Query location...</source>
           <target state="translated">Abfrage Standort...</target>
         </trans-unit>
-        <trans-unit id="MessageErrorQueryLocationTitle" translate="yes" xml:space="preserve">
-          <source>Error query location!</source>
-          <target state="translated">Fehler bei Standortabfrage!</target>
+        <trans-unit id="ErrorQueryLocationTitle" translate="yes" xml:space="preserve">
+          <source>Location could not be determined!</source>
+          <target state="translated">Standort konnte nicht bestimmt werden!</target>
         </trans-unit>
-        <trans-unit id="MessageErrorQueryLocationMessage" translate="yes" xml:space="preserve">
-          <source>Closing the lock and ending the rental is not possible.</source>
-          <target state="translated">Schloss schließen und Miete beenden ist nicht möglich.</target>
-        </trans-unit>
-        <trans-unit id="MessageErrorQueryLocationStartTitle" translate="yes" xml:space="preserve">
-          <source>Error start query location!</source>
-          <target state="translated">Fehler beim Start der Standortabfrage!</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+        <trans-unit id="ErrorQueryLocationStartTitle" translate="yes" xml:space="preserve">
+          <source>Location query could not be started!</source>
+          <target state="translated">Standortabfrage konnte nicht gestartet werden!</target>
         </trans-unit>
         <trans-unit id="ActivityTextErrorQueryLocationWhenAny" translate="yes" xml:space="preserve">
           <source>No location info available. Activate your device's location services.</source>
@@ -894,11 +795,11 @@ Kleinere Verbesserungen.</target>
         </trans-unit>
         <trans-unit id="QuestionCloseLockAndReturnBike" translate="yes" xml:space="preserve">
           <source>Close lock and end rental of bike {0}?</source>
-          <target state="translated">Rad {0} abschließen und Miete beenden?</target>
+          <target state="translated">Fahrrad {0} abschließen und Miete beenden?</target>
         </trans-unit>
         <trans-unit id="QuestionReturnBike" translate="yes" xml:space="preserve">
           <source>End rental of bike {0}?</source>
-          <target state="translated">Miete von Rad {0} beenden?
+          <target state="translated">Miete von Fahrrad {0} beenden?
 </target>
         </trans-unit>
         <trans-unit id="ActivityTextReturningBike" translate="yes" xml:space="preserve">
@@ -907,21 +808,17 @@ Kleinere Verbesserungen.</target>
         </trans-unit>
         <trans-unit id="QuestionOpenLockAndBookBike" translate="yes" xml:space="preserve">
           <source>Rent bike {0} and open lock?</source>
-          <target state="translated">Rad {0} mieten und Schloss öffnen?</target>
+          <target state="translated">Fahrrad {0} mieten und Schloss öffnen?</target>
         </trans-unit>
-        <trans-unit id="ErrorReturnBikeNoWebMessage" translate="yes" xml:space="preserve">
-          <source>Internet must be available when ending rental. Please establish an Internet connection!</source>
-          <target state="translated">Um die Miete zu beenden, wird Internet benötigt. Bitte stellen Sie eine Internetverbindung her!</target>
+        <trans-unit id="ErrorNoWeb" translate="yes" xml:space="preserve">
+          <source>A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.</source>
+          <target state="translated">Es wird eine stabile Internetverbindung benötigt. Verbinden Sie sich mit WIFI oder Mobilem Netzwerk und aktivieren Sie Mobile Daten. Versuchen Sie erneut.</target>
         </trans-unit>
-        <trans-unit id="ErrorReturnBikeNoWebTitle" translate="yes" xml:space="preserve">
-          <source>Connection error when ending rental.</source>
-          <target state="translated">Verbingungsfehler beim Beenden der Miete!</target>
-        </trans-unit>
-        <trans-unit id="ChangeLog3_0_244" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_244" translate="yes" xml:space="preserve">
           <source>Closing lock and returning bike speeded up.</source>
           <target state="translated">Abschließen von Rad und Radrückgabe beschleunigt.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_249" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_249" translate="yes" xml:space="preserve">
           <source>Third-party components updated.</source>
           <target state="translated">Komponenten von Fremdanbietern aktualisiert.</target>
         </trans-unit>
@@ -929,7 +826,7 @@ Kleinere Verbesserungen.</target>
           <source>ID: {0}</source>
           <target state="translated">ID: {0}</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_250" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_250" translate="yes" xml:space="preserve">
           <source>Station id displayed.
 Center map to current position issue fixed.
 Minor improvements.</source>
@@ -937,15 +834,15 @@ Minor improvements.</source>
 Kartenzentrierfehler behoben.
 Kleine Verbesserungen.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_263" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_263" translate="yes" xml:space="preserve">
           <source>CO2 saving is displayed for  bikes with GPS-lock after returning bike.</source>
           <target state="translated">Bei Fahrrädern mit GPS-Schloss wird die CO2-Einsparung nach der Rückgabe des Fahrrads angezeigt.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_264" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_264" translate="yes" xml:space="preserve">
           <source>Bug "object reference not set ...." <bpt id="1">&lt;a href="https://dev.azure.com/TeilRad/sharee.bike%20App/_workitems/edit/186"&gt;</bpt>185<ept id="1">&lt;/a&gt;</ept> fixed.</source>
           <target state="translated">Fehler  "object reference not set ...." <bpt id="1">&lt;a href="https://dev.azure.com/TeilRad/sharee.bike%20App/_workitems/edit/186"&gt;</bpt>185<ept id="1">&lt;/a&gt;</ept> behoben.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_265" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_265" translate="yes" xml:space="preserve">
           <source>Filter functionality city bike/ cargo bike improved.
 Layouting improved.
 App supports deep linking.</source>
@@ -965,11 +862,11 @@ Deep linking wird unterstützt.</target>
           <source>Tariff {0}, nr. {1}</source>
           <target state="translated">Tarif {0}, Nr. {1}</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_266" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_266" translate="yes" xml:space="preserve">
           <source>Location permissions handling improved.</source>
           <target state="translated">Abfrage Erlaubnis für Zugriff azf Standort verbessert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_276" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_276" translate="yes" xml:space="preserve">
           <source>Link to operator AGB is displayed if required.
 Display of status information extended.
 Bugfix: Sending support mails works again. </source>
@@ -977,28 +874,24 @@ Bugfix: Sending support mails works again. </source>
 Anzeige von Statusinformationen erweitert.
 Fehlerbehebung: Supportmails können wieder verschickt werden.</target>
         </trans-unit>
-        <trans-unit id="MessageMapPageErrorSwitch" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorMapPageSwitchBikeType" translate="yes" xml:space="preserve">
           <source>An error occurred switching between cargo and city bikes.
 {0}</source>
           <target state="translated">Beim Umschalten zwischen Lasten- und Stadträdern ist ein Fehler aufgetreten.
 {0}</target>
         </trans-unit>
-        <trans-unit id="MessageErrorSelectBikeNoBikeFound" translate="yes" xml:space="preserve">
-          <source>No bike with id {0} found. It may already be reserved by another user or it may be defective.</source>
-          <target state="translated">Kein Rad mit ID {0} gefunden. Möglicherweise ist es bereits durch einen anderen Nutzer / eine andere Nutzerin reserviert oder defekt.</target>
+        <trans-unit id="ErrorSelectBikeNoBikeFound" translate="yes" xml:space="preserve">
+          <source>Bike with id {0} may already be reserved by another user or it may be defective.</source>
+          <target state="translated">Das Fahrrad mit ID {0} ist möglicherweise bereits durch einen anderen Nutzer / eine andere Nutzerin reserviert oder defekt.</target>
         </trans-unit>
-        <trans-unit id="MessageErrorSelectBikeTitle" translate="yes" xml:space="preserve">
-          <source>Error Selecting Bike!</source>
-          <target state="translated">Fehler beim Auswählen des Rads!</target>
+        <trans-unit id="ErrorSelectBikeTitle" translate="yes" xml:space="preserve">
+          <source>The requested bike was not found.</source>
+          <target state="translated">Das angefragte Fahrrad wurde nicht gefunden.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_277" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_277" translate="yes" xml:space="preserve">
           <source>Bugfix: No more closing of app on Select Bike page.</source>
           <target state="translated">Fehlerbehebung: App schließt sich nicht mehr auf Fahrrad Wählen-Seite.</target>
         </trans-unit>
-        <trans-unit id="ErrorBookedSearchMessageEscalationLevel1" translate="yes" xml:space="preserve">
-          <source>Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process.</source>
-          <target state="translated">Ihr mobiles Gerät verbindet sich immer noch nicht mit dem Schloss. Bitte starten Sie die App oder sogar Ihr mobiles Gerät neu und wiederholen Sie den Vorgang.</target>
-        </trans-unit>
         <trans-unit id="MessageAnswerCancel" translate="yes" xml:space="preserve">
           <source>Cancel</source>
           <target state="translated">Abbrechen</target>
@@ -1007,27 +900,11 @@ Fehlerbehebung: Supportmails können wieder verschickt werden.</target>
           <source>Retry</source>
           <target state="translated">Wiederholen</target>
         </trans-unit>
-        <trans-unit id="MessageConnectLockErrorTitle" translate="yes" xml:space="preserve">
-          <source>Error when connecting with lock!</source>
-          <target state="translated">Fehler beim Verbinden mit Schloss!</target>
+        <trans-unit id="ErrorConnectLockTitle" translate="yes" xml:space="preserve">
+          <source>Connection to the lock could not be established.</source>
+          <target state="translated">Es konnte keine Verbindung zum Schloss aufgebaut werden.</target>
         </trans-unit>
-        <trans-unit id="ErrorBookedSearchMessageEscalationLevel2" translate="yes" xml:space="preserve">
-          <source>It is still not possible to establish a connection between your mobile device and the bike lock. Please contact operator!
-
-Alternative:
-1. close app,
-2. press the button at the top of the lock briefly and release it as soon as it starts flashing,
-3. make sure that the lock is completely closed and remains closed.
-4. send e-mail to operator (otherwise your chargeable rental will continue!): Please include problem description, bike-id and drop-off station.</source>
-          <target state="translated">Es kann weiterhin keine Verbindung zwischen Ihrem mobilen Gerät und dem Schloss aufgebaut werden. Rufen Sie den Betreiber an!
-
-Alternativ: 
-1. App schließen,
-2. auf den Knopf oben am Schloss kurz drücken und sofort loslassen, sobald Knopf zu blinken beginnt,
-3. sicherstellen, dass das Schloss vollständig geschlossen ist und geschlossen bleibt. 
-4. E-Mail an Betreiber schicken (ansonsten läuft Ihre kostenpflichtige Miete weiter!): Bitte Problembeschreibung, Rad-ID und Abgabestation angeben.</target>
-        </trans-unit>
-        <trans-unit id="ChangeLog3_0_278" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_278" translate="yes" xml:space="preserve">
           <source>Hints added to ease closing of lock in case closing does not succeed on first try.</source>
           <target state="translated">Hinweise hinzugefügt, um das Schließen des Schlosses zu erleichtern, falls dies nicht beim ersten Versuch gelingt.</target>
         </trans-unit>
@@ -1039,49 +916,19 @@ Alternativ:
           <source>Lock not found</source>
           <target state="translated">Schloss nicht gefunden</target>
         </trans-unit>
-        <trans-unit id="ErrorFindLockRentedBikeOutOfReachMessage" translate="yes" xml:space="preserve">
-          <source>Lock can only be found when rented bike is nearby.</source>
-          <target state="translated">Schloss kann erst gefunden werden, wenn gemietetes Rad in der Nähe ist.</target>
+        <trans-unit id="ErrorLockNoStatus" translate="yes" xml:space="preserve">
+          <source>Lock status could not be determined. Please contact customer support.</source>
+          <target state="translated">Schlossstatus konnte nicht ermittelt werden. Bitte kontaktieren Sie den Kundensupport.</target>
         </trans-unit>
-        <trans-unit id="ErrorFindLockReservedBikeOutOfReachMessage" translate="yes" xml:space="preserve">
-          <source>Lock can only be found when reserved bike is nearby.</source>
-          <target state="translated">Schloss kann erst gefunden werden, wenn reserviertes Rad in der Nähe ist.</target>
+        <trans-unit id="ErrorLockBluetoothNotOn" translate="yes" xml:space="preserve">
+          <source>Activate Bluetooth and try again.</source>
+          <target state="translated">Aktivieren Sie Bluetooth und versuchen Sie es erneut.</target>
         </trans-unit>
-        <trans-unit id="MessageErrorConnectTitle" translate="yes" xml:space="preserve">
-          <source>Error when connecting to lock!</source>
-          <target state="translated">Fehler beim Verbinden mit Schloss!</target>
+        <trans-unit id="ErrorLockLocationOff" translate="yes" xml:space="preserve">
+          <source>Activate Location services and try again.</source>
+          <target state="translated">Aktivieren Sie Ihre Standortdienste und versuchen Sie es erneut.</target>
         </trans-unit>
-        <trans-unit id="ErrorConnectLockGeneralErrorMessage" translate="yes" xml:space="preserve">
-          <source>Communication error during lock search.</source>
-          <target state="translated">Kommunikationsfehler bei Schlosssuche.</target>
-        </trans-unit>
-        <trans-unit id="ErrorConnectLockRentedBikeNoWebMessage" translate="yes" xml:space="preserve">
-          <source>Internet must be reachable to connect to lock of rented bike. Please establish an Internet connection!</source>
-          <target state="translated">Internet muss erreichbar sein, um Verbindung mit Schloss für gemietetes Rad herzustellen. Bitte stellen Sie eine Internetverbindung her!</target>
-        </trans-unit>
-        <trans-unit id="ErrorConnectLockReservedBikeNoWebMessage" translate="yes" xml:space="preserve">
-          <source>Internet must be reachable to connect to lock of reserved bike. Please establish an Internet connection!</source>
-          <target state="translated">Internet muss erreichbar sein, um Verbindung mit Schloss für reserviertes Rad herzustellen. Bitte stellen Sie eine Internetverbindung her!</target>
-        </trans-unit>
-        <trans-unit id="ErrorFindLockReservedBikeNoStausMessage" translate="yes" xml:space="preserve">
-          <source>Lock status of the reserved bike could not be determined.</source>
-          <target state="translated">Schlossstatus des reservierten Rads konnte nicht ermittelt werden.</target>
-        </trans-unit>
-        <trans-unit id="ErrorFindLockBluetoothNotOn" translate="yes" xml:space="preserve">
-          <source>Please turn Bluetooth on, otherwise lock cannot be connected.</source>
-          <target state="translated">Bitte Bluetooth anschalten, anderenfalls ist eine Verbindung mit dem Schloss nicht möglich.</target>
-        </trans-unit>
-        <trans-unit id="ErrorFindLockLocationPermissionMissing" translate="yes" xml:space="preserve">
-          <source>Please grant location permissions, otherwise lock cannot be connected.</source>
-          <target state="translated">Bitte Standortfreigabe erteilen, anderenfalls ist eine Verbindung mit dem Schloss nicht möglich.
-
-</target>
-        </trans-unit>
-        <trans-unit id="ErrorFindLockLocationOff" translate="yes" xml:space="preserve">
-          <source>Please turn location services on, otherwise lock cannot be connected.</source>
-          <target state="translated">Bitte Standortdienste aktivieren, anderenfalls ist eine Verbindung mit dem Schloss nicht möglich.</target>
-        </trans-unit>
-        <trans-unit id="ChangeLog3_0_280" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_280" translate="yes" xml:space="preserve">
           <source>Errormessages improved for szenarios when 
 - bluetooth is off, 
 - location permission is not granted or 
@@ -1091,37 +938,29 @@ Alternativ:
 - die Standortfreigabe nicht erteilt wurde oder 
 - die Standorterkennung deaktiviert ist.</target>
         </trans-unit>
-        <trans-unit id="ErrorReservedSearchMessageEscalationLevel1" translate="yes" xml:space="preserve">
-          <source>Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process.</source>
-          <target state="translated">Ihr mobiles Gerät verbindet sich weiterhin nicht mit dem Schloss. Bitte starten Sie die App oder sogar Ihr mobiles Gerät neu und wiederholen Sie den Vorgang.</target>
-        </trans-unit>
-        <trans-unit id="ChangeLog3_0_282" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_282" translate="yes" xml:space="preserve">
           <source>Permission requests messages on iOS formulated in more detail.
 Hints to ease connecting to lock in case connecting does not succeed on first try improved.</source>
           <target state="translated">Freigabe-Erlaubnisanfragen unter iOS ausführlicher formuliert.
 Hinweise, um das Verbinden Schlosses zu erleichtern, falls dies nicht beim ersten Versuch gelingt, erweitert.</target>
         </trans-unit>
-        <trans-unit id="ExceptionTextSessionExpired" translate="yes" xml:space="preserve">
-          <source>The session has expired. Please register again.</source>
-          <target state="translated">Die Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.</target>
-        </trans-unit>
         <trans-unit id="ActivityTextAuthcookieNotDefinedException" translate="yes" xml:space="preserve">
           <source>Auth. expired</source>
           <target state="translated">Auth. abgelaufen</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_284" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_284" translate="yes" xml:space="preserve">
           <source>User friendly message is shown if authentication expired.</source>
           <target state="translated">Anzeige einer benutzerfreundlichen Meldung, wenn die Authentifizierung abgelaufen ist.</target>
         </trans-unit>
-        <trans-unit id="MessageAccountPageManageLogout" translate="yes" xml:space="preserve">
+        <trans-unit id="MarkingAccountPageManageLogout" translate="yes" xml:space="preserve">
           <source>Log out</source>
           <target state="translated">Abmelden</target>
         </trans-unit>
-        <trans-unit id="MessageAccountPageManagePersonalData" translate="yes" xml:space="preserve">
+        <trans-unit id="MarkingAccountPageManagePersonalData" translate="yes" xml:space="preserve">
           <source>Manage personal data</source>
           <target state="translated">Persönliche Daten verwalten</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_285" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_285" translate="yes" xml:space="preserve">
           <source>Framework updated. 
 Activity indicator added account management pages and logging extended.</source>
           <target state="translated">Framework aktualisiert. 
@@ -1131,19 +970,15 @@ Activity Indicator zu Konto-Verwaltungsseiten hinzugefügt und Logging erweitert
           <source>Starting end rental...</source>
           <target state="translated">Starte Miete beenden...</target>
         </trans-unit>
-        <trans-unit id="ExceptionTextWebConnectFailureException" translate="yes" xml:space="preserve">
-          <source>Is WIFI/mobile network available and mobile data activated?</source>
-          <target state="translated">Ist WLAN/Mobilfunknetz verfügbar und mobile Daten aktiviert?</target>
-        </trans-unit>
-        <trans-unit id="ChangeLog3_0_289" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_289" translate="yes" xml:space="preserve">
           <source>Flyout menu header improved.</source>
           <target state="translated">Flyout-Menü Überschift verschönert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_290" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_290" translate="yes" xml:space="preserve">
           <source>Geolocation is queried with higher accuracy.</source>
           <target state="translated">Der aktuelle Standort wird mit höherer Genauigkeit abgefragt.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_293" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_293" translate="yes" xml:space="preserve">
           <source>Target Android framework set from 11.0  to 12.0 (Level 31 S).
 NuGet packages updated.
 Started adding support for new lock type.
@@ -1182,15 +1017,15 @@ Kleinere Fehlerbehebungen.
           <source>Website caching</source>
           <target state="translated">Zwischenspeicherung von Websiten</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_298" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_298" translate="yes" xml:space="preserve">
           <source>New Wort-Bild-Marke integrated in flyout menu for Lastenrad Bayern App.</source>
           <target state="translated">Neue Wort-Bild-Marke in das Menü der Lastenrad Bayern App integriert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_299" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_299" translate="yes" xml:space="preserve">
           <source>Bugfix: Bluetooth lock control works again on Android 12.</source>
           <target state="translated">Fehlerbehebung: Bluetooth-Schlossansteuerung funktioniert wieder unter Android 12.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_301" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_301" translate="yes" xml:space="preserve">
           <source>Extended tariffs supported.</source>
           <target state="translated">Unterstützung erweiterte Tarife.</target>
         </trans-unit>
@@ -1198,7 +1033,7 @@ Kleinere Fehlerbehebungen.
           <source>€/month</source>
           <target state="translated">€/Monat</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_312" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_312" translate="yes" xml:space="preserve">
           <source>For Lastenrad Bayern users
 - missing titles added to several pages
 - new station markers availabe
@@ -1218,7 +1053,7 @@ Kleinere Fehlerbehebungen.
           <source>Failed to query available bikes.</source>
           <target state="translated">Abfrage der verfügbaren Räder fehlgeschlagen.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_318" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_318" translate="yes" xml:space="preserve">
           <source>Support for new lock type added.</source>
           <target state="translated">Neues Schloss unterstützt.</target>
         </trans-unit>
@@ -1226,30 +1061,18 @@ Kleinere Fehlerbehebungen.
           <source>Give feedback</source>
           <target state="translated">Rückmeldung geben</target>
         </trans-unit>
-        <trans-unit id="MessageReservingBikeErrorConnectionTitle" translate="yes" xml:space="preserve">
-          <source>Connection error when reserving the bike!</source>
-          <target state="translated">Verbingungsfehler beim Reservieren des Rads!</target>
+        <trans-unit id="ErrorNoConnectionTitle" translate="yes" xml:space="preserve">
+          <source>Connection to booking system not possible.</source>
+          <target state="translated">Verbindung zum Buchungssystem nicht möglich.</target>
         </trans-unit>
-        <trans-unit id="MessageReservingBikeErrorGeneralTitle" translate="yes" xml:space="preserve">
-          <source>Error when reserving the bike!</source>
-          <target state="translated">Fehler beim Reservieren des Rads!</target>
+        <trans-unit id="ErrorCancelReservationTitle" translate="yes" xml:space="preserve">
+          <source>Reservation could not be canceled!</source>
+          <target state="translated">Reservierung konnte nicht aufgehoben werden!</target>
         </trans-unit>
-        <trans-unit id="MessageCancelReservationBikeErrorGeneralTitle" translate="yes" xml:space="preserve">
-          <source>Error when canceling the reservation!</source>
-          <target state="translated">Fehler beim Aufheben der Reservierung!</target>
-        </trans-unit>
-        <trans-unit id="ErrorMessageInvalidAuthorizationResponseException" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorLoginInvalidAuthorization" translate="yes" xml:space="preserve">
           <source>Can not login user {0}. Mail address unknown or password invalid.</source>
           <target state="translated">Kann Benutzenden {0} nicht anmelden. Mailadresse unbekannt oder Passwort ungültig.</target>
         </trans-unit>
-        <trans-unit id="MessageCancelReservationBikeErrorConnectionTitle" translate="yes" xml:space="preserve">
-          <source>Connection error when canceling the reservation!</source>
-          <target state="translated">Verbingungsfehler beim Aufheben der Reservierung!</target>
-        </trans-unit>
-        <trans-unit id="MessageOpeningLockErrorConnectionTitle" translate="yes" xml:space="preserve">
-          <source>Connection error when opening the lock!</source>
-          <target state="translated">Verbindungsfehler beim Öffnen des Schlosses!</target>
-        </trans-unit>
         <trans-unit id="ActivityTextSubmittingFeedback" translate="yes" xml:space="preserve">
           <source>Submitting feedback...</source>
           <target state="translated">Sende Rückmeldung...</target>
@@ -1258,7 +1081,7 @@ Kleinere Fehlerbehebungen.
           <source>Menu</source>
           <target state="translated">Menü</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_324" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_324" translate="yes" xml:space="preserve">
           <source>Mein konrad design improved.</source>
           <target state="translated">Mein konrad Design verbessert.</target>
         </trans-unit>
@@ -1272,17 +1095,17 @@ Kleinere Fehlerbehebungen.
         </trans-unit>
         <trans-unit id="MarkingReturnBikeErrorDescriptionInputPlaceholder" translate="yes" xml:space="preserve">
           <source>Please describe technical defect of bike here.</source>
-          <target state="translated">Bitte technischen Defekt des Rads hier beschreiben.</target>
+          <target state="translated">Bitte technischen Defekt des Fahrrads hier beschreiben.</target>
         </trans-unit>
         <trans-unit id="MarkingReturnBikeMainMessage" translate="yes" xml:space="preserve">
           <source>Rental successfully ended!</source>
-          <target state="translated">Rad erfolgreich zurückgegeben!</target>
+          <target state="translated">Fahrrad erfolgreich zurückgegeben!</target>
         </trans-unit>
         <trans-unit id="MarkingDriveBatteryTitel" translate="yes" xml:space="preserve">
-          <source>Current battery level:</source>
-          <target state="translated">Aktueller Akkuladestand:</target>
+          <source>Transmit <bpt id="1">&lt;b&gt;</bpt>battery level<ept id="1">&lt;/b&gt;</ept> from the handlebar display:</source>
+          <target state="translated"><bpt id="1">&lt;b&gt;</bpt>Akkuladestand<ept id="1">&lt;/b&gt;</ept> vom Lenker-Display übertragen:</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_326" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_326" translate="yes" xml:space="preserve">
           <source>For Mein konrad users: Battery charging level is displayed for ebikes and is queried after return of bike.</source>
           <target state="translated">Für Mein konrad Nutzer: Anzeige des Akkuladestands für E-Bikes und Abfrage des Ladestands nach Radrückgabe.</target>
         </trans-unit>
@@ -1292,21 +1115,21 @@ Kleinere Fehlerbehebungen.
         </trans-unit>
         <trans-unit id="StatusTextCopriLock" translate="yes" xml:space="preserve">
           <source>At pausing ride, you close the bike lock manually, not via the app. To end the chargeable rental, slide the bike into an authorized station and confirm the end of the rental in the app; the lock closes automatically.</source>
-          <target state="translated">Zur Fahrpause schließen Sie das Schloss manuell, nicht über die App. Zum Beenden der kostenpflichtigen Miete schieben Sie das Rad in eine zugelassene Station und bestätigen das Mietende in der App; das Schloss schließt automatisch.</target>
+          <target state="translated">Zur Fahrpause schließen Sie das Schloss manuell, nicht über die App. Zum Beenden der kostenpflichtigen Miete schieben Sie das Fahrrad in eine zugelassene Station und bestätigen das Mietende in der App; das Schloss schließt automatisch.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_335" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_335" translate="yes" xml:space="preserve">
           <source>Sharee.bike design improved.</source>
           <target state="translated">Sharee.bike Design verbessert.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_334" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_334" translate="yes" xml:space="preserve">
           <source>Lastenrad Bayern users: battery charging level is displayed for ebikes.</source>
           <target state="translated">Für Lastenrad Bayern Nutzende: Akkuladestand für E-Bikes wird angezeigt.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_337_MK" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_337_MK" translate="yes" xml:space="preserve">
           <source>You will now be informed if the charge of the bike battery was last indicated as very low. To ensure the reliability of the battery level indicator in the app, please enter the current charge level in the app at the end of your ride with an e-bike.</source>
-          <target state="translated">Sie werden nun informiert, wenn die Ladung des Radakkus zuletzt als sehr niedrig angegeben wurde. Um die Zuverlässigkeit der Akkustandanzeige in der App zu gewährleisten, geben Sie bitte am Ende Ihrer Fahrt mit einem E-Lastenrad den aktuellen Ladestand in die App ein.</target>
+          <target state="translated">Sie werden nun informiert, wenn die Ladung des Fahrradakkus zuletzt als sehr niedrig angegeben wurde. Um die Zuverlässigkeit der Akkustandanzeige in der App zu gewährleisten, geben Sie bitte am Ende Ihrer Fahrt mit einem E-Lastenrad den aktuellen Ladestand in die App ein.</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_337_SB" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_337_SB" translate="yes" xml:space="preserve">
           <source>The app has a new design! --- You are a beta tester? Give us helpful feedback anytime via ‘Contact - Feedback about the App’. Not a beta tester yet? Become one and get great new features before anyone else!</source>
           <target state="translated">Die App hat ein neues Design! --- Sie sind Beta-Tester? Geben Sie uns jederzeit hilfreiche Rückmeldung über 'Kontakt - Rückmeldung zur App'. Sie sind noch kein Beta-Tester? Werden Sie es und erhalten Sie tolle neue Features vor allen anderen!</target>
         </trans-unit>
@@ -1314,7 +1137,7 @@ Kleinere Fehlerbehebungen.
           <source>- We have fixed a few minor bugs. Enjoy the ride!</source>
           <target state="translated">- Wir haben ein paar kleine Fehler behoben. Genießen Sie die Fahrt!</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_338_LB_MK" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_338_LB_MK" translate="yes" xml:space="preserve">
           <source>Besides minor bug fixes we have simplified the contact procedure:
 - For acute questions/problems about the bike or rental process, please contact the fleet operator.
 - For communication with the app developers, select "Feedback about the App".
@@ -1324,7 +1147,7 @@ To better analyze and improve processes in the app, please accept attaching your
 - Für eine Kommunikation mit den App-Entwicklern, wählen Sie "Rückmeldung zur App".
 Um Prozesse in der App besser analysieren und verbessern zu können, akzeptieren Sie bitte das Anhängen Ihrer Protokolldatei an Ihre Nachricht. Wir freuen uns sowohl über kritische als auch über positive Rückmeldungen!</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_338_SB" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_338_SB" translate="yes" xml:space="preserve">
           <source>Besides minor bug fixes we have simplified the contact procedure:
 - For acute questions/problems about the bike or rental process, please contact the fleet operator.
 - For communication with the app developers, select "Feedback about the App".
@@ -1346,11 +1169,7 @@ Außerdem: Kleine Grafiken lassen auf einen Blick erkennen um was für einen Rad
           <source>{0}-request: station {1}</source>
           <target state="translated">{0}-Anfrage: Station {1}</target>
         </trans-unit>
-        <trans-unit id="QuestionSupportmailAnswerNo" translate="yes" xml:space="preserve">
-          <source>No, do not attach file</source>
-          <target state="translated">Nein, Datei nicht anhängen</target>
-        </trans-unit>
-        <trans-unit id="QuestionSupportmailTitle" translate="yes" xml:space="preserve">
+        <trans-unit id="QuestionSupportmailAttachmentTitle" translate="yes" xml:space="preserve">
           <source>Consent</source>
           <target state="translated">Einwilligung</target>
         </trans-unit>
@@ -1358,7 +1177,7 @@ Außerdem: Kleine Grafiken lassen auf einen Blick erkennen um was für einen Rad
           <source>Prefix and No., e.g. TR15</source>
           <target state="translated">Präfix und Nr., z.B. TR15</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_339_MK" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_339_MK" translate="yes" xml:space="preserve">
           <source>The cargo bikes from the suburbs now show their home station in their name. These bikes must be returned there!
 
 You can now see at a glance which app version you have installed: in the menu at the very bottom. Please update the app regularly to be up to date in functionality and design!</source>
@@ -1366,7 +1185,7 @@ You can now see at a glance which app version you have installed: in the menu at
 
 Sie können nun auf einen Blick sehen, welche App-Version Sie installiert haben: im Menü ganz unten. Bitte aktualisieren Sie die App regelmäßig, um in Funktionalität und Design auf dem neuesten Stand zu sein!</target>
         </trans-unit>
-        <trans-unit id="ChangeLog3_0_339_SB_LB" translate="yes" xml:space="preserve">
+        <trans-unit id="ChangeLog_3_0_339_SB_LB" translate="yes" xml:space="preserve">
           <source>You can now see at a glance which app version you have installed: in the menu at the very bottom. Please update the app regularly to be up to date in functionality and design!</source>
           <target state="translated">Sie können nun auf einen Blick sehen, welche App-Version Sie installiert haben: im Menü ganz unten. Bitte aktualisieren Sie die App regelmäßig, um in Funktionalität und Design auf dem neuesten Stand zu sein!</target>
         </trans-unit>
@@ -1428,10 +1247,6 @@ Kleinere Verbesserungen.&lt;br/&gt;
 
 </target>
         </trans-unit>
-        <trans-unit id="ErrorNotConnectedToNetwork" translate="yes" xml:space="preserve">
-          <source>Not connected to network.</source>
-          <target state="translated">Keine Verbindung zum Netzwerk.</target>
-        </trans-unit>
         <trans-unit id="ChangeLog_3_0_347_SB" translate="yes" xml:space="preserve">
           <source><bpt id="1">&lt;i&gt;</bpt>Select Bike<ept id="1">&lt;/i&gt;</ept>- page revised.&lt;br/&gt;
 Setting added to select whether the app starts up showing either
@@ -1470,7 +1285,7 @@ Beim Login können Sie nun Ihr eingegebenes Passwort einsehen.&lt;br/&gt;
 &lt;br/&gt;
 Probieren Sie es aus!</target>
         </trans-unit>
-        <trans-unit id="MessageErrorLocationIsOff" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorMapCenterLocationIsOff" translate="yes" xml:space="preserve">
           <source>Turn on your device's location services to center the map on your current location.</source>
           <target state="translated">Schalten Sie die Standortdienste Ihres Geräts ein, um die Karte auf Ihren aktuellen Standort zu zentrieren.</target>
         </trans-unit>
@@ -1506,39 +1321,21 @@ Probieren Sie es aus!</target>
           <source>There are currently no bikes reserved/rented by user {0}.</source>
           <target state="translated">Momentan sind keine Räder von Nutzer {0} reserviert/gemietet.</target>
         </trans-unit>
-        <trans-unit id="MessageTitleInformation" translate="yes" xml:space="preserve">
-          <source>Information</source>
-          <target state="translated">Information</target>
-        </trans-unit>
         <trans-unit id="ChangeLog_MinorImprovements" translate="yes" xml:space="preserve">
           <source>- Minor improvements.</source>
           <target state="translated">- Kleine Verbesserungen.</target>
         </trans-unit>
-        <trans-unit id="ErrorOpenLockBoldStatusIsUnknownMessage" translate="yes" xml:space="preserve">
-          <source>The lock could not be opened correctly. Try again!
-
-Attention! Your rental has already started.
-If the lock still won't open, make sure the lock is closed and end rental.
-Important: Send an email to the operator (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.</source>
-          <target state="translated">Das Schloss konnte nicht korrekt geöffnet werden. Bitte versuchen Sie es erneut.
-
-Achtung! Ihre Miete hat bereits begonnen.
-
-Wenn sich das Schloss weiterhin nicht öffnen lässt, vergewissern Sie sich, dass das Schloss geschlossen ist und geben Sie das Rad zurück. 
-Wichtig: Schicken Sie eine E-Mail an den Betreiber (ansonsten läuft Ihre kostenpflichtige Miete weiter!): Problembeschreibung, Radnummer, Abgabestation.</target>
+        <trans-unit id="ErrorOpenLockStatusUnknown" translate="yes" xml:space="preserve">
+          <source>Position of lock bolt is unknown. Lock could be closed or open. Please try again!</source>
+          <target state="translated">Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder geöffnet sein. Bitte versuchen Sie es erneut!</target>
         </trans-unit>
-        <trans-unit id="ErrorOpenLockStillClosedTitle" translate="yes" xml:space="preserve">
-          <source>Lock can not be opened!</source>
-          <target state="translated">Schloss kann nicht geöffnet werden!</target>
+        <trans-unit id="ErrorOpenLockTitle" translate="yes" xml:space="preserve">
+          <source>Lock could not be opened!</source>
+          <target state="translated">Schloss konnte nicht geöffnet werden!</target>
         </trans-unit>
-        <trans-unit id="ErrorOpenLockBoldIsBlockedMessage" translate="yes" xml:space="preserve">
-          <source>Ensure that no obstacle prevents lock from opening and try again.</source>
-          <target state="translated">Stellen Sie sicher, dass kein Hindernis das Öffnen des Schlosses verhindert und versuchen Sie es erneut.</target>
-        </trans-unit>
-        <trans-unit id="MarkingNoNetworkConnection" translate="yes" xml:space="preserve">
-          <source>Oops, there is no Internet connection.</source>
-          <target state="translated">Ups, es ist keine Internetverbindung vorhanden.</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+        <trans-unit id="ErrorOpenLockBoldBlocked" translate="yes" xml:space="preserve">
+          <source>Lock bolt is blocked. Make sure that no spoke presses against the lock bolt and try again.</source>
+          <target state="translated">Der Schlossbügel ist blockiert. Stellen Sie sicher, dass keine Speiche gegen den Bügel drückt und versuchen Sie es erneut.</target>
         </trans-unit>
         <trans-unit id="ChangeLog_3_0_358_MK_SB" translate="yes" xml:space="preserve">
           <source>New functions:<bpt id="1">&lt;ul&gt;</bpt><bpt id="2">&lt;li&gt;</bpt>If your device is not connected to the Internet, this is now displayed at the top.<ept id="2">&lt;/li&gt;</ept><bpt id="3">&lt;li&gt;</bpt>You can now update your bike view by dragging from top to bottom. Especially useful after you reconnect to the Internet.<ept id="3">&lt;/li&gt;</ept><ept id="1">&lt;/ul&gt;</ept>
@@ -1550,27 +1347,17 @@ Wichtig: Schicken Sie eine E-Mail an den Betreiber (ansonsten läuft Ihre kosten
           <source>If you have reserved or rented a bike, this will now be shown to you as an icon on the map page. Clicking on it will take you directly to the 'My bikes' page. We have also made small design changes.</source>
           <target state="translated">Wenn Sie ein Rad reserviert oder gemietet haben, wird dies Ihnen nun auf der Kartenseite als Symbol angezeigt. Ein Klick darauf führt Sie direkt zur Seite 'Meine Räder'. Wir haben außerdem kleine Designänderungen vorgenommen.</target>
         </trans-unit>
-        <trans-unit id="ErrorReturnBikeLockClosedStartGetGPSExceptionMessage" translate="yes" xml:space="preserve">
-          <source>End rental at an unknown location is not possible.
-Start getting geolocation failed.</source>
-          <target state="translated">Beenden der Miete an unbekanntem Standort is nicht möglich.
-Fehler beim Start der Standortabfrage!</target>
+        <trans-unit id="ErrorNoLocationPermission" translate="yes" xml:space="preserve">
+          <source>Grant Location permission, activate Location services and try again.</source>
+          <target state="translated">Erteilen Sie die Standortberechtigung, aktivieren Sie die Standortdienste und versuchen Sie es erneut.</target>
         </trans-unit>
-        <trans-unit id="ErrorReturnBikeLockClosedGetGPSExceptionMessage" translate="yes" xml:space="preserve">
-          <source>End rental at an unknown location is not possible.
-Make sure you have granted location sharing permission and your location services are enabled.
-Try again!</source>
-          <target state="translated">Beenden der Miete an unbekanntem Standort is nicht möglich.
-Stellen Sie sicher, dass Sie die Erlaubnis zur Standortfreigabe erteilt haben und Ihre Standortdienste aktiviert sind.
-Versuchen Sie erneut!</target>
-        </trans-unit>
-        <trans-unit id="Error_ReturnBike_Station_Location_Message" translate="yes" xml:space="preserve">
+        <trans-unit id="ErrorEndRentalNotAtSuitableStation" translate="yes" xml:space="preserve">
           <source>We could not assign the bike to any station. For this we need your location information while you are standing right next to the bike. Only then your rental can be terminated!
 
-Approach the bike, turn on Bluetooth and Location services and try again.</source>
-          <target state="translated">Wir konnten das Rad keiner Station zuordnen. Dazu benötigen wir Ihre Standortinformationen, während Sie direkt neben dem Rad stehen. Nur dann kann Ihre Miete beendet werden!
+Approach the bike lock, turn on Bluetooth and Location services and try again.</source>
+          <target state="translated">Wir konnten das Fahrrad keiner Station zuordnen. Dazu benötigen wir Ihre Standortinformationen, während Sie direkt neben dem Fahrrad stehen. Nur dann kann Ihre Miete beendet werden!
 
-Treten Sie an das Rad heran, schalten Sie Bluetooth und Standortdienste ein und versuchen Sie es erneut.</target>
+Treten Sie an das Fahrradschloss heran, schalten Sie Bluetooth und Standortdienste ein und versuchen Sie es erneut.</target>
         </trans-unit>
         <trans-unit id="ChangeLog_3_0_362_MK_SB" translate="yes" xml:space="preserve">
           <source>Some terms have been standardized, e.g:&lt;br/&gt;
@@ -1605,7 +1392,7 @@ Außerdem:&lt;br/&gt;
         </trans-unit>
         <trans-unit id="MarkingFindBikeLabel" translate="yes" xml:space="preserve">
           <source>Bike id</source>
-          <target state="translated">Rad-ID</target>
+          <target state="translated">Fahrrad-ID</target>
         </trans-unit>
         <trans-unit id="MarkingSearchBike" translate="yes" xml:space="preserve">
           <source>Search bike</source>
@@ -1613,11 +1400,11 @@ Außerdem:&lt;br/&gt;
         </trans-unit>
         <trans-unit id="MarkingReturnBikeBikeIsStateOkQuestion" translate="yes" xml:space="preserve">
           <source>Is bike okay?</source>
-          <target state="translated">Ist das Rad in Ordnung?</target>
+          <target state="translated">Fahrrad ist in Ordnung?</target>
         </trans-unit>
         <trans-unit id="MarkingReturnBikeBikeStateIsOK" translate="yes" xml:space="preserve">
           <source>bike is ok</source>
-          <target state="translated">Rad ist in Ordnung</target>
+          <target state="translated">Fahrrad ist in Ordnung</target>
         </trans-unit>
         <trans-unit id="MarkingReturnBikeFeedbackInputPlaceholder" translate="yes" xml:space="preserve">
           <source>Please enter feedback here if needed.</source>
@@ -1647,9 +1434,53 @@ Außerdem:&lt;br/&gt;
           <source>On the "Select bike" page you can now search and rent several bikes one after the other. Afterwards you will find them under "My bikes".</source>
           <target state="translated">Auf der Seite "Rad auswählen" können Sie nun nacheinander mehrere Räder suchen und mieten. Im Anschluss finden Sie diese unter "Meine Räder".</target>
         </trans-unit>
-        <trans-unit id="ErrorQueryGeolocation" translate="yes" xml:space="preserve">
-          <source>Location query failed</source>
-          <target state="translated">Standortabfrage fehlgeschlagen</target>
+        <trans-unit id="MessageRentalProcessEndRentalFinishedText" translate="yes" xml:space="preserve">
+          <source>Rental costs will be automatically debited within the next days. Ensure sufficient account coverage. You can view your rental history under Account.
+
+Thank you for your ride!</source>
+          <target state="translated">Die Mietkosten werden in den nächsten Tagen automatisch abgebucht. Sorgen Sie für ausreichende Kontodeckung. Ihre Miethistorie können Sie unter Konto einsehen.
+
+Vielen Dank für Ihre Fahrt!</target>
+        </trans-unit>
+        <trans-unit id="MessageRentalProcessEndRentalFinishedTitle" translate="yes" xml:space="preserve">
+          <source>Rental is terminated</source>
+          <target state="translated">Miete ist beendet</target>
+        </trans-unit>
+        <trans-unit id="MessageAnswerEndRentalOfMoreBikes" translate="yes" xml:space="preserve">
+          <source>End other rentals</source>
+          <target state="translated">Weitere Mieten beenden</target>
+        </trans-unit>
+        <trans-unit id="MessageAnswerFinished" translate="yes" xml:space="preserve">
+          <source>Finished</source>
+          <target state="translated">Fertig</target>
+        </trans-unit>
+        <trans-unit id="MarkingRentalProcessCloseLockStepGPS" translate="yes" xml:space="preserve">
+          <source>GPS data is requested.</source>
+          <target state="translated">GPS-Daten werden abgefragt.</target>
+        </trans-unit>
+        <trans-unit id="MarkingRentalProcessCloseLockStepCloseLock" translate="yes" xml:space="preserve">
+          <source>Lock closes.</source>
+          <target state="translated">Schloss schließt.</target>
+        </trans-unit>
+        <trans-unit id="MarkingRentalProcessCloseLockStepUpload" translate="yes" xml:space="preserve">
+          <source>Status is being synchronized.</source>
+          <target state="translated">Status wird synchronisiert.</target>
+        </trans-unit>
+        <trans-unit id="MarkingRentalProcessEndRentalStepGPS" translate="yes" xml:space="preserve">
+          <source>Bike is assigned to station.</source>
+          <target state="translated">Fahrrad wird Station zugeordnet.</target>
+        </trans-unit>
+        <trans-unit id="MarkingRentalProcessEndRentalStepFeedback" translate="yes" xml:space="preserve">
+          <source>Give feedback on the bike.</source>
+          <target state="translated">Geben Sie Rückmeldung zum Fahrrad.</target>
+        </trans-unit>
+        <trans-unit id="MarkingRentalProcessEndRentalStepUpload" translate="yes" xml:space="preserve">
+          <source>Status is being synchronized.</source>
+          <target state="translated">Status wird synchronisiert.</target>
+        </trans-unit>
+        <trans-unit id="ChangeLog_3_0_367_MK_SB" translate="yes" xml:space="preserve">
+          <source>Changes in the return process: FIRST you must always complete the "Close lock" process. Only THEN you can finish the rental! If your rental was successfully ended, you will see a confirmation dialog.</source>
+          <target state="translated">Änderungen beim Rückgabeprozess: ZUERST müssen Sie immer den Vorgang "Schloss schließen" abschließen. Erst DANN können Sie die Miete beenden! Wurde Ihre Miete erfolgreich beendet, sehen Sie einen Bestätigungsdialog.</target>
         </trans-unit>
         <trans-unit id="MarkingContactCustomerSupportTitle" translate="yes" xml:space="preserve">
           <source>Customer support</source>
@@ -1679,6 +1510,206 @@ Außerdem:&lt;br/&gt;
  <bpt id="1">&lt;ul&gt;</bpt><bpt id="2">&lt;li&gt;</bpt>Bitte kontaktieren Sie bei Problemen bei der Fahrradmiete umgehend den Kundensupport!
 <ept id="2">&lt;/li&gt;</ept><bpt id="3">&lt;li&gt;</bpt>Für die Diagnose eines Problems können Sie über "Diagnosedatei übermitteln" Ihre App-Nutzungsdaten an uns senden. Ohne Ihr aktives Zusenden zeichnen wir keine Ihrer Daten auf!<ept id="3">&lt;/li&gt;</ept><ept id="1">&lt;/ul&gt;</ept></target>
         </trans-unit>
+        <trans-unit id="StatusTextLockClosed" translate="yes" xml:space="preserve">
+          <source>Lock is closed</source>
+          <target state="translated">Schloss ist geschlossen</target>
+        </trans-unit>
+        <trans-unit id="StatusTextLockOpened" translate="yes" xml:space="preserve">
+          <source>Lock is open</source>
+          <target state="translated">Schloss ist offen</target>
+        </trans-unit>
+        <trans-unit id="StatusTextRentalEnded" translate="yes" xml:space="preserve">
+          <source>Rental is terminated</source>
+          <target state="translated">Miete ist beendet</target>
+        </trans-unit>
+        <trans-unit id="MarkingRentalProcessCloseLockObserve" translate="yes" xml:space="preserve">
+          <source>Watch the lock as it is closing!</source>
+          <target state="translated">Beobachten Sie das Schloss beim Schließen!</target>
+        </trans-unit>
+        <trans-unit id="MarkingRentalProcessEndRentalWait" translate="yes" xml:space="preserve">
+          <source>Wait for the end of rental confirmation!</source>
+          <target state="translated">Warten Sie auf die Mietende-Bestätigung!</target>
+        </trans-unit>
+        <trans-unit id="MessageAnswerContactSupport" translate="yes" xml:space="preserve">
+          <source>Contact support</source>
+          <target state="translated">Support kontaktieren</target>
+        </trans-unit>
+        <trans-unit id="MessageRentalProcessCloseLockFinishedText" translate="yes" xml:space="preserve">
+          <source>Bike is parked. Your chargeable rental continues!</source>
+          <target state="translated">Fahrrad ist geparkt. Ihre kostenpflichtige Miete läuft weiter!</target>
+        </trans-unit>
+        <trans-unit id="MessageRentalProcessCloseLockFinishedTitle" translate="yes" xml:space="preserve">
+          <source>Lock is closed</source>
+          <target state="translated">Schloss ist geschlossen</target>
+        </trans-unit>
+        <trans-unit id="MessageRentalProcessCloseLockNotClosedText" translate="yes" xml:space="preserve">
+          <source>Please try again or contact customer support.</source>
+          <target state="translated">Versuchen Sie es bitte erneut oder kontaktieren Sie den Kundensupport.</target>
+        </trans-unit>
+        <trans-unit id="MessageRentalProcessCloseLockNotClosedTitle" translate="yes" xml:space="preserve">
+          <source>Lock is open!</source>
+          <target state="translated">Schloss ist offen!</target>
+        </trans-unit>
+        <trans-unit id="QuestionRentalProcessCloseLockContinueRentalAnswer" translate="yes" xml:space="preserve">
+          <source>Park bike</source>
+          <target state="translated">Fahrrad parken</target>
+        </trans-unit>
+        <trans-unit id="QuestionRentalProcessCloseLockEndOrContinueText" translate="yes" xml:space="preserve">
+          <source>Do you want to park the bike to continue riding later or return the bike now and end the rental?</source>
+          <target state="translated">Möchten Sie das Fahrrad parken, um später weiterzufahren, oder wollen Sie das Fahrrad jetzt zurückgeben und die Miete beenden?</target>
+        </trans-unit>
+        <trans-unit id="QuestionRentalProcessCloseLockEndOrContinueTitle" translate="yes" xml:space="preserve">
+          <source>Please choose</source>
+          <target state="translated">Bitte entscheiden Sie</target>
+        </trans-unit>
+        <trans-unit id="QuestionRentalProcessCloseLockEndRentalAnswer" translate="yes" xml:space="preserve">
+          <source>End rental</source>
+          <target state="translated">Miete beenden</target>
+        </trans-unit>
+        <trans-unit id="MarkingRentalProcessCloseLockCheckLock" translate="yes" xml:space="preserve">
+          <source>Check if the lock is really closed!</source>
+          <target state="translated">Schauen Sie, ob das Schloss wirklich zu ist!</target>
+        </trans-unit>
+        <trans-unit id="SupportmailSubjectAppmailWithStation" translate="yes" xml:space="preserve">
+          <source>{0}-app request: station {1}</source>
+          <target state="translated">{0}-App Anfrage: Station {1}</target>
+        </trans-unit>
+        <trans-unit id="ErrorConnectLock" translate="yes" xml:space="preserve">
+          <source>Please step as close as possible to the bike lock and try again.</source>
+          <target state="translated">Bitte treten Sie so nah wie möglich an das Fahrradschloss heran und versuchen Sie es erneut.</target>
+        </trans-unit>
+        <trans-unit id="ErrorCloseLockBoltBlocked" translate="yes" xml:space="preserve">
+          <source>Lock bolt is blocked. Make sure that no spoke or any other obstacle prevents the lock from closing and try again.</source>
+          <target state="translated">Der Schlossbügel ist blockiert. Vergewissern Sie sich, dass keine Speiche oder ein anderes Hindernis das Schließen des Schlosses verhindert, und versuchen Sie es erneut.</target>
+        </trans-unit>
+        <trans-unit id="MessageHintTitle" translate="yes" xml:space="preserve">
+          <source>Hint</source>
+          <target state="translated">Hinweis</target>
+        </trans-unit>
+        <trans-unit id="ErrorLockOutOfReach" translate="yes" xml:space="preserve">
+          <source>Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.</source>
+          <target state="translated">Stellen Sie sicher, dass Sie der App die Bluetooth-Freigabe erteilt haben. Treten Sie so nah wie möglich an das Fahrradschloss heran und versuchen Sie es erneut.</target>
+        </trans-unit>
+        <trans-unit id="ErrorCloseLock" translate="yes" xml:space="preserve">
+          <source>Step close to the lock and try again or report bike to operator!
+{0}</source>
+          <target state="translated">Treten Sie nah an das Schloss heran und versuchen Sie es erneut oder melden Sie das Fahrrad dem Betreiber!
+{0}</target>
+        </trans-unit>
+        <trans-unit id="ErrorConnectLockEscalationLevel1" translate="yes" xml:space="preserve">
+          <source>Your mobile device still does not connect to the bike lock. Please restart the app or even your mobile device and repeat the process.</source>
+          <target state="translated">Ihr mobiles Gerät verbindet sich immer noch nicht mit dem Fahrradschloss. Bitte starten Sie die App oder sogar Ihr mobiles Gerät neu und wiederholen Sie den Vorgang.</target>
+        </trans-unit>
+        <trans-unit id="ErrorConnectLockEscalationLevel2" translate="yes" xml:space="preserve">
+          <source>It is still not possible to establish a connection between your mobile device and the bike lock. Please contact customer support!
+
+Alternative:
+1. close app,
+2. press the button at the top of the lock briefly and release it as soon as it starts flashing,
+3. make sure that the lock is completely closed and remains closed.
+4. send e-mail to operator (otherwise your chargeable rental will continue!): Please include problem description, bike-id and drop-off station.</source>
+          <target state="translated">Es ist immer noch nicht möglich, eine Verbindung zwischen Ihrem mobilen Gerät und dem Fahrradschloss herzustellen. Bitte kontaktieren Sie den Kundensupport!
+
+Alternativ:
+1. App schließen,
+2. Drücken Sie kurz auf den Knopf oben am Schloss und lassen Sie ihn los, sobald er zu blinken beginnt,
+3. sicherstellen, dass das Schloss vollständig geschlossen ist und bleibt.
+4. E-Mail an den Kundensupport senden (sonst wird die kostenpflichtige Miete fortgesetzt!): Bitte Problembeschreibung, Fahrrad-ID und Rückgabestation angeben.</target>
+        </trans-unit>
+        <trans-unit id="ErrorReservingBikeTitle" translate="yes" xml:space="preserve">
+          <source>Bike could not be reserved!</source>
+          <target state="translated">Fahrrad konnte nicht reserviert werden!</target>
+        </trans-unit>
+        <trans-unit id="MessageInformationTitle" translate="yes" xml:space="preserve">
+          <source>Information</source>
+          <target state="translated">Information</target>
+        </trans-unit>
+        <trans-unit id="MarkingNoWeb" translate="yes" xml:space="preserve">
+          <source>Oops, there is no Internet connection.</source>
+          <target state="translated">Ups, keine Internetverbindung vorhanden.</target>
+        </trans-unit>
+        <trans-unit id="ErrorLockStatusUnknown" translate="yes" xml:space="preserve">
+          <source>Position of lock bolt is unknown. Lock could be closed or open. Please try again or report bike to operator!</source>
+          <target state="translated">Die Position des Schlossbügels ist unbekannt. Das Schloss könnte geschlossen oder offen sein. Bitte versuchen Sie es erneut oder melden Sie das Fahrrad dem Betreiber!</target>
+        </trans-unit>
+        <trans-unit id="ErrorTryAgain" translate="yes" xml:space="preserve">
+          <source>Please try again.</source>
+          <target state="translated">Bitte versuchen Sie es erneut.</target>
+        </trans-unit>
+        <trans-unit id="ErrorAccountInvalidAuthorization" translate="yes" xml:space="preserve">
+          <source>Your session has expired. Please login new and try again.</source>
+          <target state="translated">Ihre Sitzung ist abgelaufen. Bitte melden Sie sich neu an und versuchen Sie es erneut.</target>
+        </trans-unit>
+        <trans-unit id="ErrorSubmitFeedback" translate="yes" xml:space="preserve">
+          <source>This step is not mandatory. If you still want to provide feedback on the bike, contact the operator.</source>
+          <target state="translated">Dieser Schritt ist nicht zwingend erforderlich. Möchten Sie dennoch Rückmeldung zum Fahrrad geben, kontaktieren Sie den Kundensupport.</target>
+        </trans-unit>
+        <trans-unit id="ActionBook" translate="yes" xml:space="preserve">
+          <source>Rent bike</source>
+          <target state="translated">Rad mieten</target>
+        </trans-unit>
+        <trans-unit id="QuestionLogIn" translate="yes" xml:space="preserve">
+          <source>Do you want to go to the login page?</source>
+          <target state="translated">Möchten Sie zur Anmeldeseite wechseln?</target>
+        </trans-unit>
+        <trans-unit id="QuestionLogInTitle" translate="yes" xml:space="preserve">
+          <source>You are not logged in!</source>
+          <target state="translated">Sie sind nicht angemeldet!</target>
+        </trans-unit>
+        <trans-unit id="QuestionCloseOrBook" translate="yes" xml:space="preserve">
+          <source>Close lock or rent bike {0}?</source>
+          <target state="translated">Schloss schließen oder Rad {0} mieten?</target>
+        </trans-unit>
+        <trans-unit id="ErrorOpenLockBikeAlreadyBooked" translate="yes" xml:space="preserve">
+          <source>Attention! Your rental has already started.
+If the lock still won't open, make sure the lock is closed and end rental.
+Important: Send an email to customer support (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.</source>
+          <target state="translated">Achtung! Ihre Miete hat bereits begonnen.
+Wenn sich das Schloss immer noch nicht öffnen lässt, vergewissern Sie sich, dass das Schloss geschlossen ist und beenden Sie die Miete.
+Wichtig: Senden Sie eine E-Mail an den Kundensupport (sonst wird Ihre bezahlte Miete fortgesetzt!) mit: Problembeschreibung, Fahrradnummer, Rückgabestation.</target>
+        </trans-unit>
+        <trans-unit id="MarkingAccountReservedBookedBikes" translate="yes" xml:space="preserve">
+          <source>Currently {0} bikes reserved/ booked.</source>
+          <target state="translated">Aktuell {0} Fahrräder reserviert/ gebucht.</target>
+        </trans-unit>
+        <trans-unit id="MessageLogoutGoodbye" translate="yes" xml:space="preserve">
+          <source>User {0} successfully logged in.</source>
+          <target state="translated">NutzerIn {0} erfolgreich abgemeldet.</target>
+        </trans-unit>
+        <trans-unit id="MessageLogoutGoodbyeTitle" translate="yes" xml:space="preserve">
+          <source>Goodbye!</source>
+          <target state="translated">Auf Wiedersehen!</target>
+        </trans-unit>
+        <trans-unit id="ErrorPageNotLoaded" translate="yes" xml:space="preserve">
+          <source>An error occurred. Please try again.</source>
+          <target state="translated">Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut.</target>
+        </trans-unit>
+        <trans-unit id="ErrorPageNotLoadedTitle" translate="yes" xml:space="preserve">
+          <source>Page cannot be displayed.</source>
+          <target state="translated">Seite kann nicht angezeigt werden.</target>
+        </trans-unit>
+        <trans-unit id="MarkingAccountConnectionInterrupted" translate="yes" xml:space="preserve">
+          <source>Connectivity: Connection interrupted.</source>
+          <target state="translated">Verbindungsstatus: Verbindung unterbrochen.</target>
+        </trans-unit>
+        <trans-unit id="MarkingAccountConnectionOffline" translate="yes" xml:space="preserve">
+          <source>Connectivity: Offline.</source>
+          <target state="translated">Verbindungsstatus: Offline.</target>
+        </trans-unit>
+        <trans-unit id="ChangeLog_3_0_370" translate="yes" xml:space="preserve">
+          <source>Attention! We have changed the process of how the rental is terminated:&lt;br/&gt;
+1. <bpt id="1">&lt;b&gt;</bpt>Close lock<ept id="1">&lt;/b&gt;</ept> first and follow the process to the end.&lt;br/&gt;
+2. Decide whether to&lt;br/&gt;
+  - Park bike (to ride on later, the chargeable rental continues!) or&lt;br/&gt;
+  - End rental (provided you are at a suitable station).&lt;br/&gt;
+3. After choosing <bpt id="2">&lt;b&gt;</bpt>End rental<ept id="2">&lt;/b&gt;</ept>: Follow the process, fill in the feedback and <bpt id="3">&lt;b&gt;</bpt>wait for the end of rental confirmation!<ept id="3">&lt;/b&gt;</ept></source>
+          <target state="translated">Achtung! Wir haben den Vorgang, wie die Miete beendet wird, verändert:<it id="1" pos="open">&lt;br/&gt;</it>
+1. Zuerst <bpt id="1">&lt;b&gt;</bpt>Schloss schließen<ept id="1">&lt;/b&gt;</ept> und den Prozess bis zum Ende begleiten.<it id="1" pos="open">&lt;br/&gt;</it>
+2. Entscheiden, ob:<it id="1" pos="open">&lt;br/&gt;</it>
+  - Fahrrad parken (um später weiterzufahren, die kostenpflichtige Miete läuft dabei weiter!), oder<it id="1" pos="open">&lt;br/&gt;</it>
+  - Miete beenden (vorausgesetzt Sie befinden sich an einer passenden Station).<it id="1" pos="open">&lt;br/&gt;</it>
+3. Nach Wahl von <bpt id="1">&lt;b&gt;</bpt>Miete beenden<ept id="1">&lt;/b&gt;</ept>: Prozess verfolgen, Rückmeldung ausfüllen und <bpt id="1">&lt;b&gt;</bpt>unbedingt die Mietende-Bestätigung abwarten!<ept id="1">&lt;/b&gt;</ept></target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/TINKLib/Repository/CopriCallsMonkeyStore.cs b/TINKLib/Repository/CopriCallsMonkeyStore.cs
index a3d3e90..72a5f5f 100644
--- a/TINKLib/Repository/CopriCallsMonkeyStore.cs
+++ b/TINKLib/Repository/CopriCallsMonkeyStore.cs
@@ -6,6 +6,7 @@ using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.Services.CopriApi;
+using TINK.MultilingualResources;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
 using TINK.Repository.Response.Stations;
@@ -155,21 +156,21 @@ namespace TINK.Repository
 
 		public Task<ReservationBookingResponse> DoReserveAsync(string bikeId, Uri operatorUri)
 		{
-			throw new System.Exception("Reservierung im Offlinemodus nicht möglich!");
+			throw new System.Exception(AppResources.ErrorNoWeb);
 		}
 
 		public Task<ReservationCancelReturnResponse> DoCancelReservationAsync(string bikeId, Uri operatorUri)
 		{
-			throw new System.Exception("Abbrechen einer Reservierung im Offlinemodus nicht möglich!");
+			throw new System.Exception(AppResources.ErrorNoWeb);
 		}
 
 		public Task<ReservationBookingResponse> CalculateAuthKeysAsync(string bikeId, Uri operatorUri)
-			=> throw new System.Exception("Schlosssuche im Offlinemodus nicht möglich!");
+			=> throw new System.Exception(AppResources.ErrorNoWeb);
 
 		public Task<ResponseBase> StartReturningBike(
 			string bikeId,
 			Uri operatorUri)
-			=> throw new System.Exception("Benachrichtigung von start der Rückgabe im Offlinemodus nicht möglich!");
+			=> throw new System.Exception(AppResources.ErrorNoWeb);
 
 		public Task<ReservationBookingResponse> UpdateLockingStateAsync(
 			string bikeId,
@@ -178,10 +179,10 @@ namespace TINK.Repository
 			LocationDto geolocation,
 			double batteryLevel,
 			IVersionInfo versionInfo)
-			=> throw new System.Exception("Aktualisierung des Schlossstatuses im Offlinemodus nicht möglich!");
+			=> throw new System.Exception(AppResources.ErrorNoWeb);
 
 		public Task<ReservationBookingResponse> DoBookAsync(Uri operatorUri, string bikeId, Guid guid, double batteryPercentage, LockingAction? nextAction = null)
-			=> throw new System.Exception("Buchung im Offlinemodus nicht möglich!");
+			=> throw new System.Exception(AppResources.ErrorNoWeb);
 
 		/// <summary> Books a bike and starts opening bike. </summary>
 		/// <param name="bikeId">Id of the bike to book.</param>
@@ -190,7 +191,7 @@ namespace TINK.Repository
 		public Task<ReservationBookingResponse> BookAvailableAndStartOpeningAsync(
 			string bikeId,
 			Uri operatorUri)
-			=> throw new System.Exception("Buchung von verfügbarem Rad mit Start von Schlossöffnen ist im Offlinemodus nicht möglich!");
+			=> throw new System.Exception(AppResources.ErrorNoWeb);
 
 		/// <summary> Books a bike and starts opening bike. </summary>
 		/// <param name="bikeId">Id of the bike to book.</param>
@@ -199,13 +200,13 @@ namespace TINK.Repository
 		public Task<ReservationBookingResponse> BookReservedAndStartOpeningAsync(
 			string bikeId,
 			Uri operatorUri)
-			=> throw new System.Exception("Buchung von reserviertem Rad mit Start von Schlossöffnen ist im Offlinemodus nicht möglich!");
+			=> throw new System.Exception(AppResources.ErrorNoWeb);
 
 		public Task<DoReturnResponse> DoReturn(
 			string bikeId,
 			LocationDto geolocation,
 			Uri operatorUri)
-			=> throw new System.Exception("Rückgabe im Offlinemodus nicht möglich!");
+			=> throw new System.Exception(AppResources.ErrorNoWeb);
 
 		/// <summary> Returns a bike and starts closing. </summary>
 		/// <param name="bikeId">Id of the bike to return.</param>
@@ -214,24 +215,24 @@ namespace TINK.Repository
 		public Task<DoReturnResponse> ReturnAndStartClosingAsync(
 			string bikeId,
 			Uri operatorUri)
-			=> throw new System.Exception("Rückgabe mit Schloss schließen Befehl im Offlinemodus nicht möglich!");
+			=> throw new System.Exception(AppResources.ErrorNoWeb);
 
-		public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri) =>
-			throw new System.Exception("Übermittlung von Feedback im Offlinemodus nicht möglich!");
+		public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri)
+			=> throw new System.Exception(AppResources.ErrorNoWeb);
 
 		/// <summary> Submits mini survey to copri server. </summary>
 		/// <param name="answers">Collection of answers.</param>
 		public Task<ResponseBase> DoSubmitMiniSurvey(IDictionary<string, string> answers)
-			=> throw new System.Exception("Übermittlung von der Miniumfrage im Offlinemodus nicht möglich!");
+			=> throw new System.Exception(AppResources.ErrorNoWeb);
 
 		public Task<AuthorizationResponse> DoAuthorizationAsync(string p_strMailAddress, string p_strPassword, string p_strDeviceId)
 		{
-			throw new System.Exception("Anmelden im Offlinemodus nicht möglich!");
+			throw new System.Exception(AppResources.ErrorNoWeb);
 		}
 
 		public Task<AuthorizationoutResponse> DoAuthoutAsync()
 		{
-			throw new System.Exception("Abmelden im Offlinemodus nicht möglich!");
+			throw new System.Exception(AppResources.ErrorNoWeb);
 		}
 
 		public async Task<BikesAvailableResponse> GetBikesAvailableAsync()
diff --git a/TINKLib/Repository/Exception/AuthorizationResponseException.cs b/TINKLib/Repository/Exception/AuthorizationResponseException.cs
index 5269206..9e78239 100644
--- a/TINKLib/Repository/Exception/AuthorizationResponseException.cs
+++ b/TINKLib/Repository/Exception/AuthorizationResponseException.cs
@@ -1,4 +1,4 @@
-using TINK.MultilingualResources;
+using TINK.MultilingualResources;
 
 namespace TINK.Repository.Exception
 {
@@ -7,7 +7,7 @@ namespace TINK.Repository.Exception
 		/// <summary>Constructs a authorization exceptions. </summary>
 		/// <param name="mail">Mail address to create a detailed error message.</param>
 		public InvalidAuthorizationResponseException(string mail, Response.ResponseBase response) :
-			base(string.Format(AppResources.ErrorMessageInvalidAuthorizationResponseException, mail), response)
+			base(string.Format(AppResources.ErrorAccountInvalidAuthorization, mail), response)
 		{
 		}
 
diff --git a/TINKLib/Repository/Exception/WebConnectFailureException.cs b/TINKLib/Repository/Exception/WebConnectFailureException.cs
index 8ce5f3e..399d373 100644
--- a/TINKLib/Repository/Exception/WebConnectFailureException.cs
+++ b/TINKLib/Repository/Exception/WebConnectFailureException.cs
@@ -1,17 +1,11 @@
-using TINK.MultilingualResources;
+using TINK.MultilingualResources;
 
 namespace TINK.Repository.Exception
 {
 	public class WebConnectFailureException : CommunicationException
 	{
 		/// <summary>
-		/// Returns a hint to fix communication problem.
-		/// </summary>
-		public static string GetHintToPossibleExceptionsReasons
-			=> AppResources.ExceptionTextWebConnectFailureException;
-
-		/// <summary>
-		/// Constructs a communication exeption object.
+		/// Constructs a communication exception object.
 		/// </summary>
 		/// <param name="message"></param>
 		/// <param name="exception"></param>
diff --git a/TINKLib/Repository/Request/IRequestBuilder.cs b/TINKLib/Repository/Request/IRequestBuilder.cs
index 0d54d2e..eb5a413 100644
--- a/TINKLib/Repository/Request/IRequestBuilder.cs
+++ b/TINKLib/Repository/Request/IRequestBuilder.cs
@@ -128,13 +128,23 @@ namespace TINK.Repository.Request
 	/// <summary> Copri locking states</summary>
 	public enum lock_state
 	{
+		/// <summary> Request to backend to close lock in context of pausing ride.</summary>
 		locking,
+
+		/// <summary> Lock is closed.</summary>
 		locked,
+
+		/// <summary> Request to backend to close lock either in context of resuming ride or starting a rental.</summary>
 		unlocking,
+
+		/// <summary> Lock is open.</summary>
 		unlocked,
+
+		/// <summary> Lock is unknown state.</summary>
+		unspecific,
 	}
 
-	/// <summary> Holds lockation info.</summary>
+	/// <summary> Holds location info.</summary>
 	public class LocationDto
 	{
 		public double Latitude { get; private set; }
diff --git a/TINKLib/Repository/Request/RequestBuilderHelper.cs b/TINKLib/Repository/Request/RequestBuilderHelper.cs
index b9b880a..464e410 100644
--- a/TINKLib/Repository/Request/RequestBuilderHelper.cs
+++ b/TINKLib/Repository/Request/RequestBuilderHelper.cs
@@ -33,7 +33,7 @@ namespace TINK.Repository.Request
 		}
 
 		/// <summary> Gets the smart device parameters. </summary>
-		/// <returns>in a format which is urlencode invariant.</returns>
+		/// <returns>in a format which is url encode invariant.</returns>
 		public static string GetSmartDeviceParameters(this ISmartDevice smartDevice)
 			=> smartDevice != null
 				? $"{(!string.IsNullOrEmpty(smartDevice.Manufacturer) ? $"&user_device_manufacturer={WebUtility.UrlEncode(smartDevice.Manufacturer)}" : string.Empty)}" +
@@ -42,5 +42,28 @@ namespace TINK.Repository.Request
 					$"{(!string.IsNullOrEmpty(smartDevice.VersionText) ? $"&user_device_version={WebUtility.UrlEncode(smartDevice.VersionText)}" : string.Empty)}" +
 					$"{(!string.IsNullOrEmpty(smartDevice.Identifier) ? $"&user_device_id={WebUtility.UrlEncode(smartDevice.Identifier)}" : string.Empty)}"
 				: string.Empty;
+
+		/// <summary>
+		/// Converts from one locking state enum to another.
+		/// </summary>
+		/// <param name="state">Locking state to convert.</param>
+		/// <returns>Target state.</returns>
+		public static lock_state? GetLockState(this Model.Bikes.BikeInfoNS.BluetoothLock.LockingState state)
+		{
+			switch (state)
+			{
+				case Model.Bikes.BikeInfoNS.BluetoothLock.LockingState.Open:
+					return lock_state.unlocked;
+
+				case Model.Bikes.BikeInfoNS.BluetoothLock.LockingState.Closed:
+					return lock_state.locked;
+
+				case Model.Bikes.BikeInfoNS.BluetoothLock.LockingState.UnknownFromHardwareError:
+					return lock_state.unspecific;
+
+				default:
+					return null;
+			}
+		}
 	}
 }
diff --git a/TINKLib/Repository/Response/DoReturnResponse.cs b/TINKLib/Repository/Response/DoReturnResponse.cs
index 424823f..73c550f 100644
--- a/TINKLib/Repository/Response/DoReturnResponse.cs
+++ b/TINKLib/Repository/Response/DoReturnResponse.cs
@@ -40,7 +40,6 @@ namespace TINK.Repository.Response
 		[DataMember]
 		public string co2saving { get; private set; }
 
-
 		/// <summary>
 		/// Holds information about the returned bike.
 		/// </summary>
diff --git a/TINKLib/Repository/Response/ResponseHelper.cs b/TINKLib/Repository/Response/ResponseHelper.cs
index cd44a8a..6388a77 100644
--- a/TINKLib/Repository/Response/ResponseHelper.cs
+++ b/TINKLib/Repository/Response/ResponseHelper.cs
@@ -87,7 +87,7 @@ namespace TINK.Repository.Response
 			this ReservationBookingResponse bookingResponse,
 			string bikeId)
 		{
-			GetIsResponseOk(bookingResponse, string.Format(AppResources.ExceptionTextReservationBikeFailedGeneral, bikeId));
+			GetIsResponseOk(bookingResponse, string.Format(AppResources.ErrorReservingBike, bikeId));
 
 			if (BookingDeclinedException.IsBookingDeclined(bookingResponse.response_state, out BookingDeclinedException exception))
 			{
@@ -99,7 +99,7 @@ namespace TINK.Repository.Response
 			if (bikeInfoRequestedOccupied == null)
 			{
 				throw new System.Exception(string.Format(
-					AppResources.ExceptionTextReservationBikeFailedUnavailalbe,
+					AppResources.ErrorReservingBikeUnavailalbe,
 					bikeId,
 					!string.IsNullOrWhiteSpace(bookingResponse?.response_text) ? $"\r\n{bookingResponse.response_text}" : string.Empty));
 			}
@@ -115,14 +115,14 @@ namespace TINK.Repository.Response
 			this ReservationBookingResponse bookingResponse,
 			string bikeId)
 		{
-			GetIsResponseOk(bookingResponse, string.Format(AppResources.ExceptionTextRentingBikeFailedGeneral, bikeId));
+			GetIsResponseOk(bookingResponse, string.Format(AppResources.ErrorRentingBike, bikeId));
 
 			// Get bike which has to be booked.
 			var bikeInfoRequestedOccupied = bookingResponse?.bikes_occupied?.Values?.FirstOrDefault(x => x.bike == bikeId);
 			if (bikeInfoRequestedOccupied == null)
 			{
 				throw new System.Exception(string.Format(
-					AppResources.ExceptionTextRentingBikeFailedUnavailalbe,
+					AppResources.ErrorRentingBikeUnavailalbe,
 					bikeId,
 					!string.IsNullOrWhiteSpace(bookingResponse?.response_text) ? $"\r\n{bookingResponse.response_text}" : string.Empty));
 			}
@@ -149,7 +149,7 @@ namespace TINK.Repository.Response
 			if (response.response_state.Trim().ToUpper().StartsWith(RESPONSE_AUTHCOOKIE_EXPRIED.ToUpper()))
 			{
 				throw new AuthcookieNotDefinedException(
-					$"{textOfAction}\r\n{AppResources.ExceptionTextSessionExpired}",
+					$"{textOfAction}\r\n{AppResources.ErrorAccountInvalidAuthorization}",
 					response);
 			}
 
diff --git a/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs b/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs
index 57e2855..6c53c5d 100644
--- a/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs
+++ b/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs
@@ -38,7 +38,7 @@ namespace TINK.Services.BluetoothLock
 			var locksInfo = new List<LockInfoTdo>();
 
 			// Add and process locks info object
-			foreach (var bikeInfo in bikes.OfType<Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo>())
+			foreach (var bikeInfo in bikes.OfType<BikeInfo>())
 			{
 				locksInfo.Add(new LockInfoTdo.Builder { Id = bikeInfo.LockInfo.Id, State = null }.Build());
 			}
diff --git a/TINKLib/Services/CopriApi/Exception/RequestNotCachableException.cs b/TINKLib/Services/CopriApi/Exception/RequestNotCachableException.cs
index 185ea1c..d01cd7c 100644
--- a/TINKLib/Services/CopriApi/Exception/RequestNotCachableException.cs
+++ b/TINKLib/Services/CopriApi/Exception/RequestNotCachableException.cs
@@ -5,7 +5,7 @@ namespace TINK.Services.CopriApi.Exception
 {
 	public class RequestNotCachableException : System.Exception
 	{
-		public RequestNotCachableException(string nameOfAction) : base(AppResources.ErrorNotConnectedToNetwork, new System.Exception($"{nameOfAction} is not cacheable."))
+		public RequestNotCachableException(string nameOfAction) : base(AppResources.ErrorNoWeb, new System.Exception($"{nameOfAction} is not cacheable."))
 		{
 		}
 	}
diff --git a/TINKLib/Services/Geolocation/Geolocation.cs b/TINKLib/Services/Geolocation/Geolocation.cs
index 5901ca8..1e8258c 100644
--- a/TINKLib/Services/Geolocation/Geolocation.cs
+++ b/TINKLib/Services/Geolocation/Geolocation.cs
@@ -16,7 +16,6 @@ namespace TINK.Services.Geolocation
 
 		public class Builder
 		{
-
 			public DateTimeOffset Timestamp { get; set; }
 
 			public double Latitude { get; set; }
diff --git a/TINKLib/TINKLib.csproj b/TINKLib/TINKLib.csproj
index db652db..6f89078 100644
--- a/TINKLib/TINKLib.csproj
+++ b/TINKLib/TINKLib.csproj
@@ -23,6 +23,11 @@
   <Target Name="MATPrerequisite" BeforeTargets="PrepareForBuild" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.ResxResources.targets')" Label="MultilingualAppToolkit">
     <Warning Text="$(MSBuildProjectFile) is Multilingual build enabled, but the Multilingual App Toolkit is unavailable during the build. If building with Visual Studio, please check to ensure that toolkit is properly installed." />
   </Target>
+  <ItemGroup>
+    <Compile Remove="Model\Message\**" />
+    <EmbeddedResource Remove="Model\Message\**" />
+    <None Remove="Model\Message\**" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="MonkeyCache" Version="1.6.3" />
     <PackageReference Include="MonkeyCache.FileStore" Version="1.6.3" />
@@ -87,4 +92,12 @@
   <ItemGroup>
     <InternalsVisibleTo Include="TestShareeLib" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android">
+      <HintPath>..\..\..\..\..\..\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\MonoAndroid\v12.0\Mono.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.iOS">
+      <HintPath>..\..\..\..\..\..\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.iOS\v1.0\Xamarin.iOS.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/TINKLib/TINKLib.sln b/TINKLib/TINKLib.sln
index f9003e2..3bcf60e 100644
--- a/TINKLib/TINKLib.sln
+++ b/TINKLib/TINKLib.sln
@@ -1,18 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2027
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33815.320
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TINK", "..\TINK\TINK\TINK.shproj", "{5297504F-603F-4E1A-98AA-57C4A0D9D833}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TINK.Android", "..\TINK\TINK.Android\TINK.Android.csproj", "{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TINK.iOS", "..\TINK\TINK.iOS\TINK.iOS.csproj", "{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TINKLib", "TINKLib.csproj", "{B77F4222-0860-4494-A07C-EE8E09FA9983}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestTINKLib", "..\TestTINKLib\TestTINKLib.csproj", "{730A31A5-6736-43CC-8F84-8FDA5093E283}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{49C8F824-4752-449E-A53C-35A2722AFA99}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Set02 - Book 3rd bike", "Set02 - Book 3rd bike", "{50D4A63A-91D8-4EC5-ADF6-9EF72D7AFAF0}"
@@ -70,16 +62,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "001", "001", "{AADA3B61-862
 		..\TestData\Set04 - Cancel Booking\001\booking_cancel_bike_7.json = ..\TestData\Set04 - Cancel Booking\001\booking_cancel_bike_7.json
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestTINK", "..\UITest\TestTINK.csproj", "{240B1AC3-6ECB-4985-BA04-D631668D6CCF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestTINKUI", "..\TestTINKUI\TestTINKUI.csproj", "{B19C892E-2628-4CA7-AD27-08D406A3B14B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestShareeLib", "..\TestShareeLib\TestShareeLib.csproj", "{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\TINK\TINK\TINK.projitems*{5297504f-603f-4e1a-98aa-57c4a0d9d833}*SharedItemsImports = 13
-		..\TINK\TINK\TINK.projitems*{62b8950a-70b8-4f9d-affc-0a1ebe7bc9e7}*SharedItemsImports = 4
-		..\TINK\TINK\TINK.projitems*{f2d8208f-a8bf-4403-b0ae-2a1d270e4dc9}*SharedItemsImports = 4
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
 		Ad-Hoc|ARM = Ad-Hoc|ARM
@@ -107,110 +92,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|ARM.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|iPhone.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|x64.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Ad-Hoc|x86.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|ARM.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|ARM.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|iPhone.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|x64.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|x64.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|x86.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.AppStore|x86.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|ARM.Build.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|ARM.Deploy.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|iPhone.Deploy.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|x64.Build.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|x64.Deploy.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|x86.Build.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Debug|x86.Deploy.0 = Debug|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|ARM.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|ARM.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|ARM.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|iPhone.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|iPhone.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|x64.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|x64.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|x64.Deploy.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|x86.ActiveCfg = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|x86.Build.0 = Release|Any CPU
-		{62B8950A-70B8-4F9D-AFFC-0A1EBE7BC9E7}.Release|x86.Deploy.0 = Release|Any CPU
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.AppStore|ARM.ActiveCfg = AppStore|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.AppStore|x64.ActiveCfg = AppStore|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.AppStore|x86.ActiveCfg = AppStore|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Debug|Any CPU.ActiveCfg = Debug|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Debug|ARM.ActiveCfg = Debug|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Debug|iPhone.Build.0 = Debug|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Debug|x64.ActiveCfg = Debug|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Debug|x86.ActiveCfg = Debug|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Release|Any CPU.ActiveCfg = Release|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Release|ARM.ActiveCfg = Release|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Release|iPhone.ActiveCfg = Release|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Release|iPhone.Build.0 = Release|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Release|x64.ActiveCfg = Release|iPhone
-		{F2D8208F-A8BF-4403-B0AE-2A1D270E4DC9}.Release|x86.ActiveCfg = Release|iPhone
 		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@@ -259,150 +140,54 @@ Global
 		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|x64.Build.0 = Release|Any CPU
 		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|x86.ActiveCfg = Release|Any CPU
 		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|x86.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|ARM.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|x64.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.AppStore|x86.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|ARM.Build.0 = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|x64.Build.0 = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Debug|x86.Build.0 = Debug|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|Any CPU.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|ARM.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|ARM.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|iPhone.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|x64.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|x64.Build.0 = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|x86.ActiveCfg = Release|Any CPU
-		{730A31A5-6736-43CC-8F84-8FDA5093E283}.Release|x86.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|ARM.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|x64.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.AppStore|x86.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|ARM.Build.0 = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|x64.Build.0 = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Debug|x86.Build.0 = Debug|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|ARM.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|iPhone.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|x64.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|x64.Build.0 = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|x86.ActiveCfg = Release|Any CPU
-		{240B1AC3-6ECB-4985-BA04-D631668D6CCF}.Release|x86.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|x64.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Ad-Hoc|x86.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|ARM.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|x64.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.AppStore|x86.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|ARM.Build.0 = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|x64.Build.0 = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Debug|x86.Build.0 = Debug|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|ARM.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|iPhone.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|x64.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|x64.Build.0 = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|x86.ActiveCfg = Release|Any CPU
-		{B19C892E-2628-4CA7-AD27-08D406A3B14B}.Release|x86.Build.0 = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|x64.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.AppStore|x86.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|x64.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Debug|x86.Build.0 = Debug|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|ARM.Build.0 = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|iPhone.Build.0 = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|x64.ActiveCfg = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|x64.Build.0 = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|x86.ActiveCfg = Release|Any CPU
+		{E6AE2E3B-85FF-4737-B1BF-6E9EBF1778D5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/TINKLib/View/Themes/Konrad.xaml b/TINKLib/View/Themes/Konrad.xaml
index 90f24f8..6cde385 100644
--- a/TINKLib/View/Themes/Konrad.xaml
+++ b/TINKLib/View/Themes/Konrad.xaml
@@ -12,9 +12,18 @@
 	<!--Background color-->
 	<Color x:Key="background-color">#BEBEBE</Color>
 
+	<!--Important text color-->
+	<Color x:Key="important-text-color">#D21113</Color>
+
 	<!--Attention color-->
 	<Color x:Key="attention-color">#06D1B1</Color>
 
+	<!--RentalProcess colors-->
+	<Color x:Key="process-step-upcoming">#999999</Color>
+	<Color x:Key="process-step-active">#0D0D0D</Color>
+	<Color x:Key="process-step-succeeded">#5DBF3B</Color>
+	<Color x:Key="process-step-failed">#FC870D</Color>
+
 	<!--Primary Button-->
     <Style TargetType="Button">
         <Setter Property="WidthRequest" Value="400" />
diff --git a/TINKLib/View/Themes/ShareeBike.xaml b/TINKLib/View/Themes/ShareeBike.xaml
index 526082c..aa140c8 100644
--- a/TINKLib/View/Themes/ShareeBike.xaml
+++ b/TINKLib/View/Themes/ShareeBike.xaml
@@ -9,9 +9,18 @@
 	<!--Background color-->
 	<Color x:Key="background-color">#BEBEBE</Color>
 
+	<!--Important text color-->
+	<Color x:Key="important-text-color">#BF2828</Color>
+
 	<!--Attention color-->
 	<Color x:Key="attention-color">#FC870D</Color>
 
+	<!--RentalProcess colors-->
+	<Color x:Key="process-step-upcoming">#999999</Color>
+	<Color x:Key="process-step-active">#0D0D0D</Color>
+	<Color x:Key="process-step-succeeded">#5DBF3B</Color>
+	<Color x:Key="process-step-failed">#BF2828</Color>
+
 	<!--Primary Button-->
     <Style TargetType="Button">
         <Setter Property="WidthRequest" Value="400" />
diff --git a/TINKLib/ViewModel/Account/AccountPageViewModel.cs b/TINKLib/ViewModel/Account/AccountPageViewModel.cs
index 5293fb0..48358d8 100644
--- a/TINKLib/ViewModel/Account/AccountPageViewModel.cs
+++ b/TINKLib/ViewModel/Account/AccountPageViewModel.cs
@@ -252,18 +252,18 @@ namespace TINK.ViewModel.Account
 					return string.Empty;
 				}
 
-				var bookingStateInfo = string.Format("Aktuell {0} Fahrräder reserviert/ gebucht.", m_iMyBikesCount.Value);
+				var bookingStateInfo = string.Format(AppResources.MarkingAccountReservedBookedBikes, m_iMyBikesCount.Value);
 
 				if (!IsConnected)
 				{
 					// Append offline info
-					return $"{bookingStateInfo} Verbindungsstatus: Offline.";
+					return $"{bookingStateInfo} {AppResources.MarkingAccountConnectionOffline}";
 				}
 
 				if (Exception != null)
 				{
 					// Append offline info
-					return $"{bookingStateInfo} Verbindungstatus: Verbindung unterbrochen. ";
+					return $"{bookingStateInfo} {AppResources.MarkingAccountConnectionInterrupted} ";
 				}
 
 				return bookingStateInfo;
@@ -289,9 +289,9 @@ namespace TINK.ViewModel.Account
 			else
 			{
 				await m_oViewService.DisplayAlert(
-					"Hinweis",
-					"Bitte mit Internet verbinden zum Verwalten der persönlichen Daten.",
-					"OK");
+					AppResources.MessageHintTitle,
+					AppResources.ErrorNoWeb,
+					AppResources.MessageAnswerOk);
 			}
 		});
 
@@ -306,10 +306,10 @@ namespace TINK.ViewModel.Account
 			try
 			{
 				// Backup logout message before logout.
-				var l_oMessage = string.Format("Benutzer {0} abgemeldet.", TinkApp.ActiveUser.Mail);
+				var l_oMessage = string.Format(AppResources.MessageLogoutGoodbye, TinkApp.ActiveUser.Mail);
 
 				// Stop polling before requesting bike.
-				await m_oViewUpdateManager.StopUpdatePeridically();
+				await m_oViewUpdateManager.StopAsync();
 
 				try
 				{
@@ -320,12 +320,12 @@ namespace TINK.ViewModel.Account
 				catch (UnsupportedCopriVersionDetectedException)
 				{
 					await m_oViewService.DisplayAlert(
-						AppResources.MessageLogoutErrorTitle,
+						AppResources.ErrorLogoutTitle,
 						 string.Format(AppResources.MessageAppVersionIsOutdated, TinkApp.Flavor.GetDisplayName()),
 						AppResources.MessageAnswerOk);
 
 					// Restart polling again.
-					await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling.ToImmutable());
+					await m_oViewUpdateManager.StartAsync(Polling.ToImmutable());
 
 					IsIdle = true;
 					StatusInfoText = string.Empty;
@@ -337,17 +337,20 @@ namespace TINK.ViewModel.Account
 					if (l_oException is WebConnectFailureException)
 					{
 						await m_oViewService.DisplayAlert(
-							"Verbingungsfehler bei Abmeldung!",
-							string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-							"OK");
+							AppResources.ErrorLogoutTitle,
+							AppResources.ErrorNoWeb,
+							AppResources.MessageAnswerOk);
 					}
 					else
 					{
-						await m_oViewService.DisplayAlert("Fehler bei Abmeldung!", l_oException.Message, "OK");
+						await m_oViewService.DisplayAlert(
+							AppResources.ErrorLogoutTitle,
+							l_oException.Message,
+							AppResources.MessageAnswerOk);
 					}
 
 					// Restart polling again.
-					await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling.ToImmutable());
+					await m_oViewUpdateManager.StartAsync(Polling.ToImmutable());
 
 					IsIdle = true;
 					StatusInfoText = string.Empty;
@@ -356,8 +359,11 @@ namespace TINK.ViewModel.Account
 
 				TinkApp.ActiveUser.Logout();
 
-				// Display information that log out was perfomrmed.
-				await m_oViewService.DisplayAlert("Auf Wiedersehen!", l_oMessage, "OK");
+				// Display information that log out was performed.
+				await m_oViewService.DisplayAlert(
+					AppResources.MessageLogoutGoodbyeTitle,
+					l_oMessage,
+					AppResources.MessageAnswerOk);
 			}
 			catch (Exception p_oException)
 			{
@@ -428,7 +434,7 @@ namespace TINK.ViewModel.Account
 			try
 			{
 				// Update bikes at station or my bikes depending on context.
-				await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling.ToImmutable());
+				await m_oViewUpdateManager.StartAsync(Polling.ToImmutable());
 			}
 			catch (Exception l_oExcetion)
 			{
@@ -445,15 +451,15 @@ namespace TINK.ViewModel.Account
 			{
 				Log.ForContext<AccountPageViewModel>().Information($"Entering {nameof(OnDisappearing)}...");
 
-				await m_oViewUpdateManager.StopUpdatePeridically();
+				await m_oViewUpdateManager.StopAsync();
 
 			}
 			catch (Exception l_oException)
 			{
 				await m_oViewService.DisplayAlert(
-					"Fehler",
-					$"Ein unerwarteter Fehler ist aufgetreten. \r\n{l_oException.Message}",
-					"OK");
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{l_oException.Message}",
+					AppResources.MessageAnswerOk);
 			}
 		}
 
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs
index 91751a9..27843d2 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs
@@ -55,7 +55,7 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
 
 			// Stop polling before requesting bike.
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			IsConnected = IsConnectedDelegate();
 
@@ -72,8 +72,8 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 
 					BikesViewModel.ActionText = string.Empty;
 					await ViewService.DisplayAlert(
-						AppResources.MessageTitleHint,
-						string.Format(AppResources.MessageReservationBikeErrorTooManyReservationsRentals, SelectedBike.Id, (exception as BookingDeclinedException).MaxBikesCount),
+						AppResources.MessageHintTitle,
+						string.Format(AppResources.ErrorReservingBikeTooManyReservationsRentals, SelectedBike.Id, (exception as BookingDeclinedException).MaxBikesCount),
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is WebConnectFailureException
@@ -84,8 +84,8 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 
 					BikesViewModel.ActionText = string.Empty;
 					await ViewService.DisplayAlert(
-						AppResources.MessageReservingBikeErrorConnectionTitle,
-						string.Format("{0}\r\n{1}", exception.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.ErrorNoConnectionTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -93,7 +93,7 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 					Log.ForContext<Disposable>().Error("User selected centered bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, exception);
 
 					BikesViewModel.ActionText = string.Empty;
-					await ViewService.DisplayAlert(AppResources.MessageReservingBikeErrorGeneralTitle, exception.Message, AppResources.MessageAnswerOk);
+					await ViewService.DisplayAlert(AppResources.ErrorReservingBikeTitle, exception.Message, AppResources.MessageAnswerOk);
 				}
 
 				BikesViewModel.ActionText = string.Empty; // Todo: Remove this statement because in catch block ActionText is already set to empty above.
@@ -104,7 +104,7 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 			finally
 			{
 				// Restart polling again.
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 
 				// Update status text and unlock list of bikes because no more action is pending.
 				BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block ActionText is already set to empty.
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs
index c63233e..44b0867 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs
@@ -53,7 +53,7 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
 
 			// Stop polling before cancel request.
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			try
 			{
@@ -80,7 +80,7 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 					BikesViewModel.ActionText = String.Empty;
 					await ViewService.DisplayAlert(
 						"Verbingungsfehler beim Stornieren der Buchung!",
-						string.Format("{0}\r\n{1}", exception.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.ErrorNoWeb,
 						"OK");
 					BikesViewModel.IsIdle = true;
 					return this;
@@ -97,7 +97,7 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 			finally
 			{
 				// Restart polling again.
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 
 				// Unlock list of bikes because no more action is pending.
 				BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block ActionText is already set to empty.
diff --git a/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs b/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs
index 063a81c..6d17221 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs
@@ -202,6 +202,8 @@ namespace TINK.ViewModel.Bikes.Bike
 
 		public string StationId => $"Station {Bike.StationId}";
 
+		public string DisplayName => Bike.GetDisplayName();
+
 		public bool IsBikeWithCopriLock => Bike.LockModel == Model.Bikes.BikeInfoNS.BikeNS.LockModel.Sigo;
 
 		/// Returns if type of bike is a cargo pedelec bike.
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs
index 7b2f6a1..5b568e0 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs
@@ -225,5 +225,6 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 		}
 
 		public string ErrorText => RequestHandler.ErrorText;
+
 	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/CloseLockActionViewModel.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/CloseLockActionViewModel.cs
new file mode 100644
index 0000000..641e1b1
--- /dev/null
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/CloseLockActionViewModel.cs
@@ -0,0 +1,334 @@
+using System;
+using System.Threading.Tasks;
+using Serilog;
+using TINK.Model.Connector;
+using TINK.Model;
+using TINK.MultilingualResources;
+using TINK.Repository.Exception;
+using TINK.Repository.Request;
+using TINK.Services.Logging;
+using TINK.View;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.CloseCommand;
+using TINK.Services.BluetoothLock;
+using System.ComponentModel;
+
+namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
+{
+	/// <summary>
+	/// View model for action close bluetooth lock.
+	/// </summary>
+	/// <typeparam name="T"></typeparam>
+	internal class CloseLockActionViewModel<T> : ICloseCommandListener, INotifyPropertyChanged
+	{
+		/// <summary> Notifies view about changes. </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
+
+		/// <summary>
+		/// View model to be used for progress report and unlocking/ locking view.
+		/// </summary>
+		private IBikesViewModel BikesViewModel { get; set; }
+
+		/// <summary>
+		/// View service to show modal notifications.
+		/// </summary>
+		private IViewService ViewService { get; }
+
+		/// <summary>
+		/// Service to control locks.
+		/// </summary>
+		private ILocksService LockService { get; }
+
+		/// <summary> Provides a connector object.</summary>
+		protected Func<bool, IConnector> ConnectorFactory { get; }
+
+		/// <summary> Delegate to retrieve connected state. </summary>
+		private Func<bool> IsConnectedDelegate { get; }
+
+		/// <summary>Gets the is connected state. </summary>
+		bool IsConnected;
+
+		/// <summary>Object to start or stop update of view model objects from Copri.</summary>
+		private Func<IPollingUpdateTaskManager> ViewUpdateManager { get; }
+
+		/// <summary> Bike close. </summary>
+		private Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable SelectedBike { get; }
+
+		/// <summary>
+		/// Constructs the object.
+		/// </summary>
+		/// <param name="selectedBike">Bike to close.</param>
+		/// <param name="viewUpdateManager">Object to start or stop update of view model objects from Copri.</param>
+		/// <param name="viewService">View service to show modal notifications.</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		/// <exception cref="ArgumentException"></exception>
+		public CloseLockActionViewModel(
+			Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable selectedBike,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			IViewService viewService,
+			IBikesViewModel bikesViewModel)
+		{
+			SelectedBike = selectedBike;
+			ViewUpdateManager = viewUpdateManager;
+			ViewService = viewService;
+			BikesViewModel = bikesViewModel
+				?? throw new ArgumentException($"Can not construct {GetType().Name}-object. {nameof(bikesViewModel)} must not be null.");
+		}
+
+		/// <summary>
+		/// Processes the close lock progress.
+		/// </summary>
+		/// <param name="step">Current step to process.</param>
+		public void ReportStep(Step step)
+		{
+			switch (step)
+			{
+				case Step.StartStopingPolling:
+					BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+					break;
+
+				case Step.StartingQueryingLocation:
+					// 1a.Step: Start query geolocation data.
+					BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
+					break;
+
+				case Step.ClosingLock:
+					BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
+					break;
+
+				case Step.WaitStopPollingQueryLocation:
+					BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
+					break;
+
+				case Step.QueryLocationTerminated:
+					break;
+
+				case Step.UpdateLockingState:
+					// 1b.Step: Sent info to backend
+					BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
+					BikesViewModel.RentalProcess.StepInfoText = AppResources.MarkingRentalProcessCloseLockStepUpload;
+					BikesViewModel.RentalProcess.ImportantStepInfoText = AppResources.MarkingRentalProcessCloseLockCheckLock;
+					break;
+			}
+		}
+
+		/// <summary>
+		/// Processes the close lock state.
+		/// </summary>
+		/// <param name="state">State to process.</param>
+		/// <param name="details">Textual details describing current state.</param>
+		public async Task ReportStateAsync(State state, string details)
+		{
+			switch (state)
+			{
+				case State.OutOfReachError:
+					BikesViewModel.RentalProcess.Result = CurrentStepStatus.Failed;
+					BikesViewModel.ActionText = string.Empty;
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorLockOutOfReach,
+						AppResources.MessageAnswerOk);
+					break;
+
+				case State.CouldntCloseMovingError:
+					BikesViewModel.RentalProcess.Result = CurrentStepStatus.Failed;
+					BikesViewModel.ActionText = string.Empty;
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorLockMoving,
+						AppResources.MessageAnswerOk);
+					break;
+
+				case State.CouldntCloseBoltBlockedError:
+					BikesViewModel.RentalProcess.Result = CurrentStepStatus.Failed;
+					BikesViewModel.ActionText = string.Empty;
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						AppResources.ErrorCloseLockBoltBlocked,
+						AppResources.MessageAnswerOk);
+					break;
+
+				case State.GeneralCloseError:
+					BikesViewModel.RentalProcess.Result = CurrentStepStatus.Failed;
+					BikesViewModel.ActionText = string.Empty;
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCloseLockTitle,
+						details,
+						AppResources.MessageAnswerOk);
+					break;
+
+				case State.WebConnectFailed:
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
+					break;
+
+				case State.ResponseIsInvalid:
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
+					break;
+
+				case State.BackendUpdateFailed:
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
+					break;
+			}
+		}
+
+		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
+		public async Task CloseLockAsync()
+		{
+			Log.ForContext<T>().Information("User request to lock bike {bike}.", SelectedBike);
+
+			// lock GUI
+			BikesViewModel.IsIdle = false;
+
+			// Stop Updater
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			var stopPollingTask = ViewUpdateManager().StopAsync();
+
+			// Clear logging memory sink to avoid passing log data not related to returning of bike to backend.
+			// Log data is passed to backend when calling CopriCallsHttps.DoReturn().
+			MemoryStackSink.ClearMessages();
+
+			// 1. Step
+			// Parameter for RentalProcess View
+			BikesViewModel.RentalProcess = new RentalProcess(SelectedBike.Id)
+			{
+				State = CurrentRentalProcess.CloseLock,
+				StepIndex = 1,
+				Result = CurrentStepStatus.None
+			};
+
+			// Close Lock
+			BikesViewModel.RentalProcess.StepInfoText = AppResources.MarkingRentalProcessCloseLockStepCloseLock;
+			BikesViewModel.RentalProcess.ImportantStepInfoText = AppResources.MarkingRentalProcessCloseLockObserve;
+
+			try
+			{
+#if USELOCALINSTANCE
+				var command = new CloseCommand(SelectedBike, GeolocationService, LockService, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager);
+				await command.Invoke(this);
+#else
+				await SelectedBike.CloseLockAsync(this, stopPollingTask);
+#endif
+				Log.ForContext<T>().Information("User locked {bike} successfully.", SelectedBike);
+			}
+			catch (Exception)
+			{
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartAsync();
+
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+
+				BikesViewModel.RentalProcess.State = CurrentRentalProcess.None;
+				return;
+			}
+
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StartAsync();
+			BikesViewModel.ActionText = string.Empty;
+			BikesViewModel.RentalProcess.Result = CurrentStepStatus.Succeeded;
+
+			// 2. Step
+			BikesViewModel.RentalProcess.StepIndex = 2;
+			BikesViewModel.RentalProcess.Result = CurrentStepStatus.None;
+			BikesViewModel.RentalProcess.ImportantStepInfoText = String.Empty;
+
+			//// Ask if lock is closed
+			//var isLockClosed = await ViewService.DisplayAlert(
+			//	AppResources.QuestionRentalProcessCloseLockCheckLockTitle,
+			//	AppResources.QuestionRentalProcessCloseLockCheckLockText,
+			//	AppResources.QuestionRentalProcessCloseLockCheckLockAnswerYes,
+			//	AppResources.QuestionRentalProcessCloseLockCheckLockAnswerNo);
+
+			//// If lock is not closed
+			//if(isLockClosed == false)
+			//{
+			//	var retryOrContactresult = await ViewService.DisplayAlert(
+			//		AppResources.MessageRentalProcessCloseLockNotClosedTitle,
+			//		AppResources.MessageRentalProcessCloseLockNotClosedText,
+			//		AppResources.MessageAnswerRetry,
+			//		AppResources.MessageAnswerContactSupport);
+
+			//	BikesViewModel.RentalProcess.Result = CurrentStepStatus.Failed;
+
+			//	if (retryOrContactresult == true)
+			//	{
+			//		//restart CloseLock()
+			//	}
+			//	else if(retryOrContactresult == false)
+			//	{
+			//		await OpenContactPageAsync();
+			//	}
+			//}
+			// If lock is closed
+			//else if(isLockClosed == true)
+			//{
+				IsEndRentalRequested = await ViewService.DisplayAlert(
+					AppResources.QuestionRentalProcessCloseLockEndOrContinueTitle,
+					AppResources.QuestionRentalProcessCloseLockEndOrContinueText,
+					AppResources.QuestionRentalProcessCloseLockEndRentalAnswer,
+					AppResources.QuestionRentalProcessCloseLockContinueRentalAnswer);
+
+				BikesViewModel.RentalProcess.Result = CurrentStepStatus.Succeeded;
+
+				// Continue with End rental in RequestHandler
+				if (IsEndRentalRequested == true)
+				{
+					return;
+				}
+				// Park bike
+				else if(IsEndRentalRequested == false)
+				{
+					await ViewService.DisplayAlert(
+						AppResources.MessageRentalProcessCloseLockFinishedTitle,
+						AppResources.MessageRentalProcessCloseLockFinishedText,
+						AppResources.MessageAnswerOk);
+				}
+
+			//}
+
+			BikesViewModel.RentalProcess.State = CurrentRentalProcess.None;
+			BikesViewModel.IsIdle = true;
+			return;
+		}
+
+		/// <summary> Opens support. </summary>
+//#if USEFLYOUT
+//        public void OpenContactPageAsync()
+//#else
+//		public async Task OpenContactPageAsync()
+//#endif
+//		{
+//			try
+//			{
+//				// Open Contact Page with Contact information for operator of SelectedBike
+//#if USEFLYOUT
+//                ViewService.ShowPage(ViewTypes.ContactPage, AppResources.MarkingFeedbackAndContact);
+//#else
+//				await ViewService.ShowPage("//ContactPage");
+//#endif
+//			}
+//			catch (Exception p_oException)
+//			{
+//				Log.Error("Ein unerwarteter Fehler ist auf der Seite Kontakt aufgetreten. Kontext: Klick auf Konakt aufnehmen bei Schloss schließen (Schloss nicht zu!). {@Exception}", p_oException);
+//				return;
+//			}
+//		}
+
+		/// <summary>
+		/// True if user requested End rental.
+		/// </summary>
+		private bool isEndRentalRequested = false;
+
+		/// <summary>
+		/// True if user requested End rental.
+		/// </summary>
+		public bool IsEndRentalRequested
+		{
+			get { return isEndRentalRequested; }
+			set
+			{
+				isEndRentalRequested = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsEndRentalRequested)));
+			}
+		}
+	}
+}
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/EndRentalActionViewModel.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/EndRentalActionViewModel.cs
new file mode 100644
index 0000000..3b13790
--- /dev/null
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/EndRentalActionViewModel.cs
@@ -0,0 +1,365 @@
+using System;
+using System.Threading.Tasks;
+using TINK.Model.Connector;
+using TINK.Model;
+using TINK.MultilingualResources;
+using TINK.Repository.Exception;
+using TINK.Repository.Request;
+using TINK.View;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand;
+using Serilog;
+using TINK.Services.BluetoothLock;
+
+namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
+{
+	/// <summary>
+	/// Return bike action.
+	/// </summary>
+	/// <typeparam name="T">Type of owner.</typeparam>
+	public class EndRentalActionViewModel<T> : IGetLockedLocationCommandListener
+	{
+		/// <summary>
+		/// View model to be used for progress report and unlocking/ locking view.
+		/// </summary>
+		private IBikesViewModel BikesViewModel { get; set; }
+
+		/// <summary>
+		/// View service to show modal notifications.
+		/// </summary>
+		private IViewService ViewService { get; }
+
+		/// <summary>Object to start or stop update of view model objects from Copri.</summary>
+		private Func<IPollingUpdateTaskManager> ViewUpdateManager { get; }
+
+		/// <summary> Bike close. </summary>
+		private Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable SelectedBike { get; }
+
+		/// <summary>
+		/// Service to control locks.
+		/// </summary>
+		private ILocksService LockService { get; }
+
+		/// <summary> Provides a connector object.</summary>
+		protected Func<bool, IConnector> ConnectorFactory { get; }
+
+		/// <summary> Delegate to retrieve connected state. </summary>
+		private Func<bool> IsConnectedDelegate { get; }
+
+		/// <summary>Gets the is connected state. </summary>
+		bool IsConnected;
+
+		/// <summary>
+		/// Constructs the object.
+		/// </summary>
+		/// <param name="selectedBike">Bike to close.</param>
+		/// <param name="viewUpdateManager">Object to start or stop update of view model objects from Copri.</param>
+		/// <param name="viewService">View service to show modal notifications.</param>
+		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		/// <exception cref="ArgumentException"></exception>
+		public EndRentalActionViewModel(
+			Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMutable selectedBike,
+			Func<bool> isConnectedDelegate,
+			Func<bool, IConnector> connectorFactory,
+			ILocksService lockService,
+			Func<IPollingUpdateTaskManager> viewUpdateManager,
+			IViewService viewService,
+			IBikesViewModel bikesViewModel)
+		{
+			SelectedBike = selectedBike;
+			IsConnectedDelegate = isConnectedDelegate;
+			ConnectorFactory = connectorFactory;
+			LockService = lockService
+				?? throw new ArgumentException($"Can not construct {typeof(EndRentalActionViewModel<T>)}-object. Parameter {nameof(lockService)} must not be null.");
+			ViewUpdateManager = viewUpdateManager;
+			ViewService = viewService;
+			BikesViewModel = bikesViewModel
+				?? throw new ArgumentException($"Can not construct {typeof(EndRentalActionViewModel<T>)}-object. {nameof(bikesViewModel)} must not be null.");
+
+			// Set parameter for RentalProcess View to initial value.
+			BikesViewModel.RentalProcess = new RentalProcess(SelectedBike.Id)
+			{
+				State = CurrentRentalProcess.None,
+				StepIndex = 0,
+				Result = CurrentStepStatus.None
+			};
+		}
+
+		/// <summary>
+		/// Processes the get lock location progress.
+		/// </summary>
+		/// <param name="step">Current step to process.</param>
+		public void ReportStep(Step step)
+		{
+			switch (step)
+			{
+				case Step.StartingQueryLocation:
+					// 1.Step: Geolocation data
+					BikesViewModel.RentalProcess.StepInfoText = AppResources.MarkingRentalProcessEndRentalStepGPS;
+					BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
+					break;
+
+				case Step.DisconnectingLockOnDisconnectedNoLocationError:
+					BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
+					break;
+			}
+		}
+
+		/// <summary>
+		/// Processes the get lock location state.
+		/// </summary>
+		/// <param name="state">State to process.</param>
+		/// <param name="details">Textual details describing current state.</param>
+		public async Task ReportStateAsync(State state, string details)
+		{
+			switch (state)
+			{
+				case State.DisconnetedNoLocationError:
+					BikesViewModel.RentalProcess.Result = CurrentStepStatus.Failed;
+					await ViewService.DisplayAlert(
+						AppResources.ErrorEndRentalTitle,
+						AppResources.ErrorEndRentalNotAtSuitableStation,
+						AppResources.MessageAnswerOk);
+					break;
+
+				case State.DisconnectError:
+					BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
+					break;
+
+				case State.QueryLocationSucceeded:
+					BikesViewModel.RentalProcess.Result = CurrentStepStatus.Succeeded;
+					break;
+
+				case State.QueryLocationFailed:
+					BikesViewModel.RentalProcess.Result = CurrentStepStatus.Failed;
+
+					await ViewService.DisplayAlert(
+						AppResources.ErrorEndRentalTitle,
+						AppResources.ErrorNoLocationPermission,
+						AppResources.MessageAnswerOk);
+
+					break;
+			}
+		}
+
+		/// <summary> Return bike. </summary>
+		public async Task EndRentalAsync()
+		{
+			Log.ForContext<T>().Information("User requests to return bike {bike}.", SelectedBike);
+
+			// lock GUI
+			BikesViewModel.IsIdle = false;
+
+			// Stop Updater
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			await ViewUpdateManager().StopAsync();
+
+			// 1. Step
+			// Parameter for RentalProcess View
+			BikesViewModel.RentalProcess = new RentalProcess(SelectedBike.Id)
+			{
+				State = CurrentRentalProcess.EndRental,
+				StepIndex = 1,
+				Result = CurrentStepStatus.None
+			};
+
+			// Get Location
+			BikesViewModel.RentalProcess.StepInfoText = AppResources.MarkingRentalProcessEndRentalStepGPS;
+			BikesViewModel.RentalProcess.ImportantStepInfoText = AppResources.MarkingRentalProcessEndRentalWait;
+
+			LocationDto currentLocationDto = null;
+			try
+			{
+				currentLocationDto = await SelectedBike.GetLockedBikeLocationAsync(this);
+			}
+			catch (Exception)
+			{
+				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+				await ViewUpdateManager().StartAsync();
+
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				BikesViewModel.RentalProcess.State = CurrentRentalProcess.None;
+				return;
+			}
+
+			// Send end of rental to backend
+			IsConnected = IsConnectedDelegate();
+
+			BookingFinishedModel bookingFinished;
+			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
+			try
+			{
+				bookingFinished = await ConnectorFactory(IsConnected).Command.DoReturn(
+					SelectedBike,
+					currentLocationDto);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.RentalProcess.Result = CurrentStepStatus.Failed;
+				BikesViewModel.ActionText = string.Empty;
+
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<T>().Information("User selected booked bike {bike} but returning failed (Copri server not reachable).", SelectedBike);
+
+					await ViewService.DisplayAlert(
+						AppResources.ErrorEndRentalTitle,
+						AppResources.ErrorNoWeb,
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is NotAtStationException notAtStationException)
+				{
+					// COPRI returned an error.
+					Log.ForContext<T>().Information(
+							"User selected booked bike {bike} but returning failed. COPRI returned out of GEO fencing error. Position send to COPRI {@position}.",
+							SelectedBike,
+							currentLocationDto);
+
+					await ViewService.DisplayAlert(
+						AppResources.ErrorEndRentalTitle,
+						string.Format(AppResources.ErrorEndRentalNotAtStation, notAtStationException.StationNr, notAtStationException.Distance),
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is NoGPSDataException)
+				{
+					// COPRI returned an error.
+					Log.ForContext<T>().Information("User selected booked bike {bike} but returning failed. COPRI returned an no GPS- data error.", SelectedBike);
+
+					await ViewService.DisplayAlert(
+						AppResources.ErrorEndRentalTitle,
+						string.Format(AppResources.ErrorEndRentalUnknownLocation),
+						AppResources.MessageAnswerOk);
+				}
+				else if (exception is ResponseException copriException)
+				{
+					// COPRI returned an error.
+					Log.ForContext<T>().Information("User selected booked bike {bike} but returning failed. COPRI returned an error.", SelectedBike);
+
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorEndRentalTitle,
+						copriException.Message,
+						copriException.Response,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<T>().Error("User selected booked bike {bike} but returning failed. {@l_oException}", SelectedBike.Id, exception);
+
+					await ViewService.DisplayAlert(
+						AppResources.ErrorEndRentalTitle,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+
+				await ViewUpdateManager().StartAsync();
+				BikesViewModel.ActionText = string.Empty;
+				BikesViewModel.IsIdle = true;
+				BikesViewModel.RentalProcess.State = CurrentRentalProcess.None;
+				return;
+			}
+
+			BikesViewModel.RentalProcess.Result = CurrentStepStatus.Succeeded;
+
+			// 2.Step: User feedback on bike condition
+
+#if !USERFEEDBACKDLG_OFF
+
+			BikesViewModel.RentalProcess.StepIndex = 2;
+			BikesViewModel.RentalProcess.Result = CurrentStepStatus.None;
+			BikesViewModel.RentalProcess.StepInfoText = AppResources.MarkingRentalProcessEndRentalStepFeedback;
+			BikesViewModel.RentalProcess.ImportantStepInfoText = String.Empty;
+
+			var feedBackUri = SelectedBike?.OperatorUri;
+			var feedback = await ViewService.DisplayUserFeedbackPopup(SelectedBike.Drive?.Battery);
+#endif
+			BikesViewModel.RentalProcess.Result = CurrentStepStatus.Succeeded;
+
+			// 3.Step
+
+			// Send user feedback to backend
+			BikesViewModel.RentalProcess.StepIndex = 3;
+			BikesViewModel.RentalProcess.Result = CurrentStepStatus.None;
+			BikesViewModel.RentalProcess.StepInfoText = AppResources.MarkingRentalProcessEndRentalStepUpload;
+			BikesViewModel.RentalProcess.ImportantStepInfoText = AppResources.MarkingRentalProcessEndRentalWait;
+
+			IsConnected = IsConnectedDelegate();
+#if !USERFEEDBACKDLG_OFF
+			try
+			{
+				await ConnectorFactory(IsConnected).Command.DoSubmitFeedback(
+					 new UserFeedbackDto
+					 {
+						 BikeId = SelectedBike.Id,
+						 CurrentChargeBars = feedback.CurrentChargeBars,
+						 IsBikeBroken = feedback.IsBikeBroken,
+						 Message = feedback.Message
+					 },
+					feedBackUri);
+			}
+			catch (Exception exception)
+			{
+				BikesViewModel.ActionText = string.Empty;
+
+				if (exception is ResponseException copriException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<T>().Information("Submitting feedback for bike {bike} failed. COPRI returned an error.", SelectedBike);
+				}
+				else
+				{
+					Log.ForContext<T>().Error("Submitting feedback for bike {bike} failed. {@l_oException}", SelectedBike.Id, exception);
+				}
+
+				await ViewService.DisplayAlert(
+					AppResources.ErrorSubmitFeedbackTitle,
+					AppResources.ErrorSubmitFeedback,
+					AppResources.MessageAnswerOk);
+			}
+#endif
+			BikesViewModel.RentalProcess.Result = CurrentStepStatus.Succeeded;
+
+			// Disconnect lock.
+			try
+			{
+				BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
+				SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
+			}
+			catch (Exception exception)
+			{
+				Log.ForContext<T>().Error("Lock can not be disconnected. {Exception}", exception);
+				BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
+			}
+
+			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
+			await ViewUpdateManager().StartAsync();
+			BikesViewModel.ActionText = string.Empty;
+
+			// Confirmation message that rental is ended
+			Log.ForContext<T>().Information("User returned bike {bike} successfully.", SelectedBike);
+
+			await ViewService.DisplayAlert(
+				String.Format(AppResources.MessageRentalProcessEndRentalFinishedTitle, SelectedBike.Id),
+				String.Format(
+					"{0}{1}",
+						!string.IsNullOrWhiteSpace(bookingFinished?.Co2Saving) ?
+							$"{bookingFinished?.Co2Saving}\r\n\r\n"
+							: string.Empty,
+						String.Format(AppResources.MessageRentalProcessEndRentalFinishedText)
+				),
+				AppResources.MessageAnswerOk
+			);
+
+			// Mini survey
+			if (bookingFinished != null && bookingFinished.MiniSurvey.Questions.Count > 0)
+			{
+				await ViewService.PushModalAsync(ViewTypes.MiniSurvey);
+			}
+
+			BikesViewModel.RentalProcess.State = CurrentRentalProcess.None;
+			BikesViewModel.IsIdle = true;
+
+			return;
+		}
+	}
+}
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/Base.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/Base.cs
index eb2f649..b457cde 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/Base.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/Base.cs
@@ -37,8 +37,14 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				?? throw new ArgumentException($"Can not construct {GetType().Name}-object. Parameter {nameof(lockService)} must not be null.");
 		}
 
+		/// <summary>
+		/// Service to query geolocation information.
+		/// </summary>
 		protected IGeolocationService GeolocationService { get; }
 
+		/// <summary>
+		/// Service to control locks.
+		/// </summary>
 		protected ILocksService LockService { get; }
 
 		public string LockitButtonText { get; protected set; }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs
index 2d74648..25dbe04 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs
@@ -1,24 +1,22 @@
 using System;
-using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 using Serilog;
-using TINK.Model;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.User;
 using TINK.MultilingualResources;
 using TINK.Repository.Exception;
-using TINK.Repository.Request;
 using TINK.Services.BluetoothLock;
 using TINK.Services.BluetoothLock.Exception;
 using TINK.Services.Geolocation;
 using TINK.View;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand;
+using static TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandlerFactory;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-	public class BookedClosed : Base, IRequestHandler
+	public class BookedClosed : Base, IRequestHandler, IGetLockedLocationCommandListener
 	{
 		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
 		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
@@ -48,312 +46,54 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 		{
 			LockitButtonText = AppResources.ActionOpenAndPause;
 			IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
+
+			_endRentalActionViewModel = new EndRentalActionViewModel<BookedClosed>(
+				selectedBike,
+				isConnectedDelegate,
+				connectorFactory,
+				lockService,
+				viewUpdateManager,
+				viewService,
+				bikesViewModel);
 		}
 
+		/// <summary>
+		/// Holds the view model for end rental action.
+		/// </summary>
+		private EndRentalActionViewModel<BookedClosed> _endRentalActionViewModel;
+
 		/// <summary> Return bike. </summary>
-		public async Task<IRequestHandler> HandleRequestOption1() => await ReturnBike();
+		public async Task<IRequestHandler> HandleRequestOption1()
+		{
+			await _endRentalActionViewModel.EndRentalAsync();
+			return Create(
+				SelectedBike,
+				IsConnectedDelegate,
+				ConnectorFactory,
+				GeolocationService,
+				LockService,
+				ViewUpdateManager,
+				SmartDevice,
+				ViewService,
+				BikesViewModel,
+				ActiveUser);
+		}
 
 		/// <summary> Open bike and update COPRI lock state. </summary>
 		public async Task<IRequestHandler> HandleRequestOption2() => await OpenLock();
 
-		/// <summary> Return bike. </summary>
-		public async Task<IRequestHandler> ReturnBike()
-		{
-			BikesViewModel.IsIdle = false;
-			var ctsLocation = new CancellationTokenSource();
-			Task<IGeolocation> currentLocationTask = null;
+		/// <summary>
+		/// Processes the get lock location progress.
+		/// </summary>
+		/// <param name="step">Current step to process.</param>
+		public void ReportStep(Step step) => _endRentalActionViewModel.ReportStep(step);
 
-			// Try getting geolocation which was requested when closing lock.
-			IGeolocation currentLocation = SelectedBike.LockInfo.Location;
-			var lastConfimredLockStateTimeStamp = SelectedBike.LockInfo.LastLockingStateChange;
-
-			// Check if bike is around.
-			var deviceState = LockService[SelectedBike.LockInfo.Id].GetDeviceState();
-
-			// Check if
-			// - geolocation is already available
-			// - or if bike is in reach so that geolocation makes sense
-			if (currentLocation == null && deviceState != DeviceState.Connected)
-			{
-				// Geolocation information is missing and can not be queried.
-				Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returning failed. COPRI returned an error.", SelectedBike);
-
-				await ViewService.DisplayAlert(
-					AppResources.ErrorReturnBikeTitle,
-					AppResources.Error_ReturnBike_Station_Location_Message,
-					AppResources.MessageAnswerOk);
-
-				// Disconnect lock.
-				BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
-				try
-				{
-					SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
-				}
-				catch (Exception exception)
-				{
-					Log.ForContext<BookedClosed>().Error("Lock can not be disconnected. {Exception}", exception);
-
-					BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
-				}
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true;
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-
-			// Check if querying geolocation is required.
-			if (currentLocation == null)
-			{
-				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;    
-
-				// Start getting geolocation.
-				try
-				{
-					currentLocationTask = GeolocationService.GetAsync(ctsLocation.Token, DateTime.Now);
-				}
-				catch (Exception ex)
-				{
-					// No location information available.
-					Log.ForContext<BookedClosed>().Information("Getting geolocation when returning bike {Bike} failed. {Exception}", SelectedBike, ex);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorReturnBikeTitle,
-						AppResources.ErrorReturnBikeLockClosedStartGetGPSExceptionMessage,
-						AppResources.MessageAnswerOk);
-
-					BikesViewModel.ActionText = string.Empty;
-					BikesViewModel.IsIdle = true;
-					return this;
-				}
-			}
-
-			// Ask whether to really return bike?
-			var l_oResult = await ViewService.DisplayAlert(
-				string.Empty,
-				string.Format(AppResources.QuestionReturnBike, SelectedBike.GetFullDisplayName()),
-				AppResources.MessageAnswerYes,
-				AppResources.MessageAnswerNo);
-
-			if (l_oResult == false)
-			{
-				// User aborted returning bike process
-				Log.ForContext<BookedClosed>().Information("User selected booked bike {l_oId} in order to return but action was canceled.", SelectedBike.Id);
-
-				// Cancel getting geolocation.
-				ctsLocation.Cancel();
-				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-				try
-				{
-					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-				}
-				catch (Exception ex)
-				{
-					// No location information available.
-					Log.ForContext<BookedClosed>().Information("Canceling query location failed on abort returning closed bike failed. {Exception}", SelectedBike, ex);
-				}
-
-				BikesViewModel.IsIdle = true;
-				return this;
-			}
-
-			// Lock list to avoid multiple taps while copri action is pending.
-			Log.ForContext<BookedClosed>().Information("Request to return bike {bike} detected.", SelectedBike);
-
-			// Stop polling before returning bike.
-			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
-
-			// Get geolocation if
-			// - geolocation was not available when closing lock
-			// - bike is around (lock is connected via bluetooth)
-			LocationDto currentLocationDto = null;
-			if (currentLocation == null)
-			{
-				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
-				try
-				{
-					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-					currentLocation = currentLocationTask?.Result ?? null;
-				}
-				catch (Exception ex)
-				{
-					// No location information available.
-					Log.ForContext<BookedClosed>().Information("Returning closed bike {Bike} is not possible. Cancel geolocation query failed. {Exception}", SelectedBike, ex);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorQueryGeolocation,
-						AppResources.ErrorReturnBikeLockClosedGetGPSExceptionMessage,
-						AppResources.MessageAnswerOk);
-
-					BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-					await ViewUpdateManager().StartUpdateAyncPeridically();
-					BikesViewModel.ActionText = string.Empty;
-					BikesViewModel.IsIdle = true;
-					return this;
-				}
-
-				lastConfimredLockStateTimeStamp = DateTime.Now;
-			}
-
-			currentLocationDto = currentLocation != null
-				? new LocationDto.Builder
-				{
-					Latitude = currentLocation.Latitude,
-					Longitude = currentLocation.Longitude,
-					Accuracy = currentLocation.Accuracy ?? double.NaN,
-					Age = lastConfimredLockStateTimeStamp is DateTime lastLockState ? lastLockState.Subtract(currentLocation.Timestamp.DateTime) : TimeSpan.MaxValue,
-				}.Build()
-				: null;
-
-			BikesViewModel.ActionText = AppResources.ActivityTextReturningBike;
-			IsConnected = IsConnectedDelegate();
-
-			var feedBackUri = SelectedBike?.OperatorUri;
-			BookingFinishedModel bookingFinished;
-			try
-			{
-				bookingFinished = await ConnectorFactory(IsConnected).Command.DoReturn(
-					SelectedBike,
-					currentLocationDto);
-			}
-			catch (Exception exception)
-			{
-				BikesViewModel.ActionText = string.Empty;
-
-				if (exception is WebConnectFailureException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returning failed (Copri server not reachable).", SelectedBike);
-
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.ErrorReturnBikeNoWebTitle,
-						string.Format("{0}\r\n{1}", AppResources.ErrorReturnBikeNoWebMessage, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-						exception.Message,
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is NotAtStationException notAtStationException)
-				{
-					// COPRI returned an error.
-					Log.ForContext<BookedClosed>().Information(
-							"User selected booked bike {bike} but returning failed. COPRI returned out of GEO fencing error. Position send to COPRI {@position}.",
-							SelectedBike,
-							currentLocationDto);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorReturnBikeTitle,
-						string.Format(AppResources.ErrorReturnBikeNotAtStationMessage, notAtStationException.StationNr, notAtStationException.Distance),
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is NoGPSDataException)
-				{
-					// COPRI returned an error.
-					Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returning failed. COPRI returned an no GPS- data error.", SelectedBike);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorReturnBikeTitle,
-						string.Format(AppResources.ErrorReturnBikeLockClosedNoGPSMessage),
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is ResponseException copriException)
-				{
-					// COPRI returned an error.
-					Log.ForContext<BookedClosed>().Information("User selected booked bike {bike} but returning failed. COPRI returned an error.", SelectedBike);
-
-					await ViewService.DisplayAdvancedAlert(
-						"Statusfehler beim Zurückgeben des Rads!",
-						copriException.Message,
-						copriException.Response,
-						"OK");
-				}
-				else
-				{
-					Log.ForContext<BookedClosed>().Error("User selected booked bike {bike} but returning failed. {@l_oException}", SelectedBike.Id, exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorReturnBikeTitle,
-						exception.Message,
-						AppResources.MessageAnswerOk);
-				}
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true;
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-
-			Log.ForContext<BookedClosed>().Information("User returned bike {bike} successfully.", SelectedBike);
-
-			// Disconnect lock.
-			BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
-			try
-			{
-				SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
-			}
-			catch (Exception exception)
-			{
-				Log.ForContext<BookedClosed>().Error("Lock can not be disconnected. {Exception}", exception);
-
-				BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
-			}
-
-
-#if !USERFEEDBACKDLG_OFF
-			// Do get Feedback
-			var feedback = await ViewService.DisplayUserFeedbackPopup(SelectedBike.Drive?.Battery, bookingFinished?.Co2Saving);
-			IsConnected = IsConnectedDelegate();
-			try
-			{
-				await ConnectorFactory(IsConnected).Command.DoSubmitFeedback(
-					 new UserFeedbackDto
-					 {
-						 BikeId = SelectedBike.Id,
-						 CurrentChargeBars = feedback.CurrentChargeBars,
-						 IsBikeBroken = feedback.IsBikeBroken,
-						 Message = feedback.Message
-					 },
-					feedBackUri);
-			}
-			catch (Exception exception)
-			{
-				BikesViewModel.ActionText = string.Empty;
-
-				if (exception is ResponseException copriException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<BookedClosed>().Information("Submitting feedback for bike {bike} failed. COPRI returned an error.", SelectedBike);
-				}
-				else
-				{
-					Log.ForContext<BookedClosed>().Error("Submitting feedback for bike {bike} failed. {@l_oException}", SelectedBike.Id, exception);
-				}
-
-				await ViewService.DisplayAlert(
-					AppResources.ErrorReturnSubmitFeedbackTitle,
-					AppResources.ErrorReturnSubmitFeedbackMessage,
-					AppResources.MessageAnswerOk);
-
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true;
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-#endif
-			if (bookingFinished != null && bookingFinished.MiniSurvey.Questions.Count > 0)
-			{
-				await ViewService.PushModalAsync(ViewTypes.MiniSurvey);
-			}
-
-			// Restart polling again.
-			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
-			BikesViewModel.ActionText = string.Empty;
-			BikesViewModel.IsIdle = true;
-			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-		}
+		/// <summary>
+		/// Processes the get lock location state.
+		/// </summary>
+		/// <param name="state">State to process.</param>
+		/// <param name="details">Textual details describing current state.</param>
+		public async Task ReportStateAsync(State state, string details) => await _endRentalActionViewModel.ReportStateAsync(state, details);
 
 		/// <summary> Open bike and update COPRI lock state. </summary>
 		public async Task<IRequestHandler> OpenLock()
@@ -364,7 +104,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			// Stop polling before returning bike.
 			BikesViewModel.IsIdle = false;
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
 			ILockService btLock;
@@ -383,7 +123,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.ErrorLockOutOfReach,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldIsBlockedException)
@@ -392,7 +132,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockBoldIsBlockedMessage,
+						AppResources.ErrorOpenLockBoldBlocked,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldStatusIsUnknownException)
@@ -400,9 +140,9 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<BookedClosed>().Debug("Lock can not be opened. Bold status is unknown. {Exception}", exception);
 
 					await ViewService.DisplayAlert(
-						AppResources.ErrorOpenLockStillClosedTitle,
-						AppResources.ErrorOpenLockBoldStatusIsUnknownMessage,
-						"OK");
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStatusUnknown,
+						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
 						&& inconsistentState.State == LockingState.Closed)
@@ -411,17 +151,18 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockStillClosedMessage,
-						"OK");
+						AppResources.ErrorOpenLockStillClosed,
+						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<BookedClosed>().Error("Lock can not be opened. {Exception}", exception);
 
-					await ViewService.DisplayAlert(
+					await ViewService.DisplayAdvancedAlert(
 						AppResources.ErrorOpenLockTitle,
 						exception.Message,
-						"OK");
+						AppResources.ErrorTryAgain,
+						AppResources.MessageAnswerOk);
 				}
 
 				// When bold is blocked lock is still closed even if exception occurs.
@@ -431,9 +172,10 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					: LockingState.UnknownDisconnected;
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
+				BikesViewModel.RentalProcess.State = CurrentRentalProcess.None;
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 			}
 
@@ -501,9 +243,10 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			Log.ForContext<BookedClosed>().Information("User paused ride using {bike} successfully.", SelectedBike);
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
+			await ViewUpdateManager().StartAsync();
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true;
+			BikesViewModel.RentalProcess.State = CurrentRentalProcess.None;
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 		}
 	}
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs
index 675dea1..e3e2b32 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs
@@ -73,7 +73,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			// Stop polling before getting new auth-values.
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextQuerryServer;
 			IsConnected = IsConnectedDelegate();
@@ -93,8 +93,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<BookedDisconnected>().Information("User selected booked bike {l_oId} to connect to lock. (Copri server not reachable).", SelectedBike.Id);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageConnectLockErrorTitle,
-						$"{AppResources.ErrorConnectLockRentedBikeNoWebMessage}\r\n{exception.Message}\r\n{WebConnectFailureException.GetHintToPossibleExceptionsReasons}",
+						AppResources.ErrorNoConnectionTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -102,14 +102,14 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<BookedDisconnected>().Error("User selected booked bike {l_oId} to connect to lock. {@l_oException}", SelectedBike.Id, exception);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageConnectLockErrorTitle,
-						$"{AppResources.ErrorConnectLockGeneralErrorMessage}\r\n{exception.Message}",
+						AppResources.ErrorConnectLockTitle,
+						exception.Message,
 						AppResources.MessageAnswerOk);
 				}
 
 				// Restart polling again.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return this;
@@ -137,8 +137,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						continueConnect = false;
 
 						await ViewService.DisplayAlert(
-							AppResources.MessageConnectLockErrorTitle,
-							AppResources.ErrorFindLockBluetoothNotOn,
+							AppResources.ErrorConnectLockTitle,
+							AppResources.ErrorLockBluetoothNotOn,
 							AppResources.MessageAnswerOk);
 					}
 					else if (exception is ConnectLocationPermissionMissingException)
@@ -146,8 +146,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						continueConnect = false;
 
 						await ViewService.DisplayAlert(
-							AppResources.MessageConnectLockErrorTitle,
-							AppResources.ErrorFindLockLocationPermissionMissing,
+							AppResources.ErrorConnectLockTitle,
+							AppResources.ErrorNoLocationPermission,
 							AppResources.MessageAnswerOk);
 					}
 					else if (exception is ConnectLocationOffException)
@@ -155,19 +155,18 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						continueConnect = false;
 
 						await ViewService.DisplayAlert(
-							AppResources.MessageConnectLockErrorTitle,
-							AppResources.ErrorFindLockLocationOff,
+							AppResources.ErrorConnectLockTitle,
+							AppResources.ErrorLockLocationOff,
 							AppResources.MessageAnswerOk);
 					}
 					else if (exception is OutOfReachException)
 					{
-						Log.ForContext<BookedDisconnected>().Debug("Lock can not be found because out of reach. {Exception}", exception);
+						continueConnect = false;
 
-						continueConnect = await ViewService.DisplayAlert(
-							AppResources.MessageConnectLockErrorTitle,
-							AppResources.ErrorFindLockRentedBikeOutOfReachMessage,
-							AppResources.MessageAnswerRetry,
-							AppResources.MessageAnswerCancel);
+						await ViewService.DisplayAlert(
+							AppResources.ErrorConnectLockTitle,
+							AppResources.ErrorLockOutOfReach,
+							AppResources.MessageAnswerOk);
 					}
 					else
 					{
@@ -176,22 +175,22 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						string message;
 						if (retryCount < 2)
 						{
-							message = AppResources.ErrorBookedSearchMessage;
+							message = AppResources.ErrorConnectLock;
 						}
 						else if (retryCount < 3)
 						{
-							message = AppResources.ErrorBookedSearchMessageEscalationLevel1;
+							message = AppResources.ErrorConnectLockEscalationLevel1;
 						}
 						else
 						{
-							message = AppResources.ErrorBookedSearchMessageEscalationLevel2;
+							message = AppResources.ErrorConnectLockEscalationLevel2;
 						}
 
 
 						continueConnect = await ViewService.DisplayAdvancedAlert(
-								AppResources.MessageConnectLockErrorTitle,
+								AppResources.ErrorConnectLockTitle,
 								message,
-								"", // bool IsReportLevelVerbose ? exception.Message : string.Empty,  // or use ActiveUser.DebugLevel.HasFlag(Permissions.ReportLevel) instead?
+								"",
 								AppResources.MessageAnswerRetry,
 								AppResources.MessageAnswerCancel);
 					}
@@ -204,32 +203,32 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					// Quit and restart polling again.
 					BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-					await ViewUpdateManager().StartUpdateAyncPeridically();
+					await ViewUpdateManager().StartAsync();
 					BikesViewModel.ActionText = string.Empty;
 					BikesViewModel.IsIdle = true;
 					return this;
 				}
 			}
 
-			if (result?.State == null)
+			if (!(result?.State is LockitLockingState lockingState))
 			{
 				Log.ForContext<BookedDisconnected>().Information("Lock for bike {bike} not found.", SelectedBike);
 
 				BikesViewModel.ActionText = string.Empty;
 				await ViewService.DisplayAlert(
-					AppResources.MessageConnectLockErrorTitle,
-					$"Schlossstatus des gemieteten Rads konnte nicht ermittelt werden.",
+					AppResources.ErrorConnectLockTitle,
+					AppResources.ErrorLockNoStatus,
 					AppResources.MessageAnswerOk);
 
 				// Restart polling again.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return this;
 			}
 
-			var state = result.State.Value.GetLockingState();
+			var state = lockingState.GetLockingState();
 			SelectedBike.LockInfo.State = state;
 			SelectedBike.LockInfo.Guid = result?.Guid ?? new Guid();
 
@@ -237,7 +236,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			// Restart polling again.
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
+			await ViewUpdateManager().StartAsync();
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true;
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs
index 3083b41..f9750f9 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Threading;
 using System.Threading.Tasks;
 using Serilog;
 using TINK.Model;
@@ -9,13 +7,11 @@ using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.User;
 using TINK.MultilingualResources;
-using TINK.Repository.Exception;
-using TINK.Repository.Request;
 using TINK.Services.BluetoothLock;
-using TINK.Services.BluetoothLock.Exception;
 using TINK.Services.Geolocation;
-using TINK.Services.Logging;
 using TINK.View;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.CloseCommand;
+using static TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandlerFactory;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
@@ -34,8 +30,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 		   IBikesViewModel bikesViewModel,
 		   IUser activeUser) : base(
 			   selectedBike,
-			   AppResources.ActionCloseAndReturn,  // Copri button text: "Schloss schließen & Miete beenden"
-			   true, // Show button to allow user to return bike.
+			   AppResources.ActionClose,  // Copri button text: "Close lock"
+			   true, // Show button to allow user to close lock.
 			   isConnectedDelegate,
 			   connectorFactory,
 			   geolocation,
@@ -46,634 +42,92 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			   bikesViewModel,
 			   activeUser)
 		{
-			LockitButtonText = AppResources.ActionClose; // BT button text "Schließen".
-			IsLockitButtonVisible = true; // Show button to allow user to lock bike.
+			LockitButtonText = string.Empty;
+			IsLockitButtonVisible = false;
+
+			_closeLockActionViewModel = new CloseLockActionViewModel<BookedOpen>(
+				selectedBike,
+				viewUpdateManager,
+				viewService,
+				bikesViewModel);
 		}
 
-		/// <summary> Close lock and return bike.</summary>
-		public async Task<IRequestHandler> HandleRequestOption1() => await CloseLockAndReturnBike();
+		/// <summary>
+		/// Holds the view model for close action.
+		/// </summary>
+		private CloseLockActionViewModel<BookedOpen> _closeLockActionViewModel;
 
-		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-		public async Task<IRequestHandler> HandleRequestOption2() => await CloseLock();
-
-		/// <summary> Close lock and return bike.</summary>
-		public async Task<IRequestHandler> CloseLockAndReturnBike()
+		/// <summary> Close lock (and return bike).</summary>
+		public async Task<IRequestHandler> HandleRequestOption1()
 		{
-			// Prevent concurrent interaction
-			BikesViewModel.IsIdle = false;
-
-			// Start getting geolocation.
-			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
-			var ctsLocation = new CancellationTokenSource();
-			Task<IGeolocation> currentLocationTask = null;
-			var timeStamp = DateTime.Now;
-			try
+			await _closeLockActionViewModel.CloseLockAsync();
+			if(_closeLockActionViewModel.IsEndRentalRequested == false)
 			{
-				currentLocationTask = GeolocationService.GetAsync(ctsLocation.Token, timeStamp);
-			}
-			catch (Exception ex)
-			{
-				// No location information available.
-				Log.ForContext<BookedOpen>().Information("Returning bike {Bike} is not possible. Start query location failed. {Exception}", SelectedBike, ex);
-
-				BikesViewModel.ActionText = string.Empty;
-				await ViewService.DisplayAlert(
-					AppResources.MessageErrorQueryLocationStartTitle,
-					$"{AppResources.MessageErrorQueryLocationMessage}\r\n{ex.Message}",
-					AppResources.MessageAnswerOk);
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true; // Unlock GUI                
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-
-			// Ask whether to really return bike?
-			var result = await ViewService.DisplayAlert(
-				string.Empty,
-				string.Format(AppResources.QuestionCloseLockAndReturnBike, SelectedBike.GetFullDisplayName()),
-				AppResources.MessageAnswerYes,
-				AppResources.MessageAnswerNo);
-
-			if (result == false)
-			{
-				// User aborted closing and returning bike process
-				Log.ForContext<BookedOpen>().Information("User selected booked bike {l_oId} in order to close and return but action was canceled.", SelectedBike.Id);
-
-				// Cancel getting geolocation.
-				ctsLocation.Cancel();
-				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-				try
-				{
-					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-				}
-				catch (Exception ex)
-				{
-					// No location information available.
-					Log.ForContext<BookedOpen>().Information("Canceling query location failed on abort returning opened bike failed. {Exception}", SelectedBike, ex);
-				}
-
-				BikesViewModel.IsIdle = true;
-				return this;
-			}
-
-			// Start of closing lock and returning bike sequence.
-			Log.ForContext<BookedOpen>().Information("Request to return bike {bike} detected.", SelectedBike);
-
-			// Clear logging memory sink to avoid passing log data not related to returning of bike to back-end.
-			// Log data is passed to back end when calling CopriCallsHttps.DoReturn().
-			MemoryStackSink.ClearMessages();
-
-			// Stop polling before returning bike.
-			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
-
-			// Notify COPRI about start returning bike sequence: "request=booking_update ... &lock_state=locking ..."
-			BikesViewModel.ActionText = AppResources.ActivityTextStartReturningBike;
-			IsConnected = IsConnectedDelegate();
-			try
-			{
-				await ConnectorFactory(IsConnected).Command.StartReturningBike(
-					SelectedBike);
-			}
-			catch (Exception exception)
-			{
-				BikesViewModel.ActionText = string.Empty;
-				if (exception is WebConnectFailureException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returning failed (Copri server not reachable).", SelectedBike);
-
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.ErrorReturnBikeNoWebTitle,
-						string.Format("{0}\r\n{1}", AppResources.ErrorReturnBikeNoWebMessage, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-						exception.Message,
-						AppResources.MessageAnswerOk);
-				}
-				else
-				{
-					Log.ForContext<BookedOpen>().Error("User selected booked bike {bike} but returning failed. {@l_oException}", SelectedBike.Id, exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorReturnBikeTitle,
-						exception.Message,
-						AppResources.MessageAnswerOk);
-				}
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true;
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-
-			// Close lock
-			BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
-			try
-			{
-				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())
-					?.GetLockingState() ?? LockingState.UnknownDisconnected;
-			}
-			catch (Exception exception)
-			{
-				BikesViewModel.ActionText = string.Empty;
-
-				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-					? stateAwareException.State
-					: LockingState.UnknownDisconnected;
-
-				// Signal cts to  cancel getting geolocation.
-				ctsLocation.Cancel();
-				Task updateLockingStateTask = Task.CompletedTask;
-				IsConnected = IsConnectedDelegate();
-				try
-				{
-					updateLockingStateTask = ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
-						SelectedBike);
-				}
-				catch (Exception innerExceptionStartUpdateLockingState)
-				{
-					// No location information available/ updating state failed.
-					Log.ForContext<BookedOpen>().Information("Start update locking state failed on lock operating error. {Exception}", SelectedBike, innerExceptionStartUpdateLockingState);
-				}
-
-				if (exception is OutOfReachException)
-				{
-					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockOutOfReachMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is CouldntCloseMovingException)
-				{
-					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockMovingMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is CouldntCloseBoldBlockedException)
-				{
-					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockBoldBlockedMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else
-				{
-					Log.ForContext<BookedOpen>().Error("Lock can not be closed. {Exception}", exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						exception.Message,
-						AppResources.MessageAnswerOk);
-				}
-
-				// Wait until cancel getting geolocation has completed.
-				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-				try
-				{
-					await Task.WhenAll(new List<Task> { currentLocationTask ?? Task.CompletedTask, updateLockingStateTask });
-				}
-				catch (Exception innerExWhenAll)
-				{
-					// No location information available/ updating state failed.
-					Log.ForContext<BookedOpen>().Information("Canceling query location/ updating lock state failed on closing lock error. {Exception}", SelectedBike, innerExWhenAll);
-				}
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true; // Unlock GUI                
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-
-			// Check locking state.
-			if (SelectedBike.LockInfo.State != LockingState.Closed)
-			{
-				Log.ForContext<BookedOpen>().Error($"Lock can not be closed. Invalid locking state {SelectedBike.LockInfo.State} detected.");
-
-				BikesViewModel.ActionText = string.Empty;
-
-
-				// Signal cts to  cancel getting geolocation.
-				ctsLocation.Cancel();
-
-				// Notify COPRI about closing failure: "request=booking_update ... &lock_state=unlocked ..."
-				Task updateLockingStateTask = Task.CompletedTask;
-				IsConnected = IsConnectedDelegate();
-				try
-				{
-					updateLockingStateTask = ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
-						SelectedBike);
-				}
-				catch (Exception innerExceptionStartUpdateLockingState)
-				{
-					// No location information available/ updating state failed.
-					Log.ForContext<BookedOpen>().Information("Start update locking state failed on unexpected state. {Exception}", SelectedBike, innerExceptionStartUpdateLockingState);
-				}
-
-				await ViewService.DisplayAlert(
-					AppResources.ErrorCloseLockTitle,
-					SelectedBike.LockInfo.State == LockingState.Open
-						? AppResources.ErrorCloseLockStillOpenMessage
-						: string.Format(AppResources.ErrorCloseLockUnexpectedStateMessage, SelectedBike.LockInfo.State),
-					AppResources.MessageAnswerOk);
-
-				// Wait until cancel getting geolocation has completed.
-				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-				try
-				{
-					await Task.WhenAll(new List<Task> { currentLocationTask ?? Task.CompletedTask, updateLockingStateTask });
-				}
-				catch (Exception innerExWhenAll)
-				{
-					// No location information available.
-					Log.ForContext<BookedOpen>().Information("Canceling query location/ updating lock state failed on unexpected lock state failed. {Exception}", SelectedBike, innerExWhenAll);
-				}
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true; // Unlock GUI                
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-
-			// Get geolocation information.
-			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
-			IGeolocation currentLocation = null;
-			try
-			{
-				var task = await Task.WhenAny(new List<Task> { currentLocationTask });
-				currentLocation = currentLocationTask.Result;
-			}
-			catch (Exception ex)
-			{
-				// No location information available.
-				Log.ForContext<BookedOpen>().Information("Returning bike {Bike} is not possible. Query location failed. {Exception}", SelectedBike, ex);
-
-				BikesViewModel.ActionText = string.Empty;
-				await ViewService.DisplayAdvancedAlert(
-					AppResources.MessageErrorQueryLocationTitle,
-					AppResources.MessageErrorQueryLocationMessage,
-					ex.GetErrorMessage(),
-					AppResources.MessageAnswerOk);
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true; // Unlock GUI                
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-
-			// Notify COPRI about end of rental: "request=booking_update ... "&state=available" ... &lock_state=locked ..."
-			BikesViewModel.ActionText = AppResources.ActivityTextReturningBike;
-			IsConnected = IsConnectedDelegate();
-
-			var feedBackUri = SelectedBike?.OperatorUri;
-			LocationDto currentLocationDto = null;
-			BookingFinishedModel bookingFinished;
-			try
-			{
-				currentLocationDto = currentLocation != null
-					? new LocationDto.Builder
-						{
-							Latitude = currentLocation.Latitude,
-							Longitude = currentLocation.Longitude,
-							Accuracy = currentLocation.Accuracy ?? double.NaN,
-							Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
-						}.Build()
-					: null;
-
-				bookingFinished = await ConnectorFactory(IsConnected).Command.DoReturn(
+				return Create(
 					SelectedBike,
-					currentLocationDto,
-					SmartDevice);
-			}
-			catch (Exception exception)
-			{
-				BikesViewModel.ActionText = string.Empty;
-				if (exception is WebConnectFailureException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<BookedOpen>().Information(
-						"User selected booked bike {bike} but returning failed (Copri server not reachable).", SelectedBike);
-
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.ErrorReturnBikeNoWebTitle,
-						string.Format("{0}\r\n{1}", AppResources.ErrorReturnBikeNoWebMessage, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-						exception.Message,
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is NotAtStationException notAtStationException)
-				{
-					// COPRI returned an error.
-					Log.ForContext<BookedOpen>().Information(
-						"User selected booked bike {bike} but returning failed. COPRI returned out of GEO fencing error. Position send to COPRI {@position}.",
-						SelectedBike,
-						currentLocationDto);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorReturnBikeTitle,
-						string.Format(AppResources.ErrorReturnBikeNotAtStationMessage, notAtStationException.StationNr, notAtStationException.Distance),
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is NoGPSDataException)
-				{
-					// COPRI returned an error.
-					Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returning failed. COPRI returned an no GPS- data error.", SelectedBike);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorReturnBikeTitle,
-						string.Format(AppResources.ErrorReturnBikeLockOpenNoGPSMessage),
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is ResponseException copriException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<BookedOpen>().Information("User selected booked bike {bike} but returning failed. COPRI returned an error.", SelectedBike);
-
-					await ViewService.DisplayAdvancedAlert(
-						"Statusfehler beim Zurückgeben des Rads!",
-						copriException.Message,
-						copriException.Response,
-						AppResources.MessageAnswerOk);
-				}
-				else
-				{
-					Log.ForContext<BookedOpen>().Error("User selected booked bike {bike} but returning failed. {@l_oException}", SelectedBike.Id, exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorReturnBikeTitle,
-						exception.Message,
-						AppResources.MessageAnswerOk);
-				}
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true;
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+					IsConnectedDelegate,
+					ConnectorFactory,
+					GeolocationService,
+					LockService,
+					ViewUpdateManager,
+					SmartDevice,
+					ViewService,
+					BikesViewModel,
+					ActiveUser);
 			}
 
-			Log.ForContext<BookedOpen>().Information("User returned bike {bike} successfully.", SelectedBike);
+			var _endRentalActionViewModel = new EndRentalActionViewModel<BookedClosed>(
+				SelectedBike,
+				IsConnectedDelegate,
+				ConnectorFactory,
+				LockService,
+				ViewUpdateManager,
+				ViewService,
+				BikesViewModel);
 
-			// Disconnect lock.
-			BikesViewModel.ActionText = AppResources.ActivityTextDisconnectingLock;
-			try
-			{
-				SelectedBike.LockInfo.State = await LockService.DisconnectAsync(SelectedBike.LockInfo.Id, SelectedBike.LockInfo.Guid);
-			}
-			catch (Exception exception)
-			{
-				Log.ForContext<BookedOpen>().Error("Lock can not be disconnected. {Exception}", exception);
+			await _endRentalActionViewModel.EndRentalAsync();
 
-				BikesViewModel.ActionText = AppResources.ActivityTextErrorDisconnect;
-			}
-
-#if !USERFEEDBACKDLG_OFF
-			// Do get Feedback
-			var feedback = await ViewService.DisplayUserFeedbackPopup(
-				SelectedBike.Drive?.Battery,
-				bookingFinished?.Co2Saving);
-			IsConnected = IsConnectedDelegate();
-			try
-			{
-				await ConnectorFactory(IsConnected).Command.DoSubmitFeedback(
-					 new UserFeedbackDto
-					 {
-						 BikeId = SelectedBike.Id,
-						 CurrentChargeBars = feedback.CurrentChargeBars,
-						 IsBikeBroken = feedback.IsBikeBroken,
-						 Message = feedback.Message
-					 },
-					feedBackUri);
-			}
-			catch (Exception exception)
-			{
-				BikesViewModel.ActionText = string.Empty;
-
-				if (exception is ResponseException copriException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<BookedOpen>().Information("Submitting feedback for bike {bike} failed. COPRI returned an error.", SelectedBike);
-				}
-				else
-				{
-					Log.ForContext<BookedOpen>().Error("Submitting feedback for bike {bike} failed. {@l_oException}", SelectedBike.Id, exception);
-				}
-
-				await ViewService.DisplayAlert(
-					AppResources.ErrorReturnSubmitFeedbackTitle,
-					AppResources.ErrorReturnSubmitFeedbackMessage,
-					AppResources.MessageAnswerOk);
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true;
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-#endif
-
-			if (bookingFinished != null && bookingFinished.MiniSurvey.Questions.Count > 0)
-			{
-				await ViewService.PushModalAsync(ViewTypes.MiniSurvey);
-			}
-
-			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
-			BikesViewModel.ActionText = string.Empty;
-			BikesViewModel.IsIdle = true;
-			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			return Create(
+				SelectedBike,
+				IsConnectedDelegate,
+				ConnectorFactory,
+				GeolocationService,
+				LockService,
+				ViewUpdateManager,
+				SmartDevice,
+				ViewService,
+				BikesViewModel,
+				ActiveUser);
 		}
 
-		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-		public async Task<IRequestHandler> CloseLock()
+		public Task<IRequestHandler> HandleRequestOption2() => throw new InvalidOperationException();
+
+		/// <summary> Request is not supported, button should be disabled. </summary>
+		/// <returns></returns>
+		public async Task<IRequestHandler> UnsupportedRequest()
 		{
-			// Unlock bike.
-			BikesViewModel.IsIdle = false;
-			Log.ForContext<BookedOpen>().Information("User request to lock bike {bike} in order to pause ride.", SelectedBike);
-
-			// Clear logging memory sink to avoid passing log data not related to returning of bike to back end.
-			// Log data is passed to back end when calling CopriCallsHttps.DoReturn().
-			MemoryStackSink.ClearMessages();
-
-			// Start getting geolocation.
-			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
-			var ctsLocation = new CancellationTokenSource();
-			Task<IGeolocation> currentLocationTask = null;
-			var timeStamp = DateTime.Now;
-			try
-			{
-				currentLocationTask = GeolocationService.GetAsync(ctsLocation.Token, timeStamp);
-			}
-			catch (Exception ex)
-			{
-				// No location information available.
-				Log.ForContext<BookedOpen>().Information("Closing lock of bike {Bike} is not possible. Starting query location failed. {Exception}", SelectedBike, ex);
-
-				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationQuery;
-			}
-
-			// Stop polling before returning bike.
-			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
-
-			// Close lock
-			BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
-			try
-			{
-				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-			}
-			catch (Exception exception)
-			{
-				BikesViewModel.ActionText = string.Empty;
-
-				// Signal cts to  cancel getting geolocation.
-				ctsLocation.Cancel();
-
-				if (exception is OutOfReachException)
-				{
-					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. {Exception}", exception);
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockOutOfReachMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is CouldntCloseMovingException)
-				{
-					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockMovingMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is CouldntCloseBoldBlockedException)
-				{
-					Log.ForContext<BookedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockBoldBlockedMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else
-				{
-					Log.ForContext<BookedOpen>().Error("Lock can not be closed. {Exception}", exception);
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						exception.Message,
-						AppResources.MessageAnswerOk);
-				}
-
-				// Update current state from exception
-				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-					? stateAwareException.State
-					: LockingState.UnknownDisconnected;
-
-				// Wait until cancel getting geolocation has completed.
-				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-				try
-				{
-					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-				}
-				catch (Exception ex)
-				{
-					// No location information available.
-					Log.ForContext<BookedOpen>().Information("Canceling query location failed on closing lock error. {Exception}", SelectedBike, ex);
-				}
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true;
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-
-			// Get geolocation.
-			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
-			IGeolocation currentLocation = null;
-			try
-			{
-				await Task.WhenAny(new List<Task> { currentLocationTask });
-				currentLocation = currentLocationTask.Result;
-			}
-			catch (Exception ex)
-			{
-				// No location information available.
-				Log.ForContext<BookedOpen>().Information("Getting geolocation when closing lock of bike {Bike} failed. {Exception}", SelectedBike, ex);
-
-				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationWhenAny;
-			}
-
-			// Keep geolocation where closing action occurred.
-			SelectedBike.LockInfo.Location = currentLocation;
-
-			// Lock list to avoid multiple taps while copri action is pending.
-			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
-
-			IsConnected = IsConnectedDelegate();
-
-			try
-			{
-				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
-					SelectedBike,
-					currentLocation != null
-						? new LocationDto.Builder
-						{
-							Latitude = currentLocation.Latitude,
-							Longitude = currentLocation.Longitude,
-							Accuracy = currentLocation.Accuracy ?? double.NaN,
-							Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
-						}.Build()
-						: null);
-			}
-			catch (Exception exception)
-			{
-				if (exception is WebConnectFailureException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<BookedOpen>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
-
-					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-				}
-				else if (exception is ResponseException copriException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<BookedOpen>().Information("User locked bike {bike} in order to pause ride but updating failed. Message: {Message} Details: {Details}", SelectedBike, copriException.Message, copriException.Response);
-
-					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-				}
-				else
-				{
-					Log.ForContext<BookedOpen>().Error("User locked bike {bike} in order to pause ride but updating failed. {@l_oException}", SelectedBike.Id, exception);
-
-					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-				}
-			}
-
-			Log.ForContext<BookedOpen>().Information("User paused ride using {bike} successfully.", SelectedBike);
-			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
-			BikesViewModel.ActionText = string.Empty;
-			BikesViewModel.IsIdle = true;
-			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			Log.ForContext<DisposableDisconnected>().Error("Click of unsupported button click detected.");
+			return await Task.FromResult<IRequestHandler>(this);
 		}
+
+		/// <summary>
+		/// Processes the close lock progress.
+		/// </summary>
+		/// <remarks>
+		/// Only used for testing.
+		/// </remarks>
+		/// <param name="step">Current step to process.</param>
+		public void ReportStep(Step step) => _closeLockActionViewModel?.ReportStep(step);
+
+		/// <summary>
+		/// Processes the close lock state.
+		/// </summary>
+		/// <remarks>
+		/// Only used for testing.
+		/// </remarks>
+		/// <param name="state">State to process.</param>
+		/// <param name="details">Textual details describing current state.</param>
+		public async Task ReportStateAsync(State state, string details) => await _closeLockActionViewModel.ReportStateAsync(state, details);
+
 	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs
index cc256b7..3cec494 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs
@@ -14,6 +14,8 @@ using TINK.Services.BluetoothLock;
 using TINK.Services.BluetoothLock.Exception;
 using TINK.Services.Geolocation;
 using TINK.View;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.CloseCommand;
+using static TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandlerFactory;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
@@ -47,14 +49,28 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 		{
 			LockitButtonText = AppResources.ActionClose; // BT button text "Schließen".;
 			IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
+
+			_closeLockActionViewModel = new CloseLockActionViewModel<BookedOpen>(
+				selectedBike,
+				viewUpdateManager,
+				viewService,
+				bikesViewModel);
 		}
 
+		/// <summary>
+		/// Holds the view model for close action.
+		/// </summary>
+		private CloseLockActionViewModel<BookedOpen> _closeLockActionViewModel;
+
 		/// <summary> Open bike and update COPRI lock state. </summary>
 		public async Task<IRequestHandler> HandleRequestOption1() => await OpenLock();
 
 		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-		public async Task<IRequestHandler> HandleRequestOption2() => await CloseLock();
-
+		public async Task<IRequestHandler> HandleRequestOption2()
+		{
+			await _closeLockActionViewModel.CloseLockAsync();
+			return Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+		}
 
 		/// <summary> Open bike and update COPRI lock state. </summary>
 		public async Task<IRequestHandler> OpenLock()
@@ -65,7 +81,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			// Stop polling before returning bike.
 			BikesViewModel.IsIdle = false;
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
 			ILockService btLock;
@@ -84,7 +100,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.ErrorLockOutOfReach,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldIsBlockedException)
@@ -93,7 +109,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockBoldIsBlockedMessage,
+						AppResources.ErrorOpenLockBoldBlocked,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldStatusIsUnknownException)
@@ -101,8 +117,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<BookedUnknown>().Debug("Lock can not be opened. Bold status is unknown. {Exception}", exception);
 
 					await ViewService.DisplayAlert(
-						AppResources.ErrorOpenLockStillClosedTitle,
-						AppResources.ErrorOpenLockBoldStatusIsUnknownMessage,
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStatusUnknown,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
@@ -112,16 +128,17 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockStillClosedMessage,
+						AppResources.ErrorOpenLockStillClosed,
 						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<BookedUnknown>().Error("Lock can not be opened. {Exception}", exception);
 
-					await ViewService.DisplayAlert(
+					await ViewService.DisplayAdvancedAlert(
 						AppResources.ErrorOpenLockTitle,
 						exception.Message,
+						AppResources.ErrorTryAgain,
 						AppResources.MessageAnswerOk);
 				}
 
@@ -132,7 +149,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					: LockingState.UnknownDisconnected;
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -202,178 +219,29 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			Log.ForContext<BookedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
+			await ViewUpdateManager().StartAsync();
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true;
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 		}
 
-		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-		public async Task<IRequestHandler> CloseLock()
-		{
-			// Unlock bike.
-			BikesViewModel.IsIdle = false;
+		/// <summary>
+		/// Processes the close lock progress.
+		/// </summary>
+		/// <remarks>
+		/// Only used for testing.
+		/// </remarks>
+		/// <param name="step">Current step to process.</param>
+		public void ReportStep(Step step) => _closeLockActionViewModel?.ReportStep(step);
 
-			Log.ForContext<BookedUnknown>().Information("User request to lock bike {bike} in order to pause ride.", SelectedBike);
-
-			// Start getting geolocation.
-			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
-			var ctsLocation = new CancellationTokenSource();
-			Task<IGeolocation> currentLocationTask = null;
-			var timeStamp = DateTime.Now;
-			try
-			{
-				currentLocationTask = GeolocationService.GetAsync(ctsLocation.Token, timeStamp);
-			}
-			catch (Exception ex)
-			{
-				// No location information available.
-				Log.ForContext<BookedUnknown>().Information("Returning bike {Bike} is not possible. Start query location failed. {Exception}", SelectedBike, ex);
-
-				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationQuery;
-			}
-
-			// Stop polling before returning bike.
-			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
-
-			// Close lock
-			BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
-			try
-			{
-				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-			}
-			catch (Exception exception)
-			{
-				BikesViewModel.ActionText = string.Empty;
-
-				// Signal cts to  cancel getting geolocation.
-				ctsLocation.Cancel();
-
-				if (exception is OutOfReachException)
-				{
-					Log.ForContext<BookedUnknown>().Debug("Lock can not be closed. {Exception}", exception);
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockOutOfReachMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is CouldntCloseMovingException)
-				{
-					Log.ForContext<BookedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockMovingMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is CouldntCloseBoldBlockedException)
-				{
-					Log.ForContext<BookedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockBoldBlockedMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else
-				{
-					Log.ForContext<BookedUnknown>().Error("Lock can not be closed. {Exception}", exception);
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						exception.Message,
-						AppResources.MessageAnswerOk);
-				}
-
-				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-					? stateAwareException.State
-					: LockingState.UnknownDisconnected;
-
-				// Wait until cancel getting geolocation has completed.
-				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-				try
-				{
-					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-				}
-				catch (Exception ex)
-				{
-					// No location information available.
-					Log.ForContext<BookedUnknown>().Information("Canceling query location failed on unexpected lock state failed. {Exception}", SelectedBike, ex);
-				}
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true;
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-
-			// Get geoposition.
-			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
-			IGeolocation currentLocation = null;
-			try
-			{
-				await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-				currentLocation = currentLocationTask?.Result ?? null;
-			}
-			catch (Exception ex)
-			{
-				// No location information available.
-				Log.ForContext<BookedUnknown>().Information("Get geolocation failed when closing lock  of bike {Bike} with unknown state. {Exception}", SelectedBike, ex);
-
-				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationWhenAny;
-			}
-
-			// Lock list to avoid multiple taps while copri action is pending.
-			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
-
-			IsConnected = IsConnectedDelegate();
-
-			try
-			{
-				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
-					SelectedBike,
-					currentLocation != null
-						? new LocationDto.Builder
-						{
-							Latitude = currentLocation.Latitude,
-							Longitude = currentLocation.Longitude,
-							Accuracy = currentLocation.Accuracy ?? double.NaN,
-							Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
-						}.Build()
-						: null);
-			}
-			catch (Exception exception)
-			{
-				if (exception is WebConnectFailureException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<BookedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
-
-					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-				}
-				else if (exception is ResponseException copriException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<BookedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed. Message: {Message} Details: {Details}", SelectedBike, copriException.Message, copriException.Response);
-
-					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-				}
-				else
-				{
-					Log.ForContext<BookedUnknown>().Error("User locked bike {bike} in order to pause ride but updating failed. {@l_oException}", SelectedBike.Id, exception);
-
-					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-				}
-			}
-
-			Log.ForContext<BookedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
-			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
-			BikesViewModel.ActionText = string.Empty;
-			BikesViewModel.IsIdle = true;
-			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-		}
+		/// <summary>
+		/// Processes the close lock state.
+		/// </summary>
+		/// <remarks>
+		/// Only used for testing.
+		/// </remarks>
+		/// <param name="state">State to process.</param>
+		/// <param name="details">Textual details describing current state.</param>
+		public async Task ReportStateAsync(State state, string details) => await _closeLockActionViewModel.ReportStateAsync(state, details);
 	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
index 1f8f6a6..389ec4e 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
@@ -82,7 +82,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
 
 			// Stop polling before requesting bike.
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextReservingBike;
 			IsConnected = IsConnectedDelegate();
@@ -101,8 +101,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<DisposableDisconnected>().Information("Request declined because maximum count of bikes {l_oException.MaxBikesCount} already requested/ booked.", (exception as BookingDeclinedException).MaxBikesCount);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageTitleHint,
-						string.Format(AppResources.MessageReservationBikeErrorTooManyReservationsRentals, SelectedBike.Id, (exception as BookingDeclinedException).MaxBikesCount),
+						AppResources.MessageHintTitle,
+						string.Format(AppResources.ErrorReservingBikeTooManyReservationsRentals, SelectedBike.Id, (exception as BookingDeclinedException).MaxBikesCount),
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is WebConnectFailureException
@@ -112,23 +112,24 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<DisposableDisconnected>().Information("User selected centered bike {bike} but reserving failed (Copri server not reachable).", SelectedBike);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageReservingBikeErrorConnectionTitle,
-						string.Format("{0}\r\n{1}", exception.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.ErrorNoConnectionTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<DisposableDisconnected>().Error("User selected centered bike {bike} but reserving failed. {@l_oException}", SelectedBike, exception);
 
-					await ViewService.DisplayAlert(
-						AppResources.MessageReservingBikeErrorGeneralTitle,
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorReservingBikeTitle,
 						exception.Message,
+						AppResources.ErrorTryAgain,
 						AppResources.MessageAnswerOk);
 				}
 
 				// Restart polling again.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return this;
@@ -160,7 +161,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				// Restart polling again.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -174,7 +175,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				// Restart polling again.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -212,7 +213,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				// Restart polling again.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -236,25 +237,23 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					// Copri server is not reachable.
 					Log.ForContext<DisposableDisconnected>().Information("User selected recently requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
 
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageRentingBikeErrorConnectionTitle,
-						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-						l_oException.Message,
+					await ViewService.DisplayAlert(
+						AppResources.ErrorNoConnectionTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<DisposableDisconnected>().Error("User selected recently requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
 
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageRentingBikeErrorGeneralTitle,
-						string.Empty,
+					await ViewService.DisplayAlert(
+						AppResources.ErrorRentingBikeTitle,
 						l_oException.Message,
 						AppResources.MessageAnswerOk);
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -277,7 +276,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.ErrorLockOutOfReach,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldIsBlockedException)
@@ -286,7 +285,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockBoldIsBlockedMessage,
+						AppResources.ErrorOpenLockBoldBlocked,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldStatusIsUnknownException)
@@ -294,8 +293,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<DisposableDisconnected>().Debug("Lock can not be opened. Bold status is unknown. {Exception}", exception);
 
 					await ViewService.DisplayAlert(
-						AppResources.ErrorOpenLockStillClosedTitle,
-						AppResources.ErrorOpenLockBoldStatusIsUnknownMessage,
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStatusUnknown,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
@@ -305,7 +304,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockStillClosedMessage,
+						AppResources.ErrorOpenLockStillClosed,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -322,7 +321,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					: LockingState.UnknownDisconnected;
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
@@ -333,7 +332,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				// Opening lock failed.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI
@@ -404,7 +403,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			Log.ForContext<DisposableDisconnected>().Information("User reserved bike {bike} successfully.", SelectedBike);
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			await ViewUpdateManager().StartAsync(); // Restart polling again.
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true; // Unlock GUI
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
index 4b430a8..ed2c90a 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
@@ -45,7 +45,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			   IBikesViewModel bikesViewModel,
 			   IUser activeUser) : base(
 				   selectedBike,
-				   AppResources.ActionBookOrClose,
+				   AppResources.ActionCloseOrBook,
 				   true, // Show copri button to enable reserving
 				   isConnectedDelegate,
 				   connectorFactory,
@@ -76,14 +76,14 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			// Stop polling before requesting bike.
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			// Ask whether to really book bike or close lock?
 			var l_oResult = await ViewService.DisplayAlert(
 				string.Empty,
-				$"Fahrrad {SelectedBike.GetFullDisplayName()} mieten oder Schloss schließen?",
-				"Mieten",
-				"Schloss schließen");
+				String.Format(AppResources.QuestionCloseOrBook, SelectedBike.GetFullDisplayName()),
+				AppResources.ActionBook,
+				AppResources.ActionClose);
 
 			if (l_oResult == false)
 			{
@@ -103,7 +103,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 						await ViewService.DisplayAlert(
 							AppResources.ErrorCloseLockTitle,
-							AppResources.ErrorCloseLockOutOfReachMessage,
+							AppResources.ErrorLockOutOfReach,
 							AppResources.MessageAnswerOk);
 					}
 					else if (exception is CouldntCloseMovingException)
@@ -112,25 +112,26 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 						await ViewService.DisplayAlert(
 							AppResources.ErrorCloseLockTitle,
-							AppResources.ErrorCloseLockMovingMessage,
+							AppResources.ErrorLockMoving,
 							AppResources.MessageAnswerOk);
 					}
-					else if (exception is CouldntCloseBoldBlockedException)
+					else if (exception is CouldntCloseBoltBlockedException)
 					{
 						Log.ForContext<DisposableOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
 						await ViewService.DisplayAlert(
 							AppResources.ErrorCloseLockTitle,
-							AppResources.ErrorCloseLockBoldBlockedMessage,
+							AppResources.ErrorCloseLockBoltBlocked,
 							AppResources.MessageAnswerOk);
 					}
 					else
 					{
 						Log.ForContext<DisposableOpen>().Error("Lock can not be closed. {Exception}", exception);
 
-						await ViewService.DisplayAlert(
+						await ViewService.DisplayAdvancedAlert(
 							AppResources.ErrorCloseLockTitle,
 							exception.Message,
+							AppResources.ErrorTryAgain,
 							AppResources.MessageAnswerOk);
 					}
 
@@ -139,7 +140,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						: LockingState.UnknownDisconnected;
 
 					BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-					await ViewUpdateManager().StartUpdateAyncPeridically();
+					await ViewUpdateManager().StartAsync();
 					BikesViewModel.ActionText = string.Empty;
 					BikesViewModel.IsIdle = true;
 					return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -159,7 +160,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -206,8 +207,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<DisposableOpen>().Information("User selected requested bike {l_oId} but reserving failed (Copri server not reachable).", SelectedBike.Id);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageRentingBikeErrorConnectionTitle,
-						string.Format(AppResources.MessageErrorLockIsClosedThreeLines, l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.ErrorRentingBikeTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -215,13 +216,13 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<DisposableOpen>().Error("User selected requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageRentingBikeErrorGeneralTitle,
-						string.Format(AppResources.MessageErrorLockIsClosedTwoLines, l_oException.Message),
+						AppResources.ErrorRentingBikeTitle,
+						string.Format(l_oException.Message, AppResources.ErrorTryAgain),
 						AppResources.MessageAnswerOk);
 				}
 
 				// If booking failed lock bike again because bike is only reserved.
-				BikesViewModel.ActionText = "Verschließe Schloss...";
+				BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
 				try
 				{
 					SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
@@ -250,7 +251,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				// Restart polling again.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 
 				// Update status text and unlock list of bikes because no more action is pending.
 				BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block BikesViewModel.ActionText is already set to empty.
@@ -262,7 +263,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			// Restart polling again.
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
+			await ViewUpdateManager().StartAsync();
 
 			// Update status text and unlock list of bikes because no more action is pending.
 			BikesViewModel.ActionText = string.Empty; // Todo: Move this statement in front of finally block because in catch block BikesViewModel.ActionText is already set to empty.
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/NotLoggedIn.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/NotLoggedIn.cs
index ff0c72b..ec265cd 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/NotLoggedIn.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/NotLoggedIn.cs
@@ -2,6 +2,7 @@ using System;
 using System.Threading.Tasks;
 using Serilog;
 using TINK.Model.State;
+using TINK.MultilingualResources;
 using TINK.View;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
@@ -48,10 +49,10 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 			// User is not logged in
 			BikesViewModel.ActionText = string.Empty;
 			var l_oResult = await ViewService.DisplayAlert(
-				"Hinweis",
-				"Bitte anmelden vor Reservierung eines Fahrrads!\r\nAuf Anmeldeseite wechseln?",
-				"Ja",
-				"Nein");
+				AppResources.QuestionLogInTitle,
+				AppResources.QuestionLogIn,
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
 			if (l_oResult == false)
 			{
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
index ed94130..725e1a0 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
@@ -68,8 +68,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			var l_oResult = await ViewService.DisplayAlert(
 				string.Empty,
 				string.Format(AppResources.QuestionCancelReservation, SelectedBike.GetFullDisplayName()),
-				AppResources.QuestionAnswerYes,
-				AppResources.QuestionAnswerNo);
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
 			if (l_oResult == false)
 			{
@@ -83,7 +83,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			// Stop polling before cancel request.
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextCancelingReservation;
 			IsConnected = IsConnectedDelegate();
@@ -101,8 +101,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<BikesViewModel>().Error("User selected reserved bike {l_oId} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
-						exception.Message,
+						AppResources.ErrorCancelReservationTitle,
+						AppResources.ErrorAccountInvalidAuthorization,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is WebConnectFailureException
@@ -111,21 +111,22 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					// Copri server is not reachable.
 					Log.ForContext<BikesViewModel>().Information("User selected reserved bike {l_oId} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
 					await ViewService.DisplayAlert(
-						AppResources.MessageCancelReservationBikeErrorConnectionTitle,
-						string.Format("{0}\r\n{1}", exception.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.ErrorCancelReservationTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<BikesViewModel>().Error("User selected reserved bike {l_oId} but cancel reservation failed. {@l_oException}.", SelectedBike.Id, exception);
-					await ViewService.DisplayAlert(
-						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorCancelReservationTitle,
 						exception.Message,
+						AppResources.ErrorTryAgain,
 						AppResources.MessageAnswerOk);
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
+				await ViewUpdateManager().StartAsync(); // Restart polling again.            
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI                
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -147,7 +148,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			}
 
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
+			await ViewUpdateManager().StartAsync(); // Restart polling again.            
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true; // Unlock GUI
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -177,7 +178,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			// Stop polling before cancel request.
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			// Book bike prior to opening lock.
 			BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
@@ -195,10 +196,9 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					// Copri server is not reachable.
 					Log.ForContext<ReservedClosed>().Information("User selected requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
 
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageRentingBikeErrorConnectionTitle,
-						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-						l_oException.Message,
+					await ViewService.DisplayAlert(
+						AppResources.ErrorRentingBikeTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -206,14 +206,14 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<ReservedClosed>().Error("User selected requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
 
 					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageRentingBikeErrorGeneralTitle,
-						string.Empty,
+						AppResources.ErrorRentingBikeTitle,
+						AppResources.ErrorTryAgain,
 						l_oException.Message,
 						AppResources.MessageAnswerOk);
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -234,27 +234,30 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				{
 					Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. {Exception}", exception);
 
-					await ViewService.DisplayAlert(
+					await ViewService.DisplayAdvancedAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.ErrorLockOutOfReach,
+						AppResources.ErrorOpenLockBikeAlreadyBooked,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldIsBlockedException)
 				{
 					Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. Bold is blocked. {Exception}", exception);
 
-					await ViewService.DisplayAlert(
+					await ViewService.DisplayAdvancedAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockBoldIsBlockedMessage,
+						AppResources.ErrorOpenLockBoldBlocked,
+						AppResources.ErrorOpenLockBikeAlreadyBooked,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldStatusIsUnknownException)
 				{
 					Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. Bold status is unknown. {Exception}", exception);
 
-					await ViewService.DisplayAlert(
-						AppResources.ErrorOpenLockStillClosedTitle,
-						AppResources.ErrorOpenLockBoldStatusIsUnknownMessage,
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStatusUnknown,
+						AppResources.ErrorOpenLockBikeAlreadyBooked,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
@@ -262,16 +265,18 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				{
 					Log.ForContext<ReservedClosed>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
 
-					await ViewService.DisplayAlert(
+					await ViewService.DisplayAdvancedAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockStillClosedMessage,
+						AppResources.ErrorOpenLockStillClosed,
+						AppResources.ErrorOpenLockBikeAlreadyBooked,
 						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<ReservedClosed>().Error("Lock can not be opened. {Exception}", exception);
-					await ViewService.DisplayAlert(
+					await ViewService.DisplayAdvancedAlert(
 						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorTryAgain,
 						exception.Message,
 						AppResources.MessageAnswerOk);
 				}
@@ -281,7 +286,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					: LockingState.UnknownDisconnected;
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
@@ -292,7 +297,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				// Opening lock failed.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI
@@ -363,7 +368,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			Log.ForContext<ReservedClosed>().Information("User reserved bike {bike} successfully.", SelectedBike);
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			await ViewUpdateManager().StartAsync(); // Restart polling again.
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true; // Unlock GUI
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
index 9428fd6..c5140c2 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
@@ -32,7 +32,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 		   IBikesViewModel bikesViewModel,
 		   IUser activeUser) : base(
 			   selectedBike,
-			   AppResources.ActionCancelRequest, // Copri button text: "Reservierung abbrechen"
+			   AppResources.ActionCancelRequest,
 			   true, // Show button to enable canceling reservation.
 			   isConnectedDelegate,
 			   connectorFactory,
@@ -45,7 +45,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			   activeUser)
 		{
 			LockitButtonText = AppResources.ActionSearchLock;
-			IsLockitButtonVisible = true; // Show "Öffnen" button to enable unlocking
+			IsLockitButtonVisible = true; // Show button to search lock.
 		}
 
 		/// <summary> Cancel reservation. </summary>
@@ -63,8 +63,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			var alertResult = await ViewService.DisplayAlert(
 				string.Empty,
 				string.Format(AppResources.QuestionCancelReservation, SelectedBike.GetFullDisplayName()),
-				AppResources.QuestionAnswerYes,
-				AppResources.QuestionAnswerNo);
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
 			if (alertResult == false)
 			{
@@ -78,7 +78,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			// Stop polling before cancel request.
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextCancelingReservation;
 			IsConnected = IsConnectedDelegate();
@@ -94,8 +94,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					// Copri response is invalid.
 					Log.ForContext<ReservedDisconnected>().Error("User selected reserved bike {l_oId} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
 					await ViewService.DisplayAlert(
-						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
-						exception.Message,
+						AppResources.ErrorCancelReservationTitle,
+						AppResources.ErrorAccountInvalidAuthorization,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is WebConnectFailureException
@@ -104,21 +104,22 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					// Copri server is not reachable.
 					Log.ForContext<ReservedDisconnected>().Information("User selected reserved bike {l_oId} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
 					await ViewService.DisplayAlert(
-						AppResources.MessageCancelReservationBikeErrorConnectionTitle,
-						string.Format("{0}\r\n{1}", exception.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.ErrorCancelReservationTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<ReservedDisconnected>().Error("User selected reserved bike {l_oId} but cancel reservation failed. {@l_oException}.", SelectedBike.Id, exception);
-					await ViewService.DisplayAlert(
-						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorCancelReservationTitle,
 						exception.Message,
-						"OK");
+						AppResources.ErrorTryAgain,
+						AppResources.MessageAnswerOk);
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI                
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -127,7 +128,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			Log.ForContext<ReservedDisconnected>().Information("User canceled reservation of bike {l_oId} successfully.", SelectedBike.Id);
 
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			await ViewUpdateManager().StartAsync(); // Restart polling again.
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true; // Unlock GUI                
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -142,7 +143,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			// Stop polling before getting new auth-values.
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextQuerryServer;
 			IsConnected = IsConnectedDelegate();
@@ -162,23 +163,24 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<ReservedDisconnected>().Information("User selected requested bike {l_oId} to connect to lock. (Copri server not reachable).", SelectedBike.Id);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageErrorConnectTitle,
-						$"{AppResources.ErrorConnectLockReservedBikeNoWebMessage}\r\n{exception.Message}\r\n{WebConnectFailureException.GetHintToPossibleExceptionsReasons}",
+						AppResources.ErrorNoConnectionTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<ReservedDisconnected>().Error("User selected requested bike {l_oId} to scan for lock. {@l_oException}", SelectedBike.Id, exception);
 
-					await ViewService.DisplayAlert(
-						AppResources.MessageErrorConnectTitle,
-						$"{AppResources.ErrorConnectLockGeneralErrorMessage}\r\n{exception.Message}",
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorConnectLockTitle,
+						exception.Message,
+						AppResources.ErrorConnectLock,
 						AppResources.MessageAnswerOk);
 				}
 
 				// Restart polling again.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return this;
@@ -212,8 +214,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						continueConnect = false;
 
 						await ViewService.DisplayAlert(
-							AppResources.MessageErrorConnectTitle,
-							AppResources.ErrorFindLockBluetoothNotOn,
+							AppResources.ErrorConnectLockTitle,
+							AppResources.ErrorLockBluetoothNotOn,
 							AppResources.MessageAnswerOk);
 					}
 					else if (exception is ConnectLocationPermissionMissingException)
@@ -221,8 +223,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						continueConnect = false;
 
 						await ViewService.DisplayAlert(
-							AppResources.MessageConnectLockErrorTitle,
-							AppResources.ErrorFindLockLocationPermissionMissing,
+							AppResources.ErrorConnectLockTitle,
+							AppResources.ErrorNoLocationPermission,
 							AppResources.MessageAnswerOk);
 					}
 					else if (exception is ConnectLocationOffException)
@@ -230,19 +232,18 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						continueConnect = false;
 
 						await ViewService.DisplayAlert(
-							AppResources.MessageConnectLockErrorTitle,
-							AppResources.ErrorFindLockLocationOff,
+							AppResources.ErrorConnectLockTitle,
+							AppResources.ErrorLockLocationOff,
 							AppResources.MessageAnswerOk);
 					}
 					else if (exception is OutOfReachException)
 					{
-						Log.ForContext<ReservedDisconnected>().Debug("Lock can not be found because out of reach.. {Exception}", exception);
+						continueConnect = false;
 
-						continueConnect = await ViewService.DisplayAlert(
-							AppResources.MessageErrorConnectTitle,
-							AppResources.ErrorFindLockReservedBikeOutOfReachMessage,
-							AppResources.MessageAnswerRetry,
-							AppResources.MessageAnswerCancel);
+						await ViewService.DisplayAlert(
+							AppResources.ErrorConnectLockTitle,
+							AppResources.ErrorLockOutOfReach,
+							AppResources.MessageAnswerOk);
 					}
 					else
 					{
@@ -251,18 +252,18 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						string message;
 						if (retryCount < 2)
 						{
-							message = AppResources.ErrorReservedSearchMessage;
+							message = AppResources.ErrorConnectLock;
 						}
 						else
 						{
-							message = AppResources.ErrorReservedSearchMessageEscalationLevel1;
+							message = AppResources.ErrorConnectLockEscalationLevel1;
 						}
 
 						Log.ForContext<ReservedDisconnected>().Error("Lock state can not be retrieved. {Exception}", exception);
 						continueConnect = await ViewService.DisplayAdvancedAlert(
-								AppResources.MessageErrorConnectTitle,
+								AppResources.ErrorConnectLockTitle,
 								message,
-								"", // bool IsReportLevelVerbose ? exception.Message : string.Empty,  // or use ActiveUser.DebugLevel.HasFlag(Permissions.ReportLevel) instead?
+								"", // Might show detailed info in future versions.  Property used earlier: IsReportLevelVerbose. Maybe use ActiveUser.DebugLevel.HasFlag(Permissions.ReportLevel) instead.
 								AppResources.MessageAnswerRetry,
 								AppResources.MessageAnswerCancel);
 					}
@@ -275,32 +276,31 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					// Restart polling again.
 					BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-					await ViewUpdateManager().StartUpdateAyncPeridically();
+					await ViewUpdateManager().StartAsync();
 					BikesViewModel.ActionText = string.Empty;
 					BikesViewModel.IsIdle = true;
 					return this;
 				}
 			}
-			if (result?.State == null)
+			if (!(result?.State is LockitLockingState lockingState))
 			{
 				Log.ForContext<ReservedDisconnected>().Information("Lock for bike {bike} not found.", SelectedBike);
 				BikesViewModel.ActionText = string.Empty;
 
 				await ViewService.DisplayAlert(
-					AppResources.MessageErrorConnectTitle,
-					AppResources.ErrorFindLockReservedBikeNoStausMessage,
+					AppResources.ErrorConnectLockTitle,
+					AppResources.ErrorLockNoStatus,
 					AppResources.MessageAnswerOk);
 
 				// Restart polling again.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return this;
 			}
 
-			var state = result.State.Value.GetLockingState();
-			SelectedBike.LockInfo.State = state;
+			SelectedBike.LockInfo.State = lockingState.GetLockingState();
 			SelectedBike.LockInfo.Guid = result?.Guid ?? new Guid();
 
 			Log.ForContext<ReservedDisconnected>().Information($"State for bike {SelectedBike.Id} updated successfully. Value is {SelectedBike.LockInfo.State}.");
@@ -334,7 +334,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				// Restart polling again.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -358,10 +358,9 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					// Copri server is not reachable.
 					Log.ForContext<ReservedDisconnected>().Information("User selected recently requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
 
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageRentingBikeErrorConnectionTitle,
-						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-						l_oException.Message,
+					await ViewService.DisplayAlert(
+						AppResources.ErrorRentingBikeTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -369,14 +368,14 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<ReservedDisconnected>().Error("User selected recently requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
 
 					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageRentingBikeErrorGeneralTitle,
-						string.Empty,
+						AppResources.ErrorRentingBikeTitle,
 						l_oException.Message,
+						AppResources.ErrorTryAgain,
 						AppResources.MessageAnswerOk);
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -399,7 +398,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.ErrorLockOutOfReach,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldIsBlockedException)
@@ -408,7 +407,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockBoldIsBlockedMessage,
+						AppResources.ErrorOpenLockBoldBlocked,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldStatusIsUnknownException)
@@ -416,8 +415,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					Log.ForContext<ReservedDisconnected>().Debug("Lock can not be opened. Bold status is unknown. {Exception}", exception);
 
 					await ViewService.DisplayAlert(
-						AppResources.ErrorOpenLockStillClosedTitle,
-						AppResources.ErrorOpenLockBoldStatusIsUnknownMessage,
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStatusUnknown,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
@@ -427,15 +426,16 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockStillClosedMessage,
+						AppResources.ErrorOpenLockStillClosed,
 						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<ReservedDisconnected>().Error("Lock can not be opened. {Exception}", exception);
-					await ViewService.DisplayAlert(
+					await ViewService.DisplayAdvancedAlert(
 						AppResources.ErrorOpenLockTitle,
 						exception.Message,
+						AppResources.ErrorTryAgain,
 						AppResources.MessageAnswerOk);
 				}
 
@@ -444,7 +444,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					: LockingState.UnknownDisconnected;
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
@@ -455,7 +455,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				// Opening lock failed.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI
@@ -528,7 +528,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			// Restart polling again.
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
+			await ViewUpdateManager().StartAsync();
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true; // Unlock GUI
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
index 6c92334..bafd0cb 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
@@ -37,7 +37,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 		   IBikesViewModel bikesViewModel,
 		   IUser activeUser) : base(
 		   selectedBike,
-		   "Rad zurückgeben oder mieten",
+		   AppResources.ActionCloseOrBook,
 		   true, // Show button to enable canceling reservation.
 		   isConnectedDelegate,
 		   connectorFactory,
@@ -67,13 +67,13 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var l_oResult = await ViewService.DisplayAlert(
 				string.Empty,
-				string.Format("Rad {0} abschließen und zurückgeben oder Rad mieten?", SelectedBike.GetFullDisplayName()),
-				"Zurückgeben",
-				"Mieten");
+				string.Format(AppResources.QuestionCloseOrBook, SelectedBike.GetFullDisplayName()),
+				AppResources.ActionClose,
+				AppResources.ActionBook);
 
 			// Stop polling before cancel request.
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			if (l_oResult == false)
 			{
@@ -118,22 +118,23 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						Log.ForContext<ReservedOpen>().Information("User selected requested bike {l_oId} but booking failed (Copri server not reachable).", SelectedBike.Id);
 
 						await ViewService.DisplayAlert(
-							AppResources.MessageRentingBikeErrorConnectionTitle,
-							string.Format(AppResources.MessageErrorLockIsClosedThreeLines, l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+							AppResources.ErrorRentingBikeTitle,
+							AppResources.ErrorNoWeb,
 							AppResources.MessageAnswerOk);
 					}
 					else
 					{
 						Log.ForContext<ReservedOpen>().Error("User selected requested bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, l_oException);
 
-						await ViewService.DisplayAlert(
-							AppResources.MessageRentingBikeErrorGeneralTitle,
-							string.Format(AppResources.MessageErrorLockIsClosedTwoLines, l_oException.Message),
+						await ViewService.DisplayAdvancedAlert(
+							AppResources.ErrorRentingBikeTitle,
+							l_oException.Message,
+							AppResources.ErrorTryAgain,
 							AppResources.MessageAnswerOk);
 					}
 
 					// If booking failed lock bike again because bike is only reserved.
-					BikesViewModel.ActionText = "Wiederverschließe Schloss...";
+					BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
 					try
 					{
 						SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
@@ -148,7 +149,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					}
 
 					BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-					await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+					await ViewUpdateManager().StartAsync(); // Restart polling again.
 
 					BikesViewModel.ActionText = string.Empty;
 					BikesViewModel.IsIdle = true; // Unlock GUI
@@ -158,7 +159,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				Log.ForContext<ReservedOpen>().Information("User booked bike {bike} successfully.", SelectedBike);
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI
@@ -181,8 +182,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockOutOfReachStateReservedMessage,
-						"OK");
+						AppResources.ErrorLockOutOfReach,
+						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntCloseMovingException)
 				{
@@ -190,17 +191,17 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockMovingMessage,
-						"OK");
+						AppResources.ErrorLockMoving,
+						AppResources.MessageAnswerOk);
 				}
-				else if (exception is CouldntCloseBoldBlockedException)
+				else if (exception is CouldntCloseBoltBlockedException)
 				{
 					Log.ForContext<ReservedOpen>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockBoldBlockedMessage,
-						"OK");
+						AppResources.ErrorCloseLockBoltBlocked,
+						AppResources.MessageAnswerOk);
 				}
 				else
 				{
@@ -208,8 +209,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 					await ViewService.DisplayAlert(
 						AppResources.ErrorCloseLockTitle,
-						string.Format(AppResources.ErrorCloseLockUnkErrorMessage, exception.Message),
-						"OK");
+						string.Format(AppResources.ErrorCloseLock, exception.Message),
+						AppResources.MessageAnswerOk);
 				}
 
 				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
@@ -217,7 +218,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					: LockingState.UnknownDisconnected;
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI                
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -238,8 +239,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					// Copri response is invalid.
 					Log.ForContext<ReservedOpen>().Error("User selected reserved bike {l_oId} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
 					await ViewService.DisplayAlert(
-						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
-						exception.Message,
+						AppResources.ErrorCancelReservationTitle,
+						AppResources.ErrorAccountInvalidAuthorization,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is WebConnectFailureException
@@ -248,21 +249,22 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					// Copri server is not reachable.
 					Log.ForContext<ReservedOpen>().Information("User selected reserved bike {l_oId} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
 					await ViewService.DisplayAlert(
-						AppResources.MessageCancelReservationBikeErrorConnectionTitle,
-						string.Format("{0}\r\n{1}", exception.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						AppResources.ErrorCancelReservationTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<ReservedOpen>().Error("User selected reserved bike {l_oId} but cancel reservation failed. {@l_oException}.", SelectedBike.Id, exception);
-					await ViewService.DisplayAlert(
-						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorCancelReservationTitle,
 						exception.Message,
-						"OK");
+						AppResources.ErrorTryAgain,
+						AppResources.MessageAnswerOk);
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI                
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -284,7 +286,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			}
 
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			await ViewUpdateManager().StartAsync(); // Restart polling again.
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true; // Unlock GUI                
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -296,7 +298,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 		{
 			// Stop polling before requesting bike.
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			// Close lock
 			Log.ForContext<ReservedOpen>().Information("User selected disposable bike {bike} in order to manage sound/ alarm settings.", SelectedBike);
@@ -316,7 +318,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				await ViewService.DisplayAlert(
 					"Fehler beim Abschalten der Sounds!",
 					"Sounds können erst abgeschalten werden, wenn Rad in der Nähe ist.",
-					"OK");
+					AppResources.MessageAnswerOk);
 
 				return this;
 			}
@@ -328,7 +330,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				await ViewService.DisplayAlert(
 					"Fehler beim Abschalten der Sounds!",
 					exception.Message,
-					"OK");
+					AppResources.MessageAnswerOk);
 
 				return this;
 			}
@@ -347,7 +349,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				await ViewService.DisplayAlert(
 					"Fehler beim Setzen der Alarm-Einstellungen!",
 					"Alarm kann erst eingestellt werden, wenn Rad in der Nähe ist.",
-					"OK");
+					AppResources.MessageAnswerOk);
 
 				return this;
 			}
@@ -359,7 +361,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				await ViewService.DisplayAlert(
 					"Fehler beim Setzen der Alarms-Einstellungen!",
 					exception.Message,
-					"OK");
+					AppResources.MessageAnswerOk);
 
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 			}
@@ -378,7 +380,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				await ViewService.DisplayAlert(
 					"Fehler beim Abschalten des Alarms!",
 					"Alarm kann erst abgeschalten werden, wenn Rad in der Nähe ist.",
-					"OK");
+					AppResources.MessageAnswerOk);
 
 				return this;
 			}
@@ -390,22 +392,22 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				await ViewService.DisplayAlert(
 					"Fehler beim Abschalten des Alarms!",
 					exception.Message,
-					"OK");
+					AppResources.MessageAnswerOk);
 
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 			}
 			finally
 			{
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI                
 			}
 
 			await ViewService.DisplayAlert(
-				"Hinweis",
+				AppResources.MessageHintTitle,
 				"Alarm und Sounds erfolgreich abgeschalten.",
-				"OK");
+				AppResources.MessageAnswerOk);
 
 			return this;
 		}
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs
index e26921a..27e003e 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs
@@ -9,12 +9,13 @@ using TINK.Model.Device;
 using TINK.Model.User;
 using TINK.MultilingualResources;
 using TINK.Repository.Exception;
-using TINK.Repository.Request;
 using TINK.Services.BluetoothLock;
 using TINK.Services.BluetoothLock.Exception;
 using TINK.Services.Geolocation;
 using TINK.View;
-using Xamarin.Essentials;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.CloseCommand;
+using static TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandlerFactory;
+
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
@@ -48,6 +49,12 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 		{
 			LockitButtonText = AppResources.ActionClose; // BT button text "Schließen"
 			IsLockitButtonVisible = true; // Show button to enable opening lock in case user took a pause and does not want to return the bike.
+
+			_closeLockActionViewModel = new CloseLockActionViewModel<BookedOpen>(
+				selectedBike,
+				viewUpdateManager,
+				viewService,
+				bikesViewModel);
 		}
 
 		/// <summary> Open bike and update COPRI lock state. </summary>
@@ -62,7 +69,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			// Stop polling before returning bike.
 			BikesViewModel.IsIdle = false;
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
 			ILockService btLock;
@@ -79,27 +86,30 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				{
 					Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. {Exception}", exception);
 
-					await ViewService.DisplayAlert(
+					await ViewService.DisplayAdvancedAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockOutOfReachMessage,
+						AppResources.ErrorLockOutOfReach,
+						AppResources.ErrorOpenLockBikeAlreadyBooked,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldIsBlockedException)
 				{
 					Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. bold is blocked. {Exception}", exception);
 
-					await ViewService.DisplayAlert(
+					await ViewService.DisplayAdvancedAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockBoldIsBlockedMessage,
+						AppResources.ErrorOpenLockBoldBlocked,
+						AppResources.ErrorOpenLockBikeAlreadyBooked,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenBoldStatusIsUnknownException)
 				{
 					Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. lock reports state unkwnown. {Exception}", exception);
 
-					await ViewService.DisplayAlert(
-						AppResources.ErrorOpenLockStillClosedTitle,
-						AppResources.ErrorOpenLockBoldStatusIsUnknownMessage,
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorOpenLockTitle,
+						AppResources.ErrorOpenLockStatusUnknown,
+						AppResources.ErrorOpenLockBikeAlreadyBooked,
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is CouldntOpenInconsistentStateExecption inconsistentState
@@ -107,18 +117,20 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				{
 					Log.ForContext<ReservedUnknown>().Debug("Lock can not be opened. lock reports state closed. {Exception}", exception);
 
-					await ViewService.DisplayAlert(
+					await ViewService.DisplayAdvancedAlert(
 						AppResources.ErrorOpenLockTitle,
-						AppResources.ErrorOpenLockStillClosedMessage,
+						AppResources.ErrorOpenLockStillClosed,
+						AppResources.ErrorOpenLockBikeAlreadyBooked,
 						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<ReservedUnknown>().Error("Lock can not be opened. {Exception}", exception);
 
-					await ViewService.DisplayAlert(
+					await ViewService.DisplayAdvancedAlert(
 						AppResources.ErrorOpenLockTitle,
 						exception.Message,
+						AppResources.ErrorTryAgain,
 						AppResources.MessageAnswerOk);
 				}
 
@@ -129,7 +141,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					: LockingState.UnknownDisconnected;
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -199,182 +211,43 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			Log.ForContext<ReservedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
+			await ViewUpdateManager().StartAsync();
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true;
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 		}
 
-		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-		public async Task<IRequestHandler> HandleRequestOption2() => await CloseLock();
+		/// <summary>
+		/// Holds the view model for close action.
+		/// </summary>
+		private CloseLockActionViewModel<BookedOpen> _closeLockActionViewModel;
 
-
-		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
-		public async Task<IRequestHandler> CloseLock()
+		/// <summary> Close lock (and return bike).</summary>
+		public async Task<IRequestHandler> HandleRequestOption2()
 		{
-			// Unlock bike.
-			BikesViewModel.IsIdle = false;
-
-			Log.ForContext<ReservedUnknown>().Information("User request to lock bike {bike} in order to pause ride.", SelectedBike);
-
-			// Start getting geolocation.
-			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;
-			var ctsLocation = new CancellationTokenSource();
-			Task<IGeolocation> currentLocationTask = null;
-			var timeStamp = DateTime.Now;
-			try
-			{
-				currentLocationTask = GeolocationService.GetAsync(ctsLocation.Token, timeStamp);
-			}
-			catch (Exception ex)
-			{
-				// No location information available.
-				Log.ForContext<ReservedUnknown>().Information("Returning bike {Bike} is not possible. Start query location failed. {Exception}", SelectedBike, ex);
-
-				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationQuery;
-			}
-
-			// Stop polling before returning bike.
-			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
-
-			// Close lock
-			BikesViewModel.ActionText = AppResources.ActivityTextClosingLock;
-			try
-			{
-				SelectedBike.LockInfo.State = (await LockService[SelectedBike.LockInfo.Id].CloseAsync())?.GetLockingState() ?? LockingState.UnknownDisconnected;
-			}
-			catch (Exception exception)
-			{
-				BikesViewModel.ActionText = string.Empty;
-
-				// Signal cts to  cancel getting geolocation.
-				ctsLocation.Cancel();
-
-				if (exception is OutOfReachException)
-				{
-					Log.ForContext<ReservedUnknown>().Debug("Lock can not be closed. {Exception}", exception);
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockOutOfReachMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is CouldntCloseMovingException)
-				{
-					Log.ForContext<ReservedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockMovingMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else if (exception is CouldntCloseBoldBlockedException)
-				{
-					Log.ForContext<ReservedUnknown>().Debug("Lock can not be closed. Lock is out of reach. {Exception}", exception);
-
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						AppResources.ErrorCloseLockBoldBlockedMessage,
-						AppResources.MessageAnswerOk);
-				}
-				else
-				{
-					Log.ForContext<ReservedUnknown>().Error("Lock can not be closed. {Exception}", exception);
-					await ViewService.DisplayAlert(
-						AppResources.ErrorCloseLockTitle,
-						exception.Message,
-						AppResources.MessageAnswerOk);
-				}
-
-				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
-					? stateAwareException.State
-					: LockingState.UnknownDisconnected;
-
-				// Wait until cancel getting geolocation has completed.
-				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationCancelWait;
-				try
-				{
-					await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-				}
-				catch (Exception ex)
-				{
-					// No location information available.
-					Log.ForContext<ReservedUnknown>().Information("Canceling query location failed on closing lock error. {Exception}", SelectedBike, ex);
-				}
-
-				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
-
-				BikesViewModel.ActionText = string.Empty;
-				BikesViewModel.IsIdle = true;
-				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
-			}
-
-			// Get geolocation.
-			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
-			IGeolocation currentLocation = null;
-			try
-			{
-				await Task.WhenAny(new List<Task> { currentLocationTask ?? Task.CompletedTask });
-				currentLocation = currentLocationTask?.Result ?? null;
-			}
-			catch (Exception ex)
-			{
-				// No location information available.
-				Log.ForContext<ReservedUnknown>().Information("Returning bike {Bike} is not possible. {Exception}", SelectedBike, ex);
-
-				BikesViewModel.ActionText = AppResources.ActivityTextErrorQueryLocationWhenAny;
-			}
-
-			// Lock list to avoid multiple taps while copri action is pending.
-			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdatingLockingState;
-
-			IsConnected = IsConnectedDelegate();
-
-			try
-			{
-				await ConnectorFactory(IsConnected).Command.UpdateLockingStateAsync(
-					SelectedBike,
-					currentLocation != null
-						? new LocationDto.Builder
-						{
-							Latitude = currentLocation.Latitude,
-							Longitude = currentLocation.Longitude,
-							Accuracy = currentLocation.Accuracy ?? double.NaN,
-							Age = timeStamp.Subtract(currentLocation.Timestamp.DateTime),
-						}.Build()
-						: null);
-			}
-			catch (Exception exception)
-			{
-				if (exception is WebConnectFailureException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<ReservedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed (Copri server not reachable).", SelectedBike);
-
-					BikesViewModel.ActionText = AppResources.ActivityTextErrorNoWebUpdateingLockstate;
-				}
-				else if (exception is ResponseException copriException)
-				{
-					// Copri server is not reachable.
-					Log.ForContext<ReservedUnknown>().Information("User locked bike {bike} in order to pause ride but updating failed. Message: {Message} Details: {Details}", SelectedBike, copriException.Message, copriException.Response);
-
-					BikesViewModel.ActionText = AppResources.ActivityTextErrorStatusUpdateingLockstate;
-				}
-				else
-				{
-					Log.ForContext<ReservedUnknown>().Error("User locked bike {bike} in order to pause ride but updating failed. {@l_oException}", SelectedBike.Id, exception);
-
-					BikesViewModel.ActionText = AppResources.ActivityTextErrorConnectionUpdateingLockstate;
-				}
-			}
-
-			Log.ForContext<ReservedUnknown>().Information("User paused ride using {bike} successfully.", SelectedBike);
-			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
-			BikesViewModel.ActionText = string.Empty;
-			BikesViewModel.IsIdle = true;
-			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
+			await _closeLockActionViewModel.CloseLockAsync();
+			return Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 		}
+
+
+
+		/// <summary>
+		/// Processes the close lock progress.
+		/// </summary>
+		/// <remarks>
+		/// Only used for testing.
+		/// </remarks>
+		/// <param name="step">Current step to process.</param>
+		public void ReportStep(Step step) => _closeLockActionViewModel?.ReportStep(step);
+
+		/// <summary>
+		/// Processes the close lock state.
+		/// </summary>
+		/// <remarks>
+		/// Only used for testing.
+		/// </remarks>
+		/// <param name="state">State to process.</param>
+		/// <param name="details">Textual details describing current state.</param>
+		public async Task ReportStateAsync(State state, string details) => await _closeLockActionViewModel.ReportStateAsync(state, details);
 	}
 }
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs
index c44569f..3d642c6 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs
@@ -23,6 +23,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
 		/// <param name="viewService"></param>
 		/// <param name="bikesViewModel">View model to be used for progress report and unlocking/ locking view.</param>
+		/// <param name="context">Specifies the context (last action performed).</param>
 		/// <returns>Request handler.</returns>
 		public static IRequestHandler Create(
 			Model.Bikes.BikeInfoNS.BC.IBikeInfoMutable selectedBike,
@@ -171,7 +172,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 					switch (selectedBluetoothLockBike.LockInfo.State)
 					{
 						case LockingState.Closed:
-							// Ride was paused.
+							// User wants to close lock.
 							return new BookedClosed(
 								selectedBluetoothLockBike,
 								isConnectedDelegate,
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs
index 43b0cf3..c76b115 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs
@@ -63,7 +63,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			// Stop polling before returning bike.
 			BikesViewModel.IsIdle = false;
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
 			IsConnected = IsConnectedDelegate();
@@ -80,10 +80,9 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					// Copri server is not reachable.
 					Log.ForContext<BookedClosed>().Information("User selected bike {id} but opening lock failed (Copri server not reachable).", SelectedBike.Id);
 
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageOpeningLockErrorConnectionTitle,
-						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-						exception.Message,
+					await ViewService.DisplayAlert(
+						AppResources.ErrorNoConnectionTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -97,7 +96,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -105,7 +104,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			Log.ForContext<BookedClosed>().Information("User paused ride using {bike} successfully.", SelectedBike);
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
+			await ViewUpdateManager().StartAsync();
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true;
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs
index 4910625..5d2be49 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs
@@ -64,7 +64,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			// Stop polling before returning bike.
 			BikesViewModel.IsIdle = false;
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextOpeningLock;
 			IsConnected = IsConnectedDelegate();
@@ -81,10 +81,9 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					// Copri server is not reachable.
 					Log.ForContext<BookedOpen>().Information("User selected bike {id} but opening lock failed (Copri server not reachable).", SelectedBike.Id);
 
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageOpeningLockErrorConnectionTitle,
-						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-						exception.Message,
+					await ViewService.DisplayAlert(
+						AppResources.ErrorNoConnectionTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -98,7 +97,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -106,7 +105,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			Log.ForContext<BookedOpen>().Information("User paused ride using {bike} successfully.", SelectedBike);
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
+			await ViewUpdateManager().StartAsync();
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true;
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs
index 5e0bb20..823a7de 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs
@@ -74,7 +74,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			// Stop polling before returning bike.
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			// Book bike prior to opening lock.
 			BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
@@ -92,10 +92,9 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					// Copri server is not reachable.
 					Log.ForContext<DisposableClosed>().Information("User selected bike {id} but booking failed (Copri server not reachable).", SelectedBike.Id);
 
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageRentingBikeErrorConnectionTitle,
-						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-						exception.Message,
+					await ViewService.DisplayAlert(
+						AppResources.ErrorNoConnectionTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -103,13 +102,13 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					Log.ForContext<DisposableClosed>().Error("User selected bike {id} but booking failed. {@exception}", SelectedBike.Id, exception);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageRentingBikeErrorGeneralTitle,
+						AppResources.ErrorRentingBikeTitle,
 						exception.Message,
 						AppResources.MessageAnswerOk);
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI
 
@@ -118,7 +117,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			Log.ForContext<DisposableClosed>().Information("User booked and released bike {bike} successfully.", SelectedBike);
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			await ViewUpdateManager().StartAsync(); // Restart polling again.
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true; // Unlock GUI
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -151,7 +150,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
 
 			// Stop polling before requesting bike.
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextReservingBike;
 			IsConnected = IsConnectedDelegate();
@@ -170,8 +169,8 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					Log.ForContext<DisposableClosed>().Information("Request declined because maximum count of bikes {l_oException.MaxBikesCount} already requested/ booked.", (exception as BookingDeclinedException).MaxBikesCount);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageTitleHint,
-						string.Format(AppResources.MessageReservationBikeErrorTooManyReservationsRentals, SelectedBike.GetFullDisplayName(), (exception as BookingDeclinedException).MaxBikesCount),
+						AppResources.MessageHintTitle,
+						string.Format(AppResources.ErrorReservingBikeTooManyReservationsRentals, SelectedBike.GetFullDisplayName(), (exception as BookingDeclinedException).MaxBikesCount),
 						AppResources.MessageAnswerOk);
 				}
 				else if (exception is WebConnectFailureException
@@ -180,10 +179,9 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					// Copri server is not reachable.
 					Log.ForContext<DisposableClosed>().Information("User selected centered bike {bike} but reserving failed (Copri server not reachable).", SelectedBike);
 
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageReservingBikeErrorConnectionTitle,
-						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-						exception.Message,
+					await ViewService.DisplayAlert(
+						AppResources.ErrorNoConnectionTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -191,14 +189,14 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					Log.ForContext<DisposableClosed>().Error("User selected centered bike {bike} but reserving failed. {@exception}", SelectedBike, exception);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageReservingBikeErrorGeneralTitle,
+						AppResources.ErrorReservingBikeTitle,
 						exception.Message,
 						AppResources.MessageAnswerOk);
 				}
 
 				// Restart polling again.
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return this;
@@ -206,7 +204,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			Log.ForContext<DisposableClosed>().Information("User reserved bike {bike} successfully.", SelectedBike);
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			await ViewUpdateManager().StartAsync(); // Restart polling again.
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true; // Unlock GUI
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs
index f05cc57..d02d070 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs
@@ -59,7 +59,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 		{
 			BikesViewModel.IsIdle = false;
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			// Do get Feedback
 			var feedback = await ViewService.DisplayUserFeedbackPopup(SelectedBike.Drive?.Battery, SelectedBike?.BookingFinishedModel?.Co2Saving);
@@ -93,12 +93,12 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 				}
 
 				await ViewService.DisplayAlert(
-					AppResources.ErrorReturnSubmitFeedbackTitle,
-					AppResources.ErrorReturnSubmitFeedbackMessage,
+					AppResources.ErrorSubmitFeedbackTitle,
+					AppResources.ErrorNoWeb,
 					AppResources.MessageAnswerOk);
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically();
+				await ViewUpdateManager().StartAsync();
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true;
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -115,7 +115,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			}
 
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically();
+			await ViewUpdateManager().StartAsync();
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true;
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs
index df1a327..2196f07 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs
@@ -62,8 +62,8 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			var result = await ViewService.DisplayAlert(
 				string.Empty,
 				string.Format(AppResources.QuestionCancelReservation, SelectedBike.GetFullDisplayName()),
-				AppResources.QuestionAnswerYes,
-				AppResources.QuestionAnswerNo);
+				AppResources.MessageAnswerYes,
+				AppResources.MessageAnswerNo);
 
 			if (result == false)
 			{
@@ -77,7 +77,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			// Stop polling before cancel request.
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			BikesViewModel.ActionText = AppResources.ActivityTextCancelingReservation;
 			IsConnected = IsConnectedDelegate();
@@ -95,7 +95,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					Log.ForContext<BikesViewModel>().Error("User selected reserved bike {Id} but canceling reservation failed (Invalid auth. response).", SelectedBike.Id);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+						AppResources.ErrorCancelReservationTitle,
 						exception.Message,
 						AppResources.MessageAnswerOk);
 				}
@@ -104,23 +104,22 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 				{
 					// Copri server is not reachable.
 					Log.ForContext<BikesViewModel>().Information("User selected reserved bike {Id} but cancel reservation failed (Copri server not reachable).", SelectedBike.Id);
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageCancelReservationBikeErrorConnectionTitle,
-						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-						exception.Message,
+					await ViewService.DisplayAlert(
+						AppResources.ErrorCancelReservationTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
 				{
 					Log.ForContext<BikesViewModel>().Error("User selected reserved bike {Id} but cancel reservation failed. {@Exception}.", SelectedBike.Id, exception);
 					await ViewService.DisplayAlert(
-						AppResources.MessageCancelReservationBikeErrorGeneralTitle,
+						AppResources.ErrorCancelReservationTitle,
 						exception.Message,
 						AppResources.MessageAnswerOk);
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
+				await ViewUpdateManager().StartAsync(); // Restart polling again.            
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI                
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -129,7 +128,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			Log.ForContext<BikesViewModel>().Information("User canceled reservation of bike {Id} successfully.", SelectedBike.Id);
 
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.            
+			await ViewUpdateManager().StartAsync(); // Restart polling again.            
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true; // Unlock GUI
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -159,7 +158,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			// Stop polling before cancel request.
 			BikesViewModel.ActionText = AppResources.ActivityTextOneMomentPlease;
-			await ViewUpdateManager().StopUpdatePeridically();
+			await ViewUpdateManager().StopAsync();
 
 			// Book bike prior to opening lock.
 			BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
@@ -177,10 +176,9 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					// Copri server is not reachable.
 					Log.ForContext<ReservedClosed>().Information("User selected requested bike {Id} but booking failed (Copri server not reachable).", SelectedBike.Id);
 
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageRentingBikeErrorConnectionTitle,
-						WebConnectFailureException.GetHintToPossibleExceptionsReasons,
-						exception.Message,
+					await ViewService.DisplayAlert(
+						AppResources.ErrorNoConnectionTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -188,14 +186,14 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					Log.ForContext<ReservedClosed>().Error("User selected requested bike {Id} but reserving failed. {@Exception}", SelectedBike.Id, exception);
 
 					await ViewService.DisplayAdvancedAlert(
-						AppResources.MessageRentingBikeErrorGeneralTitle,
+						AppResources.ErrorRentingBikeTitle,
 						exception.Message,
 						string.Empty,
 						AppResources.MessageAnswerOk);
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-				await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+				await ViewUpdateManager().StartAsync(); // Restart polling again.
 				BikesViewModel.ActionText = string.Empty;
 				BikesViewModel.IsIdle = true; // Unlock GUI
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
@@ -203,7 +201,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			Log.ForContext<ReservedClosed>().Information("User booked and opened bike {bike} successfully.", SelectedBike.Id);
 			BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
-			await ViewUpdateManager().StartUpdateAyncPeridically(); // Restart polling again.
+			await ViewUpdateManager().StartAsync(); // Restart polling again.
 			BikesViewModel.ActionText = string.Empty;
 			BikesViewModel.IsIdle = true; // Unlock GUI
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
diff --git a/TINKLib/ViewModel/Bikes/BikesViewModel.cs b/TINKLib/ViewModel/Bikes/BikesViewModel.cs
index 06101a0..f15a569 100644
--- a/TINKLib/ViewModel/Bikes/BikesViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/BikesViewModel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Plugin.BLE.Abstractions.Contracts;
@@ -150,7 +151,12 @@ namespace TINK.ViewModel.Bikes
 
 			m_oViewUpdateManager = new IdlePollingUpdateTaskManager();
 
-			BikeCollection = new BikeCollectionMutable();
+			BikeCollection = new BikeCollectionMutable(
+				geolocation,
+				lockService,
+				isConnectedDelegate,
+				connectorFactory,
+				() => m_oViewUpdateManager);
 
 			BikeCollection.CollectionChanged += OnDecoratedCollectionChanged;
 
@@ -337,6 +343,63 @@ namespace TINK.ViewModel.Bikes
 			}
 		}
 
+		/// <summary> Used to display active rental process.</summary>
+		private IRentalProcess _rentalProcess = new RentalProcess();
+
+		/// <summary> Holds the active rental process.</summary>
+		public IRentalProcess RentalProcess
+		{
+			get => _rentalProcess;
+			set
+			{
+				if (value == _rentalProcess)
+					return;
+
+				_rentalProcess = value;
+
+				BikeInRentalProcess = this.FirstOrDefault(bike => bike.Id == _rentalProcess.BikeId) as Bike.BluetoothLock.BikeViewModel;
+
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(RentalProcess)));
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(BikeInRentalProcess)));
+			}
+		}
+
+		public Bike.BluetoothLock.BikeViewModel BikeInRentalProcess { get; private set; }
+
+		/// <summary> Used to display current step in rental process.</summary>
+		private int? currentStep = null;
+
+		/// <summary> Holds the number of current step in rental process.</summary>
+		public int? CurrentStep
+		{
+			get => currentStep;
+			set
+			{
+				if (value == CurrentStep)
+					return;
+
+				currentStep = value;
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(CurrentStep)));
+			}
+		}
+
+		/// <summary> Used to display status of current step in rental process.</summary>
+		private CurrentStepStatus currentStepStatus = CurrentStepStatus.None;
+
+		/// <summary> Holds the status of current step in rental process.e</summary>
+		public virtual CurrentStepStatus CurrentStepStatus
+		{
+			get => currentStepStatus;
+			set
+			{
+				if (value == CurrentStepStatus)
+					return;
+
+				currentStepStatus = value;
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(CurrentStepStatus)));
+			}
+		}
+
 		public bool IsProcessWithRunningProcessView => !isIdle;
 
 		/// <summary> Holds info about current action. </summary>
@@ -389,16 +452,11 @@ namespace TINK.ViewModel.Bikes
 		{
 			get
 			{
-				if (Exception != null)
-				{
-					// An error occurred getting data from copri.
-					return Exception.GetShortErrorInfoText(IsReportLevelVerbose);
-				}
-
-				if (!IsConnected)
-				{
-					return AppResources.ActivityTextConnectionStateOffline;
-				}
+				//if (Exception != null)
+				//{
+				//	// An error occurred getting data from copri.
+				//	return Exception.GetShortErrorInfoText(IsReportLevelVerbose);
+				//}
 
 				return ActionText ?? string.Empty;
 			}
@@ -471,7 +529,7 @@ namespace TINK.ViewModel.Bikes
 			try
 			{
 				// Update bikes at station or my bikes depending on context.
-				await m_oViewUpdateManager.StartUpdateAyncPeridically(m_oPolling);
+				await m_oViewUpdateManager.StartAsync(m_oPolling);
 			}
 			catch (Exception l_oExcetion)
 			{
@@ -484,7 +542,7 @@ namespace TINK.ViewModel.Bikes
 		/// Currently invoked by code behind, would be nice if called by XAML in future versions.
 		/// </summary>
 		public virtual async Task OnDisappearing()
-			=> await m_oViewUpdateManager.StopUpdatePeridically();
+			=> await m_oViewUpdateManager.StopAsync();
 	}
 
 }
diff --git a/TINKLib/ViewModel/Bikes/IBikesViewModel.cs b/TINKLib/ViewModel/Bikes/IBikesViewModel.cs
index ca73d3f..65a4366 100644
--- a/TINKLib/ViewModel/Bikes/IBikesViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/IBikesViewModel.cs
@@ -1,7 +1,11 @@
-namespace TINK.ViewModel.Bikes
+
+namespace TINK.ViewModel.Bikes
 {
 	public interface IBikesViewModel
 	{
+		/// <summary> Holds info about active rental process. </summary>
+		IRentalProcess RentalProcess { get; set; }
+
 		/// <summary> Holds info about current action. </summary>
 		string ActionText { get; set; }
 
diff --git a/TINKLib/ViewModel/Bikes/IRentalProcess.cs b/TINKLib/ViewModel/Bikes/IRentalProcess.cs
new file mode 100644
index 0000000..b17737b
--- /dev/null
+++ b/TINKLib/ViewModel/Bikes/IRentalProcess.cs
@@ -0,0 +1,31 @@
+using TINK.Model;
+
+namespace TINK.ViewModel.Bikes
+{
+	public interface IRentalProcess
+	{
+		/// <summary>
+		/// Gets the id of the bike which is rental ends.
+		/// </summary>
+		string BikeId { get; }
+
+		CurrentRentalProcess State { get; set; }
+
+		/// <summary> Holds info about current step in rental process. </summary>
+		int? StepIndex { get; set; }
+
+		/// <summary> Holds info about current step of rental process. </summary>
+		string StepInfoText { get; set; }
+
+		/// <summary> Holds important info about current step of rental process. </summary>
+		string ImportantStepInfoText { get; set; }
+
+		/// <summary> Holds info about status of current rental process. </summary>
+		CurrentStepStatus Result { get; set; }
+
+		/// <summary>
+		/// Holds the info returned from back end when rent is ended.
+		/// </summary>
+		BookingFinishedModel EndRentalInfo { get; set; }
+	}
+}
diff --git a/TINKLib/ViewModel/Bikes/RentalProcess.cs b/TINKLib/ViewModel/Bikes/RentalProcess.cs
new file mode 100644
index 0000000..bdd8049
--- /dev/null
+++ b/TINKLib/ViewModel/Bikes/RentalProcess.cs
@@ -0,0 +1,133 @@
+
+using System.ComponentModel;
+using TINK.Model;
+
+namespace TINK.ViewModel.Bikes
+{
+	public enum CurrentRentalProcess
+	{
+		None = 0,
+		ReserveBike = 1,
+		StartRental = 2,
+		OpenLock = 3,
+		CloseLock = 4,
+		EndRental = 5,
+	}
+
+	public enum CurrentStepStatus
+	{
+		None = 0,
+		Succeeded = 1,
+		Failed = 2,
+	}
+
+	public class RentalProcess : IRentalProcess, INotifyPropertyChanged
+	{
+		public event PropertyChangedEventHandler PropertyChanged;
+
+		public RentalProcess(string bikeId = null) => BikeId = bikeId ?? string.Empty;
+
+		/// <summary>
+		/// Gets the id of the bike which is rental ends.
+		/// </summary>
+		public string BikeId { get; }
+
+		/// <summary> Holds info about active rental process. </summary>
+		private CurrentRentalProcess _state = CurrentRentalProcess.None;
+
+		/// <summary> Holds info about active rental process. </summary>
+		public CurrentRentalProcess State
+		{
+			get => _state;
+			set
+			{
+				if (_state == value) { return; }
+
+				_state = value;
+
+				if (value == CurrentRentalProcess.None)
+				{
+					StepIndex = null;
+					Result = CurrentStepStatus.None;
+				}
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(State)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StepIndex)));
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Result)));
+
+			}
+
+		}
+
+		/// <summary> Holds info about current step in rental process. </summary>
+		private int? _stepIndex;
+
+		/// <summary> Holds info about current step in rental process. </summary>
+		public int? StepIndex
+		{
+			get => _stepIndex;
+			set
+			{
+				if (_stepIndex == value) { return; }
+
+				_stepIndex = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StepIndex)));
+			}
+		}
+
+		/// <summary> Holds info about current step. </summary>
+		private string _stepInfoText;
+
+		/// <summary> Holds info about current step. </summary>
+		public string StepInfoText
+		{
+			get => _stepInfoText;
+			set
+			{
+				if (value == _stepInfoText)
+					return;
+
+				_stepInfoText = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(StepInfoText)));
+			}
+		}
+
+		/// <summary> Holds important info about current step. </summary>
+		private string _importantStepInfoText;
+
+		/// <summary> Holds important info about current step. </summary>
+		public string ImportantStepInfoText
+		{
+			get => _importantStepInfoText;
+			set
+			{
+				if (value == _importantStepInfoText)
+					return;
+
+				_importantStepInfoText = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ImportantStepInfoText)));
+			}
+		}
+
+		/// <summary> Holds info about status of current rental process. </summary>
+		private CurrentStepStatus _result = CurrentStepStatus.None;
+
+		/// <summary> Holds info about status of current rental process. </summary>
+		public CurrentStepStatus Result
+		{
+			get => _result;
+			set
+			{
+				if (_result == value) { return; }
+
+				_result = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Result)));
+			}
+		}
+
+		/// <summary>
+		/// Holds the info returned from back end when rent is ended.
+		/// </summary>
+		public BookingFinishedModel EndRentalInfo { get; set; }
+
+	}
+}
diff --git a/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs b/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs
index 9419329..8dd9c76 100644
--- a/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs
+++ b/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs
@@ -253,7 +253,7 @@ namespace TINK.ViewModel.BikesAtStation
 			ActionText = AppResources.ActivityTextOneMomentPlease;
 
 			// Stop polling before getting bikes info.
-			await m_oViewUpdateManager.StopUpdatePeridically();
+			await m_oViewUpdateManager.StopAsync();
 
 			ActionText = AppResources.ActivityTextBikesAtStationGetBikes;
 
@@ -284,7 +284,7 @@ namespace TINK.ViewModel.BikesAtStation
 				if (status != Status.Granted)
 				{
 						var dialogResult = await ViewService.DisplayAlert(
-							AppResources.MessageTitleHint,
+							AppResources.MessageHintTitle,
 							AppResources.MessageBikesManagementLocationPermissionOpenDialog,
 							AppResources.MessageAnswerYes,
 							AppResources.MessageAnswerNo);
@@ -310,7 +310,7 @@ namespace TINK.ViewModel.BikesAtStation
 				if (GeolocationService.IsGeolcationEnabled == false)
 				{
 					await ViewService.DisplayAlert(
-						AppResources.MessageTitleHint,
+						AppResources.MessageHintTitle,
 						AppResources.MessageBikesManagementLocationActivation,
 						AppResources.MessageAnswerOk);
 
@@ -326,7 +326,7 @@ namespace TINK.ViewModel.BikesAtStation
 				if (await BluetoothService.GetBluetoothState() != BluetoothState.On)
 				{
 					await ViewService.DisplayAlert(
-						AppResources.MessageTitleHint,
+						AppResources.MessageHintTitle,
 						AppResources.MessageBikesManagementBluetoothActivation,
 						AppResources.MessageAnswerOk);
 
diff --git a/TINKLib/ViewModel/Contact/ContactPageViewModel.cs b/TINKLib/ViewModel/Contact/ContactPageViewModel.cs
index 7d04c76..2d7ea69 100644
--- a/TINKLib/ViewModel/Contact/ContactPageViewModel.cs
+++ b/TINKLib/ViewModel/Contact/ContactPageViewModel.cs
@@ -165,14 +165,14 @@ namespace TINK.ViewModel.Info
 			{
 				// Ask for permission to append diagnostics.    
 				await ViewService.DisplayAlert(
-					AppResources.QuestionSupportmailTitle,
+					AppResources.QuestionSupportmailAttachmentTitle,
 					AppResources.QuestionSupportmailAttachment,
 					AppResources.MessageAnswerOk);
 
 				var message = new EmailMessage
 				{
 					To = new List<string> { APPSUPPORTMAILADDRESS },
-					Subject = string.Format(AppResources.SupportmailSubjectAppmail, AppFlavorName)
+					Subject = SelectedStation?.Id != null ? string.Format(AppResources.SupportmailSubjectAppmailWithStation, AppFlavorName, SelectedStation?.Id) : string.Format(AppResources.SupportmailSubjectAppmail, AppFlavorName)
 				};
 
 				// Send with attachment.
@@ -276,7 +276,7 @@ namespace TINK.ViewModel.Info
 
 		/// <summary> Text providing the id of the selected station.</summary>
 		public string SelectedStationId
-			=> SelectedStation?.Id;
+			=> SelectedStation?.Id != null ? SelectedStation?.Id : string.Empty;
 
 		public string SelectedStationName
 			=> SelectedStation?.StationName;
diff --git a/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs b/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs
index 418dbf3..2b8c8b1 100644
--- a/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs
+++ b/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs
@@ -292,8 +292,8 @@ namespace TINK.ViewModel.Contact
 							&& status != Status.Granted)
 						{
 							var dialogResult = await ViewService.DisplayAlert(
-								AppResources.MessageTitleHint,
-								AppResources.MessageCenterMapLocationPermissionOpenDialog,
+								AppResources.MessageHintTitle,
+								AppResources.ErrorMapCenterNoLocationPermissionOpenDialog,
 								AppResources.MessageAnswerYes,
 								AppResources.MessageAnswerNo);
 
@@ -384,7 +384,7 @@ namespace TINK.ViewModel.Contact
 					// COPRI reports an auth cookie error.
 					await ViewService.DisplayAlert(
 						AppResources.MessageWaring,
-						AppResources.MessageMapPageErrorAuthcookieUndefined,
+						AppResources.ErrorMapPageAuthcookieUndefined,
 						AppResources.MessageAnswerOk);
 
 					IsConnected = TinkApp.GetIsConnected();
@@ -419,9 +419,9 @@ namespace TINK.ViewModel.Contact
 				IsProcessWithRunningProcessView = false;
 
 				await ViewService.DisplayAlert(
-					"Fehler",
-					$"Beim Anzeigen der Fahrradstandorte- Seite ist ein Fehler aufgetreten.\r\n{l_oException.Message}",
-					"OK");
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{l_oException.Message}",
+					AppResources.MessageAnswerOk);
 
 				IsMapPageEnabled = true;
 			}
@@ -483,10 +483,11 @@ namespace TINK.ViewModel.Contact
 					ActionText = string.Empty;
 
 					Log.ForContext<SelectStationPageViewModel>().Error("Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {Exception}", exception);
-					await ViewService.DisplayAlert(
-						 "Fehler",
-						 $"Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {exception.Message}",
-						 "OK");
+
+				await ViewService.DisplayAlert(
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					AppResources.MessageAnswerOk);
 				}
 #endif
 		}
@@ -636,17 +637,12 @@ namespace TINK.ViewModel.Contact
 		{
 			get
 			{
-				if (Exception != null)
-				{
-					// An error occurred getting data from copri.
-					return Exception.GetShortErrorInfoText(TinkApp.IsReportLevelVerbose);
+				//if (Exception != null)
+				//{
+				//	// An error occurred getting data from copri.
+				//	return Exception.GetShortErrorInfoText(TinkApp.IsReportLevelVerbose);
 
-				}
-
-				if (!IsConnected)
-				{
-					return AppResources.ActivityTextConnectionStateOffline;
-				}
+				//}
 
 				return ActionText ?? string.Empty;
 			}
diff --git a/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs b/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
index 17d13cf..6c9c598 100644
--- a/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
+++ b/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
@@ -175,7 +175,7 @@ namespace TINK.ViewModel.FindBike
 			IsConnected = IsConnectedDelegate();
 
 			// Stop polling before getting bikes info.
-			await m_oViewUpdateManager.StopUpdatePeridically();
+			await m_oViewUpdateManager.StopAsync();
 
 			if (string.IsNullOrEmpty(BikeIdUserInput) /* Find bike page flyout was taped */
 				&& BikeCollection.Count > 0 /* Bike was successfully selected */)
@@ -238,10 +238,9 @@ namespace TINK.ViewModel.FindBike
 					// Copri server is not reachable.
 					Log.ForContext<FindBikePageViewModel>().Information("Getting bikes failed (Copri server not reachable).");
 
-					await ViewService.DisplayAdvancedAlert(
-						AppResources.ErrorReturnBikeNoWebTitle,
-						string.Format("{0}\r\n{1}", AppResources.ErrorReturnBikeNoWebMessage, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
-						exception.Message,
+					await ViewService.DisplayAlert(
+						AppResources.ErrorSelectBikeTitle,
+						AppResources.ErrorNoWeb,
 						AppResources.MessageAnswerOk);
 				}
 				else
@@ -249,7 +248,7 @@ namespace TINK.ViewModel.FindBike
 					Log.ForContext<FindBikePageViewModel>().Error("Getting bikes failed. {Exception}", exception);
 
 					await ViewService.DisplayAlert(
-						AppResources.MessageTitleHint,
+						AppResources.ErrorSelectBikeTitle,
 						exception.Message,
 						AppResources.MessageAnswerOk);
 				}
@@ -271,8 +270,8 @@ namespace TINK.ViewModel.FindBike
 				if (selectedBike == null)
 				{
 					await ViewService.DisplayAlert(
-						AppResources.MessageTitleHint,
-						string.Format(AppResources.MessageErrorSelectBikeNoBikeFound, BikeIdUserInput),
+						AppResources.MessageHintTitle,
+						string.Format(AppResources.ErrorSelectBikeNoBikeFound, BikeIdUserInput),
 						AppResources.MessageAnswerOk);
 
 					ActionText = string.Empty;
@@ -311,7 +310,7 @@ namespace TINK.ViewModel.FindBike
 							if (permissionResult != Status.Granted)
 							{
 								var dialogResult = await ViewService.DisplayAlert(
-									AppResources.MessageTitleHint,
+									AppResources.MessageHintTitle,
 									AppResources.MessageBikesManagementLocationPermissionOpenDialog,
 									AppResources.MessageAnswerYes,
 									AppResources.MessageAnswerNo);
@@ -335,7 +334,7 @@ namespace TINK.ViewModel.FindBike
 						else
 						{
 								var dialogResult = await ViewService.DisplayAlert(
-									AppResources.MessageTitleHint,
+									AppResources.MessageHintTitle,
 									AppResources.MessageBikesManagementLocationPermissionOpenDialog,
 									AppResources.MessageAnswerYes,
 									AppResources.MessageAnswerNo);
@@ -361,7 +360,7 @@ namespace TINK.ViewModel.FindBike
 					if (GeolocationService.IsGeolcationEnabled == false)
 					{
 						await ViewService.DisplayAlert(
-							AppResources.MessageTitleHint,
+							AppResources.MessageHintTitle,
 							AppResources.MessageBikesManagementLocationActivation,
 							AppResources.MessageAnswerOk);
 
@@ -378,7 +377,7 @@ namespace TINK.ViewModel.FindBike
 					if (await BluetoothService.GetBluetoothState() != BluetoothState.On)
 					{
 						await ViewService.DisplayAlert(
-							AppResources.MessageTitleHint,
+							AppResources.MessageHintTitle,
 							AppResources.MessageBikesManagementBluetoothActivation,
 							AppResources.MessageAnswerOk);
 
@@ -419,7 +418,7 @@ namespace TINK.ViewModel.FindBike
 			catch (Exception exception)
 			{
 				await ViewService.DisplayAlert(
-					AppResources.MessageErrorSelectBikeTitle,
+					AppResources.ErrorSelectBikeTitle,
 					exception.Message,
 					AppResources.MessageAnswerOk);
 
@@ -506,6 +505,5 @@ namespace TINK.ViewModel.FindBike
 				}
 			}
 		}
-
 	}
 }
diff --git a/TINKLib/ViewModel/IPollingUpdateTaskManager.cs b/TINKLib/ViewModel/IPollingUpdateTaskManager.cs
index 7488759..6dc62d1 100644
--- a/TINKLib/ViewModel/IPollingUpdateTaskManager.cs
+++ b/TINKLib/ViewModel/IPollingUpdateTaskManager.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using TINK.Settings;
 
 namespace TINK.ViewModel
@@ -7,14 +7,14 @@ namespace TINK.ViewModel
 	{
 		/// <summary>
 		/// Invoked when page is shown. 
-		/// Actuates and awaits the first update process and starts a task wich actuate the subseqent update tasks.
+		/// Actuates and awaits the first update process and starts a task which actuate the subsequent update tasks.
 		/// </summary>
-		Task StartUpdateAyncPeridically(PollingParameters p_oPolling = null);
+		Task StartAsync(PollingParameters p_oPolling = null);
 
 		/// <summary>
 		/// Invoked when pages is closed/ hidden. 
 		/// Stops update process.
 		/// </summary>
-		Task StopUpdatePeridically();
+		Task StopAsync();
 	}
 }
diff --git a/TINKLib/ViewModel/IdlePollingUpdateTaskManager.cs b/TINKLib/ViewModel/IdlePollingUpdateTaskManager.cs
index e11b5c7..7807aa4 100644
--- a/TINKLib/ViewModel/IdlePollingUpdateTaskManager.cs
+++ b/TINKLib/ViewModel/IdlePollingUpdateTaskManager.cs
@@ -7,12 +7,12 @@ namespace TINK.ViewModel
 	/// <remarks> Object MapPage calls OnDisappearing for some reasons after first start after installation before OnAppearing. This requires a IdlePollingUpdateManager to exist.</remarks>
 	public class IdlePollingUpdateTaskManager : IPollingUpdateTaskManager
 	{
-		public async Task StartUpdateAyncPeridically(PollingParameters p_oPeriode)
+		public async Task StartAsync(PollingParameters p_oPeriode)
 		{
 			await Task.CompletedTask;
 		}
 
-		public async Task StopUpdatePeridically()
+		public async Task StopAsync()
 		{
 			await Task.CompletedTask;
 		}
diff --git a/TINKLib/ViewModel/Login/LoginPageViewModel.cs b/TINKLib/ViewModel/Login/LoginPageViewModel.cs
index b8e5eb2..2aee29b 100644
--- a/TINKLib/ViewModel/Login/LoginPageViewModel.cs
+++ b/TINKLib/ViewModel/Login/LoginPageViewModel.cs
@@ -223,8 +223,8 @@ namespace TINK.ViewModel
 			else
 			{
 				await m_oViewService.DisplayAlert(
-					AppResources.MessageTitleHint,
-					AppResources.MessageLoginRegisterNoNet,
+					AppResources.MessageHintTitle,
+					AppResources.ErrorNoWeb,
 					AppResources.MessageAnswerOk);
 			}
 		});
@@ -239,8 +239,8 @@ namespace TINK.ViewModel
 			else
 			{
 				await m_oViewService.DisplayAlert(
-					AppResources.MessageTitleHint,
-					AppResources.MessageLoginRecoverPassword,
+					AppResources.MessageHintTitle,
+					AppResources.ErrorNoWeb,
 					AppResources.MessageAnswerOk);
 			}
 		});
@@ -290,7 +290,7 @@ namespace TINK.ViewModel
 					Log.ForContext<LoginPageViewModel>().Error("Login failed (invalid. auth. response). {@l_oException}.", l_oException);
 
 					await m_oViewService.DisplayAlert(
-						AppResources.MessageLoginErrorTitle,
+						AppResources.ErrorLoginTitle,
 						l_oException.Message,
 						AppResources.MessageAnswerOk);
 
@@ -301,7 +301,7 @@ namespace TINK.ViewModel
 				catch (UnsupportedCopriVersionDetectedException)
 				{
 					await m_oViewService.DisplayAlert(
-						AppResources.MessageLoginErrorTitle,
+						AppResources.ErrorLoginTitle,
 						 string.Format(
 							 AppResources.MessageAppVersionIsOutdated,
 							 TinkApp.Flavor.GetDisplayName()),
@@ -319,8 +319,8 @@ namespace TINK.ViewModel
 						Log.ForContext<LoginPageViewModel>().Information("Login failed (web communication exception). {@l_oException}.", l_oException);
 
 						await m_oViewService.DisplayAlert(
-							AppResources.MessageLoginConnectionErrorTitle,
-							string.Format("{0}\r\n{1}", l_oException.Message, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+							AppResources.ErrorNoConnectionTitle,
+							AppResources.ErrorNoWeb,
 							AppResources.MessageAnswerOk);
 					}
 					else if (l_oException is UsernamePasswordInvalidException)
@@ -328,15 +328,15 @@ namespace TINK.ViewModel
 						// Cookie is empty.
 						Log.ForContext<LoginPageViewModel>().Error("Login failed (empty cookie). {@l_oException}.", l_oException);
 						await m_oViewService.DisplayAlert(
-							AppResources.MessageLoginErrorTitle,
-							string.Format(AppResources.MessageLoginConnectionErrorMessage, l_oException.Message),
+							AppResources.ErrorLoginTitle,
+							string.Format(AppResources.ErrorLoginNoCookie, l_oException.Message),
 							"OK");
 					}
 					else
 					{
 						Log.ForContext<LoginPageViewModel>().Error("Login failed. {@l_oException}.", l_oException);
 						await m_oViewService.DisplayAlert(
-							AppResources.MessageLoginErrorTitle,
+							AppResources.ErrorLoginTitle,
 							l_oException.Message,
 							AppResources.MessageAnswerOk);
 					}
diff --git a/TINKLib/ViewModel/Map/MapPageViewModel.cs b/TINKLib/ViewModel/Map/MapPageViewModel.cs
index b076138..4f81da5 100644
--- a/TINKLib/ViewModel/Map/MapPageViewModel.cs
+++ b/TINKLib/ViewModel/Map/MapPageViewModel.cs
@@ -377,7 +377,7 @@ namespace TINK.ViewModel.Map
 					{
 						// Show COPRI message once. 
 						await ViewService.DisplayAlert(
-							AppResources.MessageTitleInformation,
+							AppResources.MessageInformationTitle,
 							resultStationsAndBikes.GeneralData.MerchantMessage,
 							AppResources.MessageAnswerOk);
 					}, null);
@@ -442,7 +442,7 @@ namespace TINK.ViewModel.Map
 				try
 				{
 					// Update bikes at station or my bikes depending on context.
-					await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling);
+					await m_oViewUpdateManager.StartAsync(Polling);
 				}
 				catch (Exception)
 				{
@@ -463,9 +463,9 @@ namespace TINK.ViewModel.Map
 				IsNavBarVisible = true;
 
 				await ViewService.DisplayAlert(
-					"Fehler",
-					$"Beim Anzeigen der Fahrradstandorte- Seite ist ein Fehler aufgetreten.\r\n{l_oException.Message}",
-					"OK");
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{l_oException.Message}",
+					AppResources.MessageAnswerOk);
 
 				IsMapPageEnabled = true;
 			}
@@ -512,7 +512,7 @@ namespace TINK.ViewModel.Map
 				// COPRI reports an auth cookie error.
 				await ViewService.DisplayAlert(
 					AppResources.MessageWaring,
-					AppResources.MessageMapPageErrorAuthcookieUndefined,
+					AppResources.ErrorMapPageAuthcookieUndefined,
 					AppResources.MessageAnswerOk);
 
 				IsConnected = TinkApp.GetIsConnected();
@@ -607,8 +607,8 @@ namespace TINK.ViewModel.Map
 				&& status != Status.Granted)
 			{
 				var dialogResult = await ViewService.DisplayAlert(
-					AppResources.MessageTitleHint,
-					AppResources.MessageCenterMapLocationPermissionOpenDialog,
+					AppResources.MessageHintTitle,
+					AppResources.ErrorMapCenterNoLocationPermissionOpenDialog,
 					AppResources.MessageAnswerYes,
 					AppResources.MessageAnswerNo);
 
@@ -727,7 +727,7 @@ namespace TINK.ViewModel.Map
 		{
 			Log.Information("Map page is disappearing...");
 
-			await m_oViewUpdateManager.StopUpdatePeridically();
+			await m_oViewUpdateManager.StopAsync();
 		}
 
 		/// <summary> User clicked on a bike. </summary>
@@ -764,9 +764,9 @@ namespace TINK.ViewModel.Map
 
 				Log.ForContext<MapPageViewModel>().Error("Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {Exception}", exception);
 				await ViewService.DisplayAlert(
-					 "Fehler",
-					 $"Fehler beim Öffnen der Ansicht \"Fahrräder an Station\" aufgetreten. {exception.Message}",
-					 "OK");
+					 AppResources.ErrorPageNotLoadedTitle,
+					 $"{AppResources.ErrorPageNotLoaded}\r\n {exception.Message}",
+					 AppResources.MessageAnswerOk);
 			}
 #endif
 		}
@@ -931,15 +931,11 @@ namespace TINK.ViewModel.Map
 		{
 			get
 			{
-				if (Exception != null)
-				{
-					// An error occurred getting data from copri.
-					return Exception.GetShortErrorInfoText(TinkApp.IsReportLevelVerbose);
-				}
-				if (!IsConnected)
-				{
-					return AppResources.ActivityTextConnectionStateOffline;
-				}
+				//if (Exception != null)
+				//{
+				//	// An error occurred getting data from copri.
+				//	return Exception.GetShortErrorInfoText(TinkApp.IsReportLevelVerbose);
+				//}
 
 				return ActionText ?? string.Empty;
 			}
@@ -968,9 +964,9 @@ namespace TINK.ViewModel.Map
 
 				Log.ForContext<MapPageViewModel>().Error("Fehler beim Öffnen der Ansicht \"Meine Räder\" aufgetreten. {Exception}", exception);
 				await ViewService.DisplayAlert(
-					 "Fehler",
-					 $"Fehler beim Öffnen der Ansicht \"Meine Räder\" aufgetreten. {exception.Message}",
-					 "OK");
+					 AppResources.ErrorPageNotLoadedTitle,
+					 $"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					 AppResources.MessageAnswerOk);
 			}
 		});
 
@@ -1023,7 +1019,7 @@ namespace TINK.ViewModel.Map
 
 				// Stop polling.
 				ActionText = AppResources.ActivityTextOneMomentPlease;
-				await m_oViewUpdateManager.StopUpdatePeridically();
+				await m_oViewUpdateManager.StopAsync();
 
 				// Clear error info.
 				Exception = null;
@@ -1063,7 +1059,7 @@ namespace TINK.ViewModel.Map
 				try
 				{
 					// Update bikes at station or my bikes depending on context.
-					await m_oViewUpdateManager.StartUpdateAyncPeridically(Polling);
+					await m_oViewUpdateManager.StartAsync(Polling);
 				}
 				catch (Exception)
 				{
@@ -1084,9 +1080,9 @@ namespace TINK.ViewModel.Map
 				IsNavBarVisible = true;
 
 				await ViewService.DisplayAlert(
-					"Fehler",
-					AppResources.MessageMapPageErrorSwitch,
-					String.Format(AppResources.MessageMapPageErrorSwitch, l_oException.Message),
+					AppResources.ErrorPageNotLoadedTitle,
+					AppResources.ErrorMapPageSwitchBikeType,
+					String.Format(AppResources.ErrorMapPageSwitchBikeType, l_oException.Message),
 					AppResources.MessageAnswerOk);
 
 				IsMapPageEnabled = true;
diff --git a/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs b/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs
index d1b75a8..d093196 100644
--- a/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs
+++ b/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs
@@ -142,8 +142,8 @@ namespace TINK.ViewModel.MiniSurvey
 				}
 
 				await ViewService.DisplayAlert(
-					AppResources.ErrorReturnSubmitFeedbackTitle,
-					AppResources.ErrorReturnSubmitFeedbackMessage,
+					AppResources.ErrorSubmitFeedbackTitle,
+					AppResources.ErrorNoWeb,
 					AppResources.MessageAnswerOk);
 			}
 
diff --git a/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs b/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs
index e04efe1..c96095c 100644
--- a/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs
+++ b/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs
@@ -139,7 +139,7 @@ namespace TINK.ViewModel.MyBikes
 			ActionText = AppResources.ActivityTextMyBikesLoadingBikes;
 
 			// Stop polling before getting bikes info.
-			await m_oViewUpdateManager.StopUpdatePeridically();
+			await m_oViewUpdateManager.StopAsync();
 
 			var bikesOccupied = await ConnectorFactory(IsConnected).Query.GetBikesOccupiedAsync();
 
@@ -171,7 +171,7 @@ namespace TINK.ViewModel.MyBikes
 					if (permissionResult != Status.Granted)
 					{
 						var dialogResult = await ViewService.DisplayAlert(
-							AppResources.MessageTitleHint,
+							AppResources.MessageHintTitle,
 							AppResources.MessageBikesManagementLocationPermissionOpenDialog,
 							AppResources.MessageAnswerYes,
 							AppResources.MessageAnswerNo);
@@ -197,7 +197,7 @@ namespace TINK.ViewModel.MyBikes
 				if (GeolocationService.IsGeolcationEnabled == false)
 				{
 					await ViewService.DisplayAlert(
-						AppResources.MessageTitleHint,
+						AppResources.MessageHintTitle,
 						AppResources.MessageBikesManagementLocationActivation,
 						AppResources.MessageAnswerOk);
 
@@ -214,7 +214,7 @@ namespace TINK.ViewModel.MyBikes
 				if (await BluetoothService.GetBluetoothState() != BluetoothState.On)
 				{
 					await ViewService.DisplayAlert(
-						AppResources.MessageTitleHint,
+						AppResources.MessageHintTitle,
 						AppResources.MessageBikesManagementBluetoothActivation,
 						AppResources.MessageAnswerOk);
 
diff --git a/TINKLib/ViewModel/PollingUpdateTaskManager.cs b/TINKLib/ViewModel/PollingUpdateTaskManager.cs
index ab8887f..3abef39 100644
--- a/TINKLib/ViewModel/PollingUpdateTaskManager.cs
+++ b/TINKLib/ViewModel/PollingUpdateTaskManager.cs
@@ -40,7 +40,7 @@ namespace TINK.ViewModel
 		/// Actuates and awaits the first update process and starts a task wich actuate the subseqent update tasks.
 		/// </summary>
 		/// <param name="pollingParameters">Parametes holding polling period, if null last parameters are used if available.</param>
-		public async Task StartUpdateAyncPeridically(PollingParameters pollingParameters = null)
+		public async Task StartAsync(PollingParameters pollingParameters = null)
 		{
 			if (UpdateTask != null)
 			{
@@ -81,7 +81,7 @@ namespace TINK.ViewModel
 		/// Invoked when pages is closed/ hidden. 
 		/// Stops update process.
 		/// </summary>
-		public async Task StopUpdatePeridically()
+		public async Task StopAsync()
 		{
 			if (UpdateTask == null)
 			{
diff --git a/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs b/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
index f64839e..bcaba4c 100644
--- a/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
+++ b/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
@@ -319,16 +319,16 @@ namespace TINK.ViewModel
 
 				TinkApp.UpdateConnector();
 
-				await m_oViewUpdateManager.StopUpdatePeridically();
+				await m_oViewUpdateManager.StopAsync();
 
 				Log.ForContext<SettingsPageViewModel>().Information($"{nameof(OnDisappearing)} done.");
 			}
 			catch (Exception l_oException)
 			{
 				await m_oViewService.DisplayAlert(
-					"Fehler",
-					$"Ein unerwarteter Fehler ist aufgetreten. \r\n{l_oException.Message}",
-					"OK");
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{l_oException.Message}",
+					AppResources.MessageAnswerOk);
 			}
 		}
 
diff --git a/TINKLib/ViewModel/ViewModelHelper.cs b/TINKLib/ViewModel/ViewModelHelper.cs
index fe6d7e1..d197920 100644
--- a/TINKLib/ViewModel/ViewModelHelper.cs
+++ b/TINKLib/ViewModel/ViewModelHelper.cs
@@ -204,7 +204,7 @@ namespace TINK.ViewModel
 
 				l_oError = new FormattedString();
 				l_oError.Spans.Add(new Span { Text = "Information!\r\n", FontAttributes = FontAttributes.Bold });
-				l_oError.Spans.Add(new Span { Text = $"{exception.Message}\r\n{WebConnectFailureException.GetHintToPossibleExceptionsReasons}" });
+				l_oError.Spans.Add(new Span { Text = $"{exception.Message}\r\n{AppResources.ErrorNoWeb}" });
 				return l_oError;
 
 			}
diff --git a/TestFramework/Repository/CopriCallsCacheMemory.cs b/TestFramework/Repository/CopriCallsCacheMemory.cs
index cdd0fa7..35a3f69 100644
--- a/TestFramework/Repository/CopriCallsCacheMemory.cs
+++ b/TestFramework/Repository/CopriCallsCacheMemory.cs
@@ -5,6 +5,7 @@ using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.Services.CopriApi;
+using TINK.MultilingualResources;
 using TINK.Repository;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
@@ -111,7 +112,7 @@ namespace TestFramework.Repository
 		public Task<DoReturnResponse> ReturnAndStartClosingAsync(
 			string bikeId,
 			Uri operatorUri)
-			=> throw new Exception("Rückgabe mit mit Schloss schließen Befehl Offlinemodus nicht möglich!");
+			=> throw new System.Exception(AppResources.ErrorNoWeb);
 
 		public Task<SubmitFeedbackResponse> DoSubmitFeedback(string bikeId, int? currentChargeBars, string message, bool isBikeBroken, Uri operatorUri)
 			=> throw new NotImplementedException();
diff --git a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockIt.cs b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockIt.cs
index 72a3718..c0dec86 100644
--- a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockIt.cs
+++ b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockIt.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using NSubstitute;
@@ -161,6 +161,45 @@ namespace TestTINKLib.Fixtures.ObjectTests.Settings.BluetoothLock
 			Assert.That((await lockIt.GetLockStateAsync()).State, Is.EqualTo(LockitLockingState.Closed));
 		}
 
+		[Test]
+		public async Task TestAuthenticate_GetLockState_UndefinedState()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var lockControl = Substitute.For<IService>();
+			var state = Substitute.For<ICharacteristic>();
+
+			var authInfo = new LockInfoAuthTdo.Builder
+			{
+				K_seed = new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2 },
+				K_u = new byte[] { 1 }
+			}.Build();
+
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(lockControl));
+			lockControl.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("00000000-0000-0000-0000-000000000001"));
+			// Calls related to get lock state.
+
+			// Call authenticate to invalidate seed
+			lockControl.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(state));
+			state.ReadAsync(Arg.Any<CancellationToken>()).Returns(new byte[] { 99 }); // This value should never be returned from ILockit.
+
+			var lockIt = LockItEventBased.Authenticate(device, authInfo, adapter, cipher).Result;
+
+			Assert.That((await lockIt.GetLockStateAsync()).State, Is.Null);
+		}
+
 		[Test]
 		public void TestAuthenticate_GetLockState_GetStateCharacteristicThrowsException()
 		{
diff --git a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItEventBased.cs b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItEventBased.cs
index 66f7280..9c21b86 100644
--- a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItEventBased.cs
+++ b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItEventBased.cs
@@ -12,7 +12,7 @@ using DeviceState = Plugin.BLE.Abstractions.DeviceState;
 
 namespace TestLockItBLE
 {
-	public class Tests
+	public class TestLockItEventBased
 	{
 		[Test]
 		public void TestOpen()
@@ -111,7 +111,7 @@ namespace TestLockItBLE
 		}
 
 		[Test]
-		public void TestOpen_ThrowsCouldntOpenBoldBlockedException()
+		public void TestOpen_ThrowsCouldntOpenBoltBlockedException()
 		{
 			var device = Substitute.For<IDevice>();
 			var adapter = Substitute.For<IAdapter>();
@@ -147,7 +147,7 @@ namespace TestLockItBLE
 			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 1 /* closed */}), Task.FromResult(new byte[] { 4 /* bold blocked */ }));
 			lockControl.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
 			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-			stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.CouldntOpenBoldBlocked /* State passed as event argument after opening. */});
+			stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.CouldntOpenBoltBlocked /* State passed as event argument after opening. */});
 
 			var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
 
@@ -261,7 +261,7 @@ namespace TestLockItBLE
 		}
 
 		[Test]
-		public void TestClose_ThrowsCouldntCloseBoldBlockedException()
+		public void TestClose_ThrowsCouldntCloseBoltBlockedException()
 		{
 			var device = Substitute.For<IDevice>();
 			var adapter = Substitute.For<IAdapter>();
@@ -298,7 +298,7 @@ namespace TestLockItBLE
 		}));
 			lockControl.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
 			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
-			stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.CouldntCloseBoldBlocked /* State passed as event argument after opening. */});
+			stateCharacteristic.Value.Returns(new byte[] { (byte)LockitLockingState.CouldntCloseBoltBlocked /* State passed as event argument after opening. */});
 
 			// Use factory to create LockIt-object.
 			var lockIt = LockItEventBased.Authenticate(device, authTdo, adapter, cipher).Result;
@@ -310,7 +310,7 @@ namespace TestLockItBLE
 				controlCharacteristic.ValueUpdated += Raise.EventWith(new object(), new CharacteristicUpdatedEventArgs(stateCharacteristic));
 				await lockState;
 			},
-			Throws.InstanceOf<CouldntCloseBoldBlockedException>());
+			Throws.InstanceOf<CouldntCloseBoltBlockedException>());
 		}
 	}
 }
diff --git a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItPolling.cs b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItPolling.cs
index ca12f6b..5ba5cb7 100644
--- a/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItPolling.cs
+++ b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockItPolling.cs
@@ -1,9 +1,10 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using NSubstitute;
 using NUnit.Framework;
 using Plugin.BLE.Abstractions.Contracts;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Services.BluetoothLock.BLE;
 using TINK.Services.BluetoothLock.Exception;
 using TINK.Services.BluetoothLock.Tdo;
@@ -99,7 +100,7 @@ namespace TestLockItBLE.Services.BluetoothLock.BLE
 		}
 
 		[Test]
-		public void TestOpen_ThrowsCouldntOpenBoldBlockedException()
+		public void TestOpen_ThrowsCouldntOpenBoltBlockedException()
 		{
 			var device = Substitute.For<IDevice>();
 			var adapter = Substitute.For<IAdapter>();
@@ -183,7 +184,7 @@ namespace TestLockItBLE.Services.BluetoothLock.BLE
 		}
 
 		[Test]
-		public void TestClose_ThrowsCouldntOpenInconsistentStateExecption()
+		public void TestClose_ThrowsCouldntCloseInconsistentStateExecption()
 		{
 			var device = Substitute.For<IDevice>();
 			var adapter = Substitute.For<IAdapter>();
@@ -225,7 +226,51 @@ namespace TestLockItBLE.Services.BluetoothLock.BLE
 		}
 
 		[Test]
-		public void TestClose_ThrowsCouldntOpenBoldBlockedException()
+		public async Task TestClose_ThrowsCouldntCloseInconsistentStateExecptionUnknownState()
+		{
+			var device = Substitute.For<IDevice>();
+			var adapter = Substitute.For<IAdapter>();
+			var cipher = Substitute.For<TINK.Model.Device.ICipher>();
+			var auth = Substitute.For<ICharacteristic>();
+			var controlService = Substitute.For<IService>();
+			var controlCharacteristic = Substitute.For<ICharacteristic>();
+			var activateLock = Substitute.For<ICharacteristic>();
+
+			var authTdo = new LockInfoAuthTdo.Builder
+			{
+				Id = 12,
+				K_seed = new byte[] { (byte)'7', (byte)'q', (byte)'3', (byte)'9', (byte)'i', (byte)'6', (byte)'c', (byte)'g', (byte)'9', (byte)'L', (byte)'V', (byte)'7', (byte)'T', (byte)'G', (byte)'l', (byte)'g' },
+				K_u = new byte[16]
+			}.Build();
+
+			// Calls related to Authenticate functionality.
+			device.State.Returns(DeviceState.Connected);
+			device.Id.Returns(new Guid("0000f00d-1212-efde-1523-785fef13d123"));
+			device.GetServiceAsync(Arg.Any<Guid>(), Arg.Any<CancellationToken>()).Returns(Task.FromResult(controlService));
+			controlService.GetCharacteristicAsync(new Guid("0000baab-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(auth));
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+			auth.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[8]));
+			cipher.Decrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[3]);
+			cipher.Encrypt(Arg.Any<byte[]>(), Arg.Any<byte[]>()).Returns(new byte[16]);
+			auth.WriteAsync(Arg.Any<byte[]>()).Returns(true);
+
+			device.Name.Returns("ISHAREIT+123");
+
+			// Calls related to close functionality.
+			controlService.GetCharacteristicAsync(new Guid("0000baaa-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(controlCharacteristic));
+			controlCharacteristic.ReadAsync(Arg.Any<CancellationToken>()).Returns(Task.FromResult(new byte[] { 99 /* lock should never return this exception */}));
+			controlService.GetCharacteristicAsync(new Guid("0000beee-1212-efde-1523-785fef13d123")).Returns(Task.FromResult(activateLock));
+			activateLock.WriteAsync(Arg.Any<byte[]>()).Returns(Task.FromResult(true));
+
+			// Use factory to create LockIt-object.
+			var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
+			Assert.That(
+				(await lockIt.CloseAsync()),
+				Is.Null);
+		}
+
+		[Test]
+		public void TestClose_ThrowsCouldntCloseBoltBlockedException()
 		{
 			var device = Substitute.For<IDevice>();
 			var adapter = Substitute.For<IAdapter>();
@@ -264,7 +309,7 @@ namespace TestLockItBLE.Services.BluetoothLock.BLE
 
 			// Use factory to create LockIt-object.
 			var lockIt = LockItPolling.Authenticate(device, authTdo, adapter, cipher).Result;
-			Assert.That(async () => { var result = await lockIt.CloseAsync(); }, Throws.InstanceOf<CouldntCloseBoldBlockedException>());
+			Assert.That(async () => { var result = await lockIt.CloseAsync(); }, Throws.InstanceOf<CouldntCloseBoltBlockedException>());
 		}
 	}
 }
diff --git a/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntCloseInconsistentStateExecption.cs b/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntCloseInconsistentStateExecption.cs
index d2e279b..7443697 100644
--- a/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntCloseInconsistentStateExecption.cs
+++ b/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntCloseInconsistentStateExecption.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 
 namespace TINK.Services.BluetoothLock.Exception
@@ -13,7 +13,7 @@ namespace TINK.Services.BluetoothLock.Exception
 
 			Assert.That(
 				ex.Message,
-				Is.EqualTo("Lock reports unknown bold position."));
+				Is.EqualTo("Lock reports unknown bold position. Lock could be closed or open. Please try again or contact customer support."));
 		}
 
 		[Test]
diff --git a/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntOpenInconsistentStateExecption.cs b/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntOpenInconsistentStateExecption.cs
index 22e36a3..96c90ba 100644
--- a/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntOpenInconsistentStateExecption.cs
+++ b/TestLockItShared/Services/BluetoothLock/Exception/TestCouldntOpenInconsistentStateExecption.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 
 namespace TINK.Services.BluetoothLock.Exception
@@ -13,7 +13,7 @@ namespace TINK.Services.BluetoothLock.Exception
 
 			Assert.That(
 				ex.Message,
-				Is.EqualTo("Unexpected locking state \"UnknownFromHardwareError\" detected after sending open command."));
+				Is.EqualTo("Unexpected locking state \"UnknownFromHardwareError\" detected after sending open command. Please try again or contact customer support."));
 		}
 
 		[Test]
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/TestCloseCommand.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/TestCloseCommand.cs
new file mode 100644
index 0000000..1b63e94
--- /dev/null
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/TestCloseCommand.cs
@@ -0,0 +1,491 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using NSubstitute;
+using NUnit.Framework;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
+using TINK.Model.State;
+using TINK.Repository.Request;
+using TINK.Services.BluetoothLock;
+using TINK.Services.BluetoothLock.Tdo;
+using TINK.Services.Geolocation;
+using Geolocation = TINK.Services.Geolocation.Geolocation;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.CloseCommand;
+using NSubstitute.ExceptionExtensions;
+using TINK.Services.BluetoothLock.Exception;
+using TINK.Repository.Exception;
+using Newtonsoft.Json;
+using TINK.Repository.Response;
+using TINK.ViewModel;
+
+namespace TestShareeLib.Model.Bikes.BikeInfoNS.BluetoothLock.Command
+{
+	[TestFixture]
+	public class TestCloseCommand
+	{
+		[Test]
+		public async Task TestCloseGeolocationServiceGetAsyncFails()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			var startOfTest = DateTime.Now;
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Throws(new Exception("Ups no location..."));
+
+			locks[0].CloseAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			await InvokeAsync<TestCloseCommand>(
+				bike,
+				geolocation,
+				locks,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				listener, null);
+
+			// Verify that location is kept because bike might be returned later.
+			Assert.That(
+				bike.LockInfo.Location,
+				Is.Null);
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				await listener.Received().ReportStateAsync(State.StartGeolocationException, "Ups no location...");
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				await connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+			});
+		}
+
+		/// <summary>
+		/// Use case: Close lock
+		/// </summary>
+		[Test]
+		public async Task TestClose()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Returns(new Geolocation.Builder { Latitude = 47.99, Longitude = 7.78 }.Build());
+
+			locks[0].CloseAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			await InvokeAsync<TestCloseCommand>(
+				bike,
+				geolocation,
+				locks,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				listener, null);
+
+			// Verify that location is kept because bike might be returned later.
+			Assert.That(
+				bike.LockInfo.Location.Latitude,
+				Is.EqualTo(47.99).Within(0.001));
+			Assert.That(
+				bike.LockInfo.Location.Longitude,
+				Is.EqualTo(7.78).Within(0.001));
+
+			Assert.That(
+				bike.LockInfo.State,
+				Is.EqualTo(LockingState.Closed));
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				listener.Received().ReportStep(Step.WaitStopPollingQueryLocation);
+				listener.Received().ReportStep(Step.QueryLocationTerminated);
+				await connector.Command.UpdateLockingStateAsync(bike, Arg.Is<LocationDto>(x => x.Latitude == 47.99 && x.Longitude == 7.78));
+			});
+		}
+
+		[Test]
+		public void TestCloseCloseFailsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Returns(new Geolocation.Builder { Latitude = 47.99, Longitude = 7.78 }.Build());
+
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			Assert.That(
+				async () => await InvokeAsync<TestCloseCommand>(
+					bike,
+					geolocation,
+					locks,
+					() => true, // isConnectedDelegate
+					(isConnexted) => connector,
+					listener, null),
+				Throws.InstanceOf<OutOfReachException>());
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				await listener.Received().ReportStateAsync(State.OutOfReachError, "Exception of type 'TINK.Services.BluetoothLock.Exception.OutOfReachException' was thrown.");
+			});
+
+			Assert.That(
+				bike.LockInfo.State,
+				Is.EqualTo(LockingState.UnknownDisconnected));
+		}
+
+		[Test]
+		public void TestCloseCloseFailsCouldntCloseMovingException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Returns(new Geolocation.Builder { Latitude = 47.99, Longitude = 7.78 }.Build());
+
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntCloseMovingException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			Assert.That(
+				async () => await InvokeAsync<TestCloseCommand>(
+					bike, geolocation, locks, () => true, (isConnexted) => connector, listener, null),
+				Throws.InstanceOf<CouldntCloseMovingException>());
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				await listener.Received().ReportStateAsync(State.CouldntCloseMovingError, "The process is motion sensitive. Step close to the lock, do not move, and try again.");
+				await connector.Command.UpdateLockingStateAsync(bike, Arg.Is<LocationDto>(x => x.Latitude == 47.99 && x.Longitude == 7.78));
+			});
+
+			Assert.That(
+				bike.LockInfo.State,
+				Is.EqualTo(LockingState.Open));
+		}
+
+		[Test]
+		public void TestCloseCloseFailsCouldntCloseBoltBlockedException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Returns(new Geolocation.Builder { Latitude = 47.99, Longitude = 7.78 }.Build());
+
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntCloseBoltBlockedException());
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			Assert.That(
+				async () => await InvokeAsync<TestCloseCommand>(bike, geolocation, locks, () => true, (isConnexted) => connector, listener, null),
+				Throws.InstanceOf<CouldntCloseBoltBlockedException>());
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				await listener.Received().ReportStateAsync(State.CouldntCloseBoltBlockedError, "Lock bolt is blocked. Make sure that no spoke or any other obstacle prevents the lock from closing and try again.");
+				await connector.Command.UpdateLockingStateAsync(bike, Arg.Is<LocationDto>(x => x.Latitude == 47.99 && x.Longitude == 7.78));
+			});
+
+			Assert.That(
+				bike.LockInfo.State,
+				Is.EqualTo(LockingState.UnknownFromHardwareError));
+		}
+
+		[Test]
+		public void TestCloseCloseFailsCouldntCloseBoltBlockedExceptionOpen()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Returns(new Geolocation.Builder { Latitude = 47.99, Longitude = 7.78 }.Build());
+
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntCloseBoltBlockedException(LockingState.Open));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			Assert.That(
+				async () => await InvokeAsync<TestCloseCommand>(bike, geolocation, locks, () => true, (isConnexted) => connector, listener, null),
+				Throws.InstanceOf<CouldntCloseBoltBlockedException>());
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				await listener.Received().ReportStateAsync(State.CouldntCloseBoltBlockedError, "Lock bolt is blocked. Make sure that no spoke or any other obstacle prevents the lock from closing and try again.");
+				await connector.Command.UpdateLockingStateAsync(bike, Arg.Is<LocationDto>(x => x.Latitude == 47.99 && x.Longitude == 7.78));
+			});
+
+			Assert.That(
+				bike.LockInfo.State,
+				Is.EqualTo(LockingState.Open));
+		}
+
+		[Test]
+		public void TestCloseCloseFailsCouldntCloseInconsistentState()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Returns(new Geolocation.Builder { Latitude = 47.99, Longitude = 7.78 }.Build());
+
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntCloseInconsistentStateExecption(LockitLockingState.Unknown.GetLockingState()));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
+
+			Assert.That(
+				async () => await InvokeAsync<TestCloseCommand>(bike, geolocation, locks, () => true, (isConnexted) => connector, listener, null),
+				Throws.InstanceOf<CouldntCloseInconsistentStateExecption>());
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				await listener.Received().ReportStateAsync(State.GeneralCloseError, "Lock reports unknown bold position. Lock could be closed or open. Please try again or contact customer support.");
+				await connector.Command.UpdateLockingStateAsync(bike, Arg.Is<LocationDto>(x => x.Latitude == 47.99 && x.Longitude == 7.78));
+			});
+
+			Assert.That(
+				bike.LockInfo.State,
+				Is.EqualTo(LockingState.UnknownFromHardwareError));
+		}
+
+		[Test]
+		public void TestCloseCloseFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Returns(new Geolocation.Builder { Latitude = 47.99, Longitude = 7.78 }.Build());
+
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+
+			Assert.That(
+				async () => await InvokeAsync<TestCloseCommand>(bike, geolocation, locks, () => true, (isConnexted) => connector, listener, null),
+				Throws.InstanceOf<Exception>());
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				await listener.ReportStateAsync(State.GeneralCloseError, "Exception message.");
+				await connector.Command.UpdateLockingStateAsync(bike, Arg.Is<LocationDto>(x => x.Latitude == 47.99 && x.Longitude == 7.78));
+			});
+
+			Assert.That(
+				bike.LockInfo.State,
+				Is.EqualTo(LockingState.UnknownDisconnected));
+		}
+
+		[Test]
+		public async Task TestCloseWaitGeolocationServiceGetAsyncFails()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Returns(Task.FromException<IGeolocation>(new Exception("Ups, some error...")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			await InvokeAsync<TestCloseCommand>(bike, geolocation, locks, () => true, (isConnexted) => connector, listener, null);
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				listener.Received().ReportStep(Step.WaitStopPollingQueryLocation);
+				await listener.Received().ReportStateAsync(State.WaitGeolocationException, "Ups, some error...");
+				listener.Received().ReportStep(Step.QueryLocationTerminated);
+				await connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+			});
+		}
+
+
+		[Test]
+		public async Task TestCloseUpdateLockingStateFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new WebConnectFailureException("Context info.", new System.Exception("hoppla")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			await InvokeAsync<TestCloseCommand>(bike, geolocation, locks, () => true, (isConnexted) => connector, listener, null);
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				await connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				await listener.ReportStateAsync(State.WebConnectFailed, "Context info.");
+			});
+		}
+
+		[Test]
+		public async Task TestCloseUpdateLockingStateFailsResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
+				throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			await InvokeAsync<TestCloseCommand>(bike, geolocation, locks, () => true, (isConnexted) => connector, listener, null);
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				await connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				await listener.ReportStateAsync(State.ResponseIsInvalid, "Outer message.");
+			});
+		}
+
+
+		[Test]
+		public async Task TestCloseUpdateLockingStateFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<ICloseCommandListener>();
+			var viewUpdateManager = Substitute.For<IPollingUpdateTaskManager>();
+
+			locks[0].CloseAsync()
+				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			await InvokeAsync<TestCloseCommand>(bike, geolocation, locks, () => true, (isConnexted) => connector, listener, null);
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.Received().ReportStep(Step.StartingQueryingLocation);
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				listener.Received().ReportStep(Step.ClosingLock);
+				await locks.Received()[0].CloseAsync(); // Lock must be closed
+				await connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+				await listener.ReportStateAsync(State.BackendUpdateFailed, "Exception message.");
+			});
+		}
+	}
+}
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/TestGetBikeLocationCommand.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/TestGetBikeLocationCommand.cs
new file mode 100644
index 0000000..fb15576
--- /dev/null
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/Command/TestGetBikeLocationCommand.cs
@@ -0,0 +1,203 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using NSubstitute;
+using NSubstitute.ExceptionExtensions;
+using NUnit.Framework;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command;
+using TINK.Model.Connector;
+using TINK.Model.Device;
+using TINK.Model.State;
+using TINK.Model.User;
+using TINK.Services.BluetoothLock;
+using TINK.Services.Geolocation;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand;
+
+namespace TestShareeLib.Model.Bikes.BikeInfoNS.BluetoothLock.Command
+{
+	public class TestGetBikeLocationCommand
+	{
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Booked, lock state unknown.
+		/// </summary>
+		/// <remarks> Replaces test TestReturnOutOfReach which was removed for sharee.bike version ~3.0.362. </remarks>
+		[Test]
+		public void TestReturnLastGeolocatonNullLockOutOfReach()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<IGetLockedLocationCommandListener>();
+
+			bike.Id.Returns("0");
+
+			bike.LockInfo.Location.Returns((IGeolocation)null); // When locking bike geolocation was not available.
+
+			locks[0].GetDeviceState().Returns(DeviceState.Disconnected); // Simulate bike out of reach.
+
+			locks.DisconnectAsync(0, Arg.Any<Guid>()).Returns(LockingState.UnknownDisconnected); // Simulate disconnecting.
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			Assert.That(
+				async () => await InvokeAsync<TestGetBikeLocationCommand>(
+					bike,
+					geolocation,
+					locks,
+					listener: listener),
+				Throws.TypeOf<Exception>());
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				listener.ReportStep(Step.StartingQueryLocation);
+				var location = bike.LockInfo.Location;
+				locks[0].GetDeviceState();
+				listener.ReportStateAsync(State.DisconnetedNoLocationError, "");
+				listener.ReportStep(Step.DisconnectingLockOnDisconnectedNoLocationError);
+				locks.DisconnectAsync(0, Arg.Any<Guid>());
+				listener.ReportStateAsync(State.QueryLocationSucceeded, "");
+			});
+
+			Assert.That(
+				bike.LockInfo.State,
+				Is.EqualTo(LockingState.UnknownDisconnected));
+		}
+
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Booked, lock state unknown.
+		/// </summary>
+		/// <remarks>Replaces test TestReturnLockInReachNoGeolocation which was removed for sharee.bike older ~ 3.0.362.</remarks>
+		[Test]
+		public void TestReturnStartGetGeolocationException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<IGetLockedLocationCommandListener>();
+
+			bike.Id.Returns("0");
+
+			bike.LockInfo.Location.Returns((IGeolocation)null); // When locking bike geolocation was not available.
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach.
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Throws(new Exception("Ups...")); // Simulate error when starting query for geolocation.
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state does not change.
+
+			bike.LockInfo.State.Returns(LockingState.Closed);   // Locking state does not change.
+
+			var subsequent = InvokeAsync<TestGetBikeLocationCommand>(
+				bike,
+				geolocation,
+				locks,
+				listener: listener);
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.ReportStep(Step.StartingQueryLocation);
+				locks[0].GetDeviceState();
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				await listener.ReportStateAsync(State.QueryLocationFailed, "Ups...");
+			});
+		}
+
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Booked, lock state unknown.
+		/// </summary>
+		[Test]
+		public void TestReturnGetGeolocationException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<IGetLockedLocationCommandListener>();
+
+			bike.Id.Returns("0");
+
+			bike.LockInfo.Location.Returns((IGeolocation)null); // When locking bike geolocation was not available.
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach.
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>())
+				.Returns(Task.FromException<IGeolocation>(new Exception("Ups..."))); // Simulate error starting query for geolocation.
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state does not change.
+
+			bike.LockInfo.State.Returns(LockingState.Closed);   // Locking state does not change.
+
+			Assert.That(
+				async () => await InvokeAsync<TestGetBikeLocationCommand>(
+					bike,
+					geolocation,
+					locks,
+					listener: listener),
+					Throws.TypeOf<Exception>());
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.ReportStep(Step.StartingQueryLocation);
+				locks[0].GetDeviceState();
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				await listener.ReportStateAsync(State.QueryLocationFailed, "Ups...");
+			});
+		}
+
+
+
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Disposable closed
+		/// </summary>
+		[Test]
+		public async Task TestReturnLockInReach()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var listener = Substitute.For<IGetLockedLocationCommandListener>();
+
+			bike.LockInfo.Location.Returns((IGeolocation)null);
+
+			bike.Id.Returns("0");
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			var location = Substitute.For<IGeolocation>();
+			location.Latitude.Returns(7);
+			location.Longitude.Returns(9);
+			location.Timestamp.Returns(DateTimeOffset.MinValue);
+
+			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns(Task.FromResult(
+				location
+				)); ;
+
+			var lockingLocation = await InvokeAsync<TestGetBikeLocationCommand>(
+				bike,
+				geolocation,
+				locks,
+				() => DateTime.MinValue,
+				listener);
+
+			Assert.That(lockingLocation.Latitude, Is.EqualTo(7));
+			Assert.That(lockingLocation.Longitude, Is.EqualTo(9));
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				listener.ReportStep(Step.StartingQueryLocation);
+				var dummyLoc = bike.LockInfo.Location; // Check if location was available when closing lock.
+				locks[0].GetDeviceState(); // Check if bike is connected.
+				await geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()); // Query current location.
+				await listener.ReportStateAsync(State.QueryLocationSucceeded, string.Empty);
+			});
+		}
+	}
+}
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestBikeInfoMutalbe.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestBikeInfoMutalbe.cs
index db2e5c2..e404214 100644
--- a/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestBikeInfoMutalbe.cs
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestBikeInfoMutalbe.cs
@@ -1,7 +1,12 @@
 using System;
+using NSubstitute;
 using NUnit.Framework;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS;
+using TINK.Model.Connector;
+using TINK.Services.BluetoothLock;
+using TINK.Services.Geolocation;
+using TINK.ViewModel;
 
 namespace TestShareeLib.Model.Bike.BluetoothLock
 {
@@ -13,6 +18,11 @@ namespace TestShareeLib.Model.Bike.BluetoothLock
 		{
 			Assert.That(
 				new BikeInfoMutable(
+					Substitute.For<IGeolocationService>(),
+					Substitute.For<ILocksService>(),
+					() => false /* not connected */,
+					(_) => Substitute.For<IConnector>(),
+					() => Substitute.For<IPollingUpdateTaskManager>(),
 					new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
 						new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(
 							"MyBikeId",
@@ -31,6 +41,11 @@ namespace TestShareeLib.Model.Bike.BluetoothLock
 		{
 			Assert.That(
 				new BikeInfoMutable(
+					Substitute.For<IGeolocationService>(),
+					Substitute.For<ILocksService>(),
+					() => false /* not connected */,
+					(_) => Substitute.For<IConnector>(),
+					() => Substitute.For<IPollingUpdateTaskManager>(),
 					new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
 						new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(
 							"MyBikeId",
@@ -50,7 +65,14 @@ namespace TestShareeLib.Model.Bike.BluetoothLock
 		public void TestCtorBikeNull()
 		{
 			Assert.That(
-				() => new BikeInfoMutable(null, "My Station Name"),
+				() => new BikeInfoMutable(
+					Substitute.For<IGeolocationService>(),
+					Substitute.For<ILocksService>(),
+					() => false /* not connected */,
+					(_) => Substitute.For<IConnector>(),
+					() => Substitute.For<IPollingUpdateTaskManager>(),
+					null,
+					"My Station Name"),
 				Throws.ArgumentNullException);
 		}
 	}
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestLockInfoMutable.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestLockInfoMutable.cs
index c374136..45ac413 100644
--- a/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestLockInfoMutable.cs
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestLockInfoMutable.cs
@@ -95,7 +95,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 
 			lockInfo.Location = new Geolocation.Builder { Latitude = 47.99, Longitude = 7.78}.Build();
 
-			// Veryfy that location is kept because bike might be returned later.
+			// Verify that location is kept because bike might be returned later.
 			Assert.That(
 				lockInfo.Location.Latitude,
 				Is.EqualTo(47.99).Within(0.001));
@@ -113,7 +113,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 
 			lockInfo.State = LockingState.Closed;
 
-			// Veryfy that location is kept because bike might be returned later.
+			// Verify that location is kept because bike might be returned later.
 			Assert.That(
 				lockInfo.Location,
 				Is.Null);
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/TestBikeCollectionMutable.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/TestBikeCollectionMutable.cs
index 0c32613..af9921e 100644
--- a/TestShareeLib/Model/Bikes/BikeInfoNS/TestBikeCollectionMutable.cs
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/TestBikeCollectionMutable.cs
@@ -1,15 +1,20 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
+using NSubstitute;
 using NUnit.Framework;
 using TINK.Model.Bikes;
 using TINK.Model.Bikes.BikeInfoNS;
 using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS;
+using TINK.Model.Connector;
 using TINK.Model.Connector.Updater;
 using TINK.Model.State;
 using TINK.Model.Stations;
 using TINK.Model.Stations.StationNS;
+using TINK.Services.BluetoothLock;
+using TINK.Services.Geolocation;
+using TINK.ViewModel;
 using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TestTINKLib
@@ -54,7 +59,12 @@ namespace TestTINKLib
 		[Test]
 		public void TestAdd()
 		{
-			var l_oColl = new BikeCollectionMutable();
+			var l_oColl = new BikeCollectionMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>());
 
 			l_oColl.Add(new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Allround));
 
@@ -67,7 +77,12 @@ namespace TestTINKLib
 			var l_oBikeRequested = new BikeInfoMutable("20", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround);
 			l_oBikeRequested.State.Load(new StateInfo(() => DateTime.Now, DateTime.Now, TimeSpan.FromMinutes(15), "john@long", "1234"));
 
-			var l_oBikeColl = new BikeCollectionMutable
+			var l_oBikeColl = new BikeCollectionMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>())
 			{
 				new BikeInfoMutable("63", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Two, TypeOfBike.Allround),
 				new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Trike, TypeOfBike.Cargo),
@@ -95,7 +110,12 @@ namespace TestTINKLib
 			var bikeRequested = new BikeInfoMutable("20", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround);
 			bikeRequested.State.Load(new StateInfo(() => DateTime.Now, DateTime.Now, TimeSpan.FromMinutes(15), "john@long", "1234"));
 
-			var bikeColl = new BikeCollectionMutable
+			var bikeColl = new BikeCollectionMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>())
 			{
 				new BikeInfoMutable("63", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Two, TypeOfBike.Allround),
 				new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Trike, TypeOfBike.Cargo),
@@ -152,7 +172,12 @@ namespace TestTINKLib
 		[Test]
 		public void TestUpdate_StationName_NewBike()
 		{
-			var bikeColl = new BikeCollectionMutable();
+			var bikeColl = new BikeCollectionMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>());
 
 			// Verify initial state
 			Assert.That(bikeColl.GetById("57"), Is.Null);
@@ -184,7 +209,12 @@ namespace TestTINKLib
 		public void TestUpdate_StationName_UpdateExistingBike()
 		{
 
-			var bikeColl = new BikeCollectionMutable
+			var bikeColl = new BikeCollectionMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>())
 			{
 				new BikeInfoMutable("57", LockModel.ILockIt, false, new List<string> { "TINK" },  WheelType.Trike, TypeOfBike.Cargo),
 			};
@@ -229,7 +259,12 @@ namespace TestTINKLib
 		public void TestUpdate_StationName_Nullstations()
 		{
 
-			var bikeColl = new BikeCollectionMutable();
+			var bikeColl = new BikeCollectionMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>());
 
 
 			var bikeResponse = new List<BikeInfo>
@@ -265,7 +300,13 @@ namespace TestTINKLib
 				TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri);
 
 			Assert.That(
-				BikeCollectionMutable.BikeInfoMutableFactory.Create(bikeInfo, "Stat1").GetType(),
+				BikeCollectionMutable.BikeInfoMutableFactory.Create(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				bikeInfo, "Stat1").GetType(),
 				Is.EqualTo(typeof(TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable)));
 		}
 
@@ -284,7 +325,13 @@ namespace TestTINKLib
 				TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri);
 
 			Assert.That(
-				BikeCollectionMutable.BikeInfoMutableFactory.Create(bikeInfo, "Stat1").GetType(),
+				BikeCollectionMutable.BikeInfoMutableFactory.Create(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				bikeInfo, "Stat1").GetType(),
 				Is.EqualTo(typeof(TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfoMutable)));
 		}
 
@@ -304,7 +351,13 @@ namespace TestTINKLib
 				TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri);
 
 			Assert.That(
-				BikeCollectionMutable.BikeInfoMutableFactory.Create(bikeInfo, "Stat1"),
+				BikeCollectionMutable.BikeInfoMutableFactory.Create(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				bikeInfo, "Stat1"),
 				Is.Null);
 		}
 	}
diff --git a/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs b/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs
index 4600ad8..a5b35d0 100644
--- a/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs
+++ b/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs
@@ -1,18 +1,23 @@
 using System;
 using System.Linq;
 using Newtonsoft.Json;
+using NSubstitute;
 using NUnit.Framework;
 using TINK.Model;
 using TINK.Model.Bikes;
 using TINK.Model.Bikes.BikeInfoNS.BC;
 using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS;
+using TINK.Model.Connector;
 using TINK.Model.Connector.Updater;
 using TINK.Model.State;
 using TINK.Model.User.Account;
 using TINK.Repository;
 using TINK.Repository.Response;
 using TINK.Repository.Response.Stations;
+using TINK.Services.BluetoothLock;
+using TINK.Services.Geolocation;
+using TINK.ViewModel;
 using Xamarin.Forms;
 using static TINK.Repository.CopriCallsMemory;
 
@@ -640,7 +645,13 @@ namespace TestShareeLib.Model.Connector.Updater
 		public void TestLoad_Reserved_CalculateAuthKeys()
 		{
 			// Construct requested bike.
-			var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+			var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
 					new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("17", LockModel.ILockIt),
 					new Drive(),
 					DataSource.Copri,
@@ -680,7 +691,13 @@ namespace TestShareeLib.Model.Connector.Updater
 		public void TestLoad_Booked_CalculateAuthKeys()
 		{
 			// Construct occupied bike.
-			var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+			var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
 					new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("17", LockModel.ILockIt),
 					new Drive(),
 					DataSource.Copri,
@@ -716,7 +733,13 @@ namespace TestShareeLib.Model.Connector.Updater
 		public void TestLoad_Reserved_DoBook()
 		{
 			// Construct requested bike.
-			var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+			var bike = new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
 					new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("17", LockModel.ILockIt),
 					new Drive(),
 					DataSource.Copri,
diff --git a/TestShareeLib/Model/TestTinkAppSelectStation.cs b/TestShareeLib/Model/TestTinkAppSelectStation.cs
index 8a195ee..db0c7ec 100644
--- a/TestShareeLib/Model/TestTinkAppSelectStation.cs
+++ b/TestShareeLib/Model/TestTinkAppSelectStation.cs
@@ -16,8 +16,10 @@ using TINK.Model.Stations.StationNS;
 using TINK.Model.User;
 using TINK.Repository;
 using TINK.Services;
+using TINK.Services.BluetoothLock;
 using TINK.Services.Geolocation;
 using TINK.Services.Permissions;
+using TINK.ViewModel;
 using TINK.ViewModel.Settings;
 using static TINK.Repository.CopriCallsMemory;
 
@@ -36,7 +38,12 @@ namespace TestTINKLib.Fixtures.UseCases.SelectStation
 			IEnumerable<IStation> stations,
 			string selectedStationId)
 		{
-			var l_oBikesAtStation = new BikeCollectionMutable();
+			var l_oBikesAtStation = new BikeCollectionMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>());
 
 			var l_oBikesAvailable = (await connector.Query.GetBikesAsync()).Response;
 
diff --git a/TestShareeLib/TestShareeLib.csproj b/TestShareeLib/TestShareeLib.csproj
index 6c19f01..81bd8fd 100644
--- a/TestShareeLib/TestShareeLib.csproj
+++ b/TestShareeLib/TestShareeLib.csproj
@@ -51,5 +51,14 @@
     <None Include="Model\Bikes\BikeInfoNS\BC\TestBikeSerializeJSON.cs" />
     <None Include="Model\Bikes\BikeInfoNS\TestBikeCollectionSerializeJSON.cs" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <Reference Include="Mono.Android">
+      <HintPath>..\..\..\..\..\..\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\MonoAndroid\v12.0\Mono.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.iOS">
+      <HintPath>..\..\..\..\..\..\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.iOS\v1.0\Xamarin.iOS.dll</HintPath>
+    </Reference>
+  </ItemGroup>
 
 </Project>
diff --git a/TestShareeLib/ViewModel/Account/TestAccountPageViewModel.cs b/TestShareeLib/ViewModel/Account/TestAccountPageViewModel.cs
index 1f8d4b1..4cde674 100644
--- a/TestShareeLib/ViewModel/Account/TestAccountPageViewModel.cs
+++ b/TestShareeLib/ViewModel/Account/TestAccountPageViewModel.cs
@@ -159,7 +159,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
 
 			Assert.AreEqual("Logged in as a@b.", settingsPageViewModel.LoggedInInfo);
 			Assert.IsTrue(settingsPageViewModel.IsBookingStateInfoVisible, "A user is logged but no bikes requested/ booked.");
-			Assert.AreEqual("Aktuell 2 Fahrräder reserviert/ gebucht.", settingsPageViewModel.BookingStateInfo);
+			Assert.AreEqual("Currently 2 bikes reserved/ booked.", settingsPageViewModel.BookingStateInfo);
 		}
 
 		[Test]
@@ -202,7 +202,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
 
 			Assert.AreEqual("Logged in as a@b.", settingsPageViewModel.LoggedInInfo);
 			Assert.IsTrue(settingsPageViewModel.IsBookingStateInfoVisible, "A user is logged but no bikes requested/ booked.");
-			Assert.AreEqual("Aktuell 2 Fahrräder reserviert/ gebucht. Verbindungsstatus: Offline.", settingsPageViewModel.BookingStateInfo);
+			Assert.AreEqual("Currently 2 bikes reserved/ booked. Connectivity: Offline.", settingsPageViewModel.BookingStateInfo);
 		}
 
 		[Test]
@@ -233,7 +233,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
 						null /*UI language */,
 						sessionCookie: sessionCookie,
 						cacheServer: new CopriCallsCacheMemory001(sessionCookie: sessionCookie),
-						httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source expection."))))),
+						httpsServer: new ExceptionServer((msg) => new WebConnectFailureException(msg, new Exception("Source exception."))))),
 				merchantId: "MyMerchId",
 				bluetoothService: Substitute.For<IBluetoothLE>(),
 				locationPermissionsService: Substitute.For<ILocationPermission>(),
@@ -258,7 +258,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
 
 			Assert.AreEqual("Logged in as a@b.", settingsPageViewModel.LoggedInInfo); // CopriCallsCacheMemory(SampleSets.Set2,
 			Assert.IsTrue(settingsPageViewModel.IsBookingStateInfoVisible, "A user is logged but no bikes requested/ booked.");
-			Assert.AreEqual("Aktuell 2 Fahrräder reserviert/ gebucht. Verbindungsstatus: Offline.", settingsPageViewModel.BookingStateInfo);
+			Assert.AreEqual("Currently 2 bikes reserved/ booked. Connectivity: Offline.", settingsPageViewModel.BookingStateInfo);
 		}
 	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs
index 8addff2..b9e2035 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
@@ -23,6 +22,7 @@ using TINK.View;
 using TINK.ViewModel;
 using TINK.ViewModel.Bikes;
 using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
@@ -58,9 +58,9 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 		/// Use case: End rental.
 		/// Final state: Booked, lock state unknown.
 		/// </summary>
-		/// <remarks> Replaces test TestReturnOutOfReach which was removed for sharee.bike verion ~3.0.362. </remarks>
+		/// <remarks> Replaces test TestReturnOutOfReach which was removed for sharee.bike version ~3.0.362. </remarks>
 		[Test]
-		public void TestReturnLastGeolocatonNullLockOfOfReach()
+		public void TestReturnLastGeolocatonNullLockOutOfReach()
 		{
 			var bike = Substitute.For<IBikeInfoMutable>();
 			var connector = Substitute.For<IConnector>();
@@ -86,11 +86,14 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			bike.Id.Returns("0");
 
-			bike.LockInfo.Location.Returns((IGeolocation)null); // When locking bike geolocation was not available.
-
-			locks[0].GetDeviceState().Returns(DeviceState.Disconnected); // Simulate bike out of reach.
-
-			locks.DisconnectAsync(0, Arg.Any<Guid>()).Returns(LockingState.UnknownDisconnected); // Simulate disconnecting.
+			bike.GetLockedBikeLocationAsync(Arg.Any<IGetLockedLocationCommandListener>()).Throws((x) =>
+			{
+				handler.ReportStep(Step.StartingQueryLocation);
+				handler.ReportStateAsync(TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand.State.DisconnetedNoLocationError, "").Wait();
+				handler.ReportStep(Step.DisconnectingLockOnDisconnectedNoLocationError);
+				handler.ReportStateAsync(TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand.State.QueryLocationSucceeded, "").Wait();
+				throw new Exception();
+			});
 
 			bike.State.Value.Returns(InUseStateEnum.Booked);
 
@@ -100,13 +103,11 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				locks[0].GetDeviceState();
 				viewService.DisplayAlert(
-					"Error at ending rental!",
-					"We could not assign the bike to any station. For this we need your location information while you are standing right next to the bike. Only then your rental can be terminated!\r\n\r\nApproach the bike, turn on Bluetooth and Location services and try again.",
+					"Rental could not be terminated!",
+					"We could not assign the bike to any station. For this we need your location information while you are standing right next to the bike. Only then your rental can be terminated!\r\n\r\nApproach the bike lock, turn on Bluetooth and Location services and try again.",
 					"OK");
 				bikesViewModel.ActionText = "Disconnecting lock...";
-				locks.DisconnectAsync(0, Arg.Any<Guid>());
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -150,79 +151,29 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			bike.Id.Returns("0");
 
-			bike.LockInfo.Location.Returns((IGeolocation)null); // When locking bike geolocation was not available.
-
-			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach.
-
-			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Throws(new Exception("Ups...")); // Simulate error when starting query for geolocation.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			// Verify behavior
-			Received.InOrder(() =>
+			bike.GetLockedBikeLocationAsync(Arg.Any<IGetLockedLocationCommandListener>()).Throws((x) =>
 			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				locks[0].GetDeviceState();
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
-				viewService.DisplayAlert(
-					"Error at ending rental!",
-					"End rental at an unknown location is not possible.\r\nStart getting geolocation failed.",
-					"OK");
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+				handler.ReportStep(Step.StartingQueryLocation);
+				handler.ReportStateAsync(TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand.State.QueryLocationFailed, "Ups...").Wait();
+				throw new Exception();
 			});
 
-			// Verify state after action
-			Assert.AreEqual("End rental", subsequent.ButtonText);
-			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state does not change.
 
-		/// <summary>
-		/// Use case: End rental.
-		/// Comment: User decide to abort returning bike
-		/// Final state: Same as initial state.
-		/// </summary>
-		[Test]
-		public void TestReturnCancel()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedClosed(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "End rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(false));
+			bike.LockInfo.State.Returns(LockingState.Closed);   // Locking state does not change.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
 			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				viewService.DisplayAlert(string.Empty, "End rental of bike Nr. 0?", "Yes", "No");
+				bikesViewModel.ActionText = "Query location...";
+				viewService.DisplayAlert(
+					"Rental could not be terminated!",
+					"Grant Location permission, activate Location services and try again.",
+					"OK");
+				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
@@ -264,14 +215,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			bike.Id.Returns("0");
 
-			bike.LockInfo.Location.Returns((IGeolocation)null); // When locking bike geolocation was not available.
+			bike.GetLockedBikeLocationAsync(Arg.Any<IGetLockedLocationCommandListener>())
+				.Returns((x) =>
+				{
+					handler.ReportStep(Step.StartingQueryLocation);
+					handler.ReportStateAsync(TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand.State.QueryLocationFailed, "Ups...").Wait();
+					return Task.FromException<LocationDto>(new Exception("Ups..."));
+				});
 
-			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach.
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state does not change.
 
-			viewService.DisplayAlert(string.Empty, "End rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+			bike.LockInfo.State.Returns(LockingState.Closed);   // Locking state does not change.
 
-			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>())
-				.Returns(Task.FromException<IGeolocation>(new Exception("Ups..."))); // Simulate error starting query for geolocation.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -279,14 +234,11 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				locks[0].GetDeviceState();
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>());
+				bikesViewModel.ActionText = "Query location...";
 				viewService.DisplayAlert(
-					"Location query failed",
-					"End rental at an unknown location is not possible.\r\nMake sure you have granted location sharing permission and your location services are enabled.\r\nTry again!",
+					"Rental could not be terminated!",
+					"Grant Location permission, activate Location services and try again.",
 					"OK");
-				bikesViewModel.ActionText = "Updating...";
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -327,24 +279,19 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel,
 				activeUser);
 
-			bike.LockInfo.Location.Returns((IGeolocation)null);
-
 			bike.Id.Returns("0");
 
 			viewService.DisplayAlert(string.Empty, "End rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
 
-			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+			bike.GetLockedBikeLocationAsync(Arg.Any<IGetLockedLocationCommandListener>()).Returns((x) =>
+			{
+				handler.ReportStep(Step.StartingQueryLocation);
+				handler.ReportStateAsync(TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand.State.QueryLocationSucceeded, string.Empty).Wait();
+				return Task.FromResult(new LocationDto.Builder().Build());
+			});
 
-			var location = Substitute.For<IGeolocation>();
-			location.Latitude.Returns(7);
-			location.Longitude.Returns(9);
-
-			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns(Task.FromResult(
-				location
-				)); ;
-
-			bike.State.Value.Returns(InUseStateEnum.Disposable); // Requesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Request handler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Request handler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -352,16 +299,15 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Query location...";
-				bikesViewModel.ActionText = "Ending rental...";
+				bikesViewModel.ActionText = "One moment please...";
 				connector.Command.DoReturn(bike, Arg.Is<LocationDto>(x => x != null));
 				bikesViewModel.ActionText = "Disconnecting lock...";
 				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -424,17 +370,15 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Ending rental...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "One moment please...";
 				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert(
-					"Connection error when ending rental.",
-					"Internet must be available when ending rental. Please establish an Internet connection!\r\nIs WIFI/mobile network available and mobile data activated?",
-					"Context info",
+				viewService.DisplayAlert(
+					"Rental could not be terminated!",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -498,13 +442,12 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Ending rental...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "One moment please...";
 				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error at ending rental!", "End rental outside of station is not possible. Distance to station 42 is 15986 m.", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				viewService.DisplayAlert("Rental could not be terminated!", "End rental outside or at wrong station is not possible. Distance to next suitable station 42 is 15986 m.", "OK");
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -568,13 +511,12 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Ending rental...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "One moment please...";
 				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error at ending rental!", "End rental at an unknown location is not possible.\r\nRental can be ended if\r\n- location information is available when closing lock\r\n- bike is in reach and location information is available when pressing button \"End rental\"", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				viewService.DisplayAlert("Rental could not be terminated!", "End rental at an unknown location is not possible.\r\nRental can be ended if\r\n- location information is available when closing lock\r\n- bike is in reach and location information is available when pressing button \"End rental\"", "OK");
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -636,13 +578,12 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Ending rental...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "One moment please...";
 				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert("Statusfehler beim Zurückgeben des Rads!", "Outer message.", "Some invalid data received!", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				viewService.DisplayAdvancedAlert("Rental could not be terminated!", "Outer message.", "Some invalid data received!", "OK");
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -691,8 +632,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x => throw new Exception("Exception message."));
 
-			bike.State.Value.Returns(InUseStateEnum.Booked); // Requesthandler factory queries state to create appropriate request handler object.
-			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Request handler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Request handler factory queries lock state to create appropriate request handler object.
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
@@ -703,13 +644,16 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Ending rental...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "One moment please...";
 				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error at ending rental!", "Exception message.", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				viewService.DisplayAlert(
+					"Rental could not be terminated!",
+					"Exception message.",
+					"OK"
+				);
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -762,7 +706,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -770,16 +714,16 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -824,13 +768,13 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
+				viewService.DisplayAlert("Lock could not be opened!", "Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -847,7 +791,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 		/// Final state: Same as initial state.
 		/// </summary>
 		[Test]
-		public void TestOpenOpenFailsCouldntOpenBoldBlockedException()
+		public void TestOpenOpenFailsCouldntOpenBoltBlockedException()
 		{
 			var bike = Substitute.For<IBikeInfoMutable>();
 			var connector = Substitute.For<IConnector>();
@@ -884,13 +828,13 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error while opening lock!", "Ensure that no obstacle prevents lock from opening and try again.", "OK");
+				viewService.DisplayAlert("Lock could not be opened!", "Lock bolt is blocked. Make sure that no spoke presses against the lock bolt and try again.", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -945,13 +889,13 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error while opening lock!", "After try to open lock state closed is reported.", "OK");
+				viewService.DisplayAlert("Lock could not be opened!", "Lock reports it is still closed. Please try again!", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -1005,13 +949,13 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Lock can not be opened!", "The lock could not be opened correctly. Try again!\r\n\r\nAttention! Your rental has already started.\r\nIf the lock still won't open, make sure the lock is closed and end rental.\r\nImportant: Send an email to the operator (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.", "OK");
+				viewService.DisplayAlert("Lock could not be opened!", "Position of lock bolt is unknown. Lock could be closed or open. Please try again!", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -1065,13 +1009,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
+				viewService.DisplayAdvancedAlert(
+					"Lock could not be opened!",
+					"Exception message.",
+					"Please try again.",
+					"OK"
+				);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -1126,7 +1075,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -1135,16 +1084,16 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -1190,7 +1139,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -1199,16 +1148,16 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Closed" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -1255,7 +1204,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -1264,16 +1213,16 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Internet must be available for updating lock status. Please establish an Internet connection!";
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -1320,7 +1269,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -1329,16 +1278,16 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Connection error on updating locking status.";
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -1386,7 +1335,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -1395,16 +1344,16 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Status error on updating lock state.";
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs
index 5ce1fa8..604aef5 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs
@@ -125,22 +125,22 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				connector.Command.CalculateAuthKeys(bike);
 				bikesViewModel.ActionText = "Searching lock...";
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -184,12 +184,16 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error when connecting with lock!", "Internet must be reachable to connect to lock of rented bike. Please establish an Internet connection!\r\nContext info\r\nIs WIFI/mobile network available and mobile data activated?", "OK");
+				viewService.DisplayAlert(
+					"Connection to booking system not possible.",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
+					"OK"
+				);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -242,12 +246,12 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error when connecting with lock!", "Communication error during lock search.\r\nException message.", "OK");
+				viewService.DisplayAlert("Connection to the lock could not be established.", "Exception message.", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -302,19 +306,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				connector.Command.CalculateAuthKeys(bike);
 				bikesViewModel.ActionText = "Searching lock...";
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Error when connecting with lock!",
-					"Lock can only be found when rented bike is nearby.",
-					"Retry",
-					"Cancel");
+					"Connection to the lock could not be established.",
+					"Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.",
+					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -369,20 +372,20 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				connector.Command.CalculateAuthKeys(bike);
 				bikesViewModel.ActionText = "Searching lock...";
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAdvancedAlert(
-					"Error when connecting with lock!",
-					"Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.",
+					"Connection to the lock could not be established.",
+					"Please step as close as possible to the bike lock and try again.",
 					"",
 					"Retry",
 					"Cancel");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -438,15 +441,15 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				connector.Command.CalculateAuthKeys(bike);
 				bikesViewModel.ActionText = "Searching lock...";
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error when connecting with lock!", "Schlossstatus des gemieteten Rads konnte nicht ermittelt werden.", "OK");
+				viewService.DisplayAlert("Connection to the lock could not be established.", "Lock status could not be determined. Please contact customer support.", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs
index 0d16852..8b49ffe 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs
@@ -6,6 +6,7 @@ using NSubstitute;
 using NUnit.Framework;
 using TINK.Model;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command;
 using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.State;
@@ -21,7 +22,7 @@ using TINK.View;
 using TINK.ViewModel;
 using TINK.ViewModel.Bikes;
 using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
-using Geolocation = TINK.Services.Geolocation.Geolocation;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.CloseCommand;
 
 namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
@@ -46,1004 +47,11 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				Substitute.For<IBikesViewModel>(),
 				Substitute.For<IUser>());
 
-			// Verify prerequisites.
-			Assert.AreEqual("Close lock & end rental", handler.ButtonText);
-			Assert.IsTrue(handler.IsButtonVisible);
-			Assert.AreEqual("Close lock", handler.LockitButtonText);
-			Assert.IsTrue(handler.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return. 
-		/// Comment: User cancels operation.
-		/// Final state: Booked and open.
-		/// Similar to TestReservedClosed::TestBookAndOpenCancelBook
-		/// </summary>
-		[Test]
-		public void TestCloseAndReturnCancelReturn()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0 Allround Mono?", "Yes", "No").Returns(Task.FromResult(false));
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
-			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return.
-		/// Final state: Disposable closed.
-		/// Similar to TestReservedClosed::TestBookAndOpen
-		/// </summary>
-		[Test]
-		public void TestCloseAndReturn()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			locks[0].CloseAsync()
-				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
-
-			var location = Substitute.For<IGeolocation>();
-			location.Latitude.Returns(1);
-			location.Longitude.Returns(2);
-
-			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns(Task.FromResult(location));
-
-			bike.State.Value.Returns(InUseStateEnum.Disposable); // Return call leads to setting of state to disposable.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()); // Geolocation must be retrieved
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = "Query location...";
-				bikesViewModel.ActionText = "Ending rental...";
-				connector.Command.DoReturn(bike, Arg.Is<LocationDto>(x => x.Latitude == 1 && x.Longitude == 2), Arg.Any<ISmartDevice>()); // Booking must be performed
-				bikesViewModel.ActionText = "Disconnecting lock...";
-				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Disposable Closed" after action
-			Assert.AreEqual("Reserve bike", subsequent.ButtonText);
-			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("DisposableDisconnected", subsequent.LockitButtonText);
-			Assert.IsFalse(subsequent.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return.
-		/// Final state: Same as initial state.
-		/// </summary>
-		[Test]
-		public void TestCloseAndReturnCloseFailsOutOfReachException()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			locks[0].CloseAsync()
-				.Returns<LockitLockingState?>(x => throw new OutOfReachException());
-
-			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = string.Empty;
-				bike.LockInfo.State = LockingState.UnknownDisconnected;
-				connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
-				viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked Disconnected" after action
-			Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-			Assert.IsFalse(subsequent.IsButtonVisible);
-			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		[Test]
-		public void TestCloseAndReturnStartReturningBikeWebConnectFailureException()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			connector.Command.StartReturningBike(bike).Returns(x => throw new WebConnectFailureException("Context info", new Exception("hoppla")));
-
-			bike.LockInfo.State.Returns(LockingState.Open);     // If locking fails bike remains open.
-			bike.State.Value.Returns(InUseStateEnum.Booked);    // Booking state remains unchanged if closing fails.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert(
-					"Connection error when ending rental.",
-					"Internet must be available when ending rental. Please establish an Internet connection!\r\nIs WIFI/mobile network available and mobile data activated?",
-					"Context info",
-					"OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
-			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		[Test]
-		public void TestCloseAndReturnStartReturningBikeException()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			connector.Command.StartReturningBike(bike).Returns(x => throw new Exception("Context info", new Exception("hoppla")));
-
-			bike.LockInfo.State.Returns(LockingState.Open);     // If locking fails bike remains open.
-			bike.State.Value.Returns(InUseStateEnum.Booked);    // Booking state remains unchanged if closing fails.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert(
-					"Error at ending rental!",
-					"Context info",
-					"OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
-			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return.
-		/// Final state: Same as initial state.
-		/// </summary>
-		[Test]
-		public void TestCloseAndReturnCloseFailsException()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			locks[0].CloseAsync()
-				.Returns<LockitLockingState?>(x => throw new Exception("Blu"));
-
-			bike.LockInfo.State.Returns(LockingState.Open); // If locking fails bike remains open.
-			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = string.Empty;
-				bike.LockInfo.State = LockingState.UnknownDisconnected;
-				connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
-				viewService.DisplayAlert("Lock can not be closed!", "Blu", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked open" after action
-			Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-			Assert.IsFalse(subsequent.IsButtonVisible);
-			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return.
-		/// Final state: Same as initial state.
-		/// </summary>
-		[Test]
-		public void TestCloseAndReturnCloseFailsCouldntCloseMovingException()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			locks[0].CloseAsync()
-				.Returns<LockitLockingState?>(x => throw new CouldntCloseMovingException());
-
-			//bike.LockInfo.State.Returns(LockingState.Open); // If locking fails bike remains open.
-			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = string.Empty;
-				bike.LockInfo.State = LockingState.Open;
-				connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
-				viewService.DisplayAlert(
-					"Lock can not be closed!",
-					"Lock can only be closed if bike is not moving. Please park bike and try again.",
-					"OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
-			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return.
-		/// Final state: Same as initial state.
-		/// </summary>
-		[Test]
-		public void TestCloseAndReturnCloseFailsNotClosed()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Open);
-
-			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bike.LockInfo.State = LockingState.Open;
-				bikesViewModel.ActionText = string.Empty;
-				connector.Command.UpdateLockingStateAsync(Arg.Any<IBikeInfoMutable>());
-				viewService.DisplayAlert("Lock can not be closed!", "After try to close lock state open is reported.", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
-			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return.
-		/// Final state: Booked locked.
-		/// </summary>
-		[Test]
-		public async Task TestCloseAndReturnGetGeolocationFailsException()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed);
-
-			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>()).Returns(Task.FromException<IGeolocation>(new Exception("noloc")));
-
-			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-			var subsequent = await handler.HandleRequestOption1();
-
-			await locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = "Query location...";
-				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert("Error query location!", "Closing the lock and ending the rental is not possible.", "noloc", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked closed" after action
-			//Assert.AreEqual("End rental", subsequent.ButtonText);
-			//Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return.
-		/// Final state: Booked locked.
-		/// </summary>
-		[Test]
-		public void TestCloseAndReturnReturnFailsWebConnectFailureException()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed);
-
-			connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
-
-			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = "Query location...";
-				bikesViewModel.ActionText = "Ending rental...";
-				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert(
-					"Connection error when ending rental.",
-					"Internet must be available when ending rental. Please establish an Internet connection!\r\nIs WIFI/mobile network available and mobile data activated?",
-					"Context info",
-					"OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked closed" after action
-			//Assert.AreEqual("End rental", subsequent.ButtonText);
-			//Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return.
-		/// Final state: Booked locked.
-		/// </summary>
-		[Test]
-		public void TestCloseAndReturnReturnFailsException()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed);
-
-			connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x => throw new System.Exception("Exception message."));
-
-			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = "Query location...";
-				bikesViewModel.ActionText = "Ending rental...";
-				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error at ending rental!", "Exception message.", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked closed" after action
-			//Assert.AreEqual("End rental", subsequent.ButtonText);
-			//Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return.
-		/// Final state: Booked locked.
-		/// </summary>
-		[Test]
-		public void TestCloseAndReturnReturnFailsNotAtStationException()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed);
-
-			NotAtStationException.IsNotAtStation("Failure 2178: bike 1545 out of GEO fencing. 15986 meter distance to next station 77. OK: bike 1545 locked confirmed", out NotAtStationException notAtStationException);
-
-			connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x =>
-				throw notAtStationException);
-
-			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = "Query location...";
-				bikesViewModel.ActionText = "Ending rental...";
-				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error at ending rental!", "End rental outside of station is not possible. Distance to station 77 is 15986 m.", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked closed" after action
-			//Assert.AreEqual("End rental", subsequent.ButtonText);
-			//Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return.
-		/// Final state: Booked locked.
-		/// </summary>
-		[Test]
-		public void TestCloseAndReturnReturnFailsNoGPSDataException()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed);
-
-			NoGPSDataException.IsNoGPSData("Failure 2245: No GPS data, state change forbidden.", out NoGPSDataException noGPSDataException);
-
-			connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x =>
-				throw noGPSDataException);
-
-			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = "Query location...";
-				bikesViewModel.ActionText = "Ending rental...";
-				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error at ending rental!", "End rental at an unknown location is not possible.\r\nRental can only be ended if bike is in reach and location information is available.", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked closed" after action
-			//Assert.AreEqual("End rental", subsequent.ButtonText);
-			//Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
-		}
-
-		/// <summary>
-		/// Use case: Close lock and return.
-		/// Final state: Booked locked.
-		/// </summary>
-		[Test]
-		public void TestCloseAndReturnReturnFailsResponseException()
-		{
-			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
-			var locks = Substitute.For<ILocksService>();
-			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-			var viewService = Substitute.For<IViewService>();
-			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var handler = new BookedOpen(
-				bike,
-				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
-				locks,
-				() => pollingManager,
-				Substitute.For<ISmartDevice>(),
-				viewService,
-				bikesViewModel,
-				activeUser);
-
-			bike.Id.Returns("0");
-
-			viewService.DisplayAlert(string.Empty, "Close lock and end rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
-
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed);
-
-			connector.Command.DoReturn(bike, Arg.Any<LocationDto>(), Arg.Any<ISmartDevice>()).Returns<BookingFinishedModel>(x =>
-				throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
-			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state remains unchanged if closing fails.
-
-			var subsequent = handler.HandleRequestOption1().Result;
-
-			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
-
-			// Verify behavior
-			Received.InOrder(() =>
-			{
-				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-				bikesViewModel.ActionText = "Start query location...";
-				geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime>());
-				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "Starting end rental...";
-				connector.Command.StartReturningBike(bike); // Notify about start
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = "Query location...";
-				bikesViewModel.ActionText = "Ending rental...";
-				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert("Statusfehler beim Zurückgeben des Rads!", "Outer message.", "Some invalid data received!", "OK");
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-				bikesViewModel.ActionText = string.Empty;
-				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-			});
-
-			// Verify state "Booked closed" after action
-			//Assert.AreEqual("End rental", subsequent.ButtonText);
-			//Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual("Close lock", handler.ButtonText);
+			Assert.IsTrue(handler.IsButtonVisible);
+			Assert.AreEqual(string.Empty, handler.LockitButtonText);
+			Assert.That(handler.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -1054,58 +62,51 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 		public void TestClose()
 		{
 			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
 			var locks = Substitute.For<ILocksService>();
 			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
 			var viewService = Substitute.For<IViewService>();
 			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
-
-			var startOfTest = DateTime.Now;
-
-			geolocation.GetAsync(Arg.Any<CancellationToken?>(), Arg.Any<DateTime?>()).Returns(new Geolocation.Builder { Latitude = 47.99, Longitude = 7.78}.Build());
 
 			var handler = new BookedOpen(
 				bike,
 				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocationService>(),
 				locks,
 				() => pollingManager,
 				Substitute.For<ISmartDevice>(),
 				viewService,
 				bikesViewModel,
-				activeUser);
+				Substitute.For<IUser>());
 
+#if !USELOCALINSTANCE
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>()).Returns(x =>
+				{
+					// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+					handler.ReportStep(Step.ClosingLock);
+					handler.ReportStep(Step.UpdateLockingState);
+					return Task.CompletedTask;
+				}
+			);
+#else
 			locks[0].CloseAsync()
 				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
 
+#endif
+
 			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed); // Return lock state indicating success
 
-			var subsequent = handler.HandleRequestOption2().Result;
-
-			// Veryfy that location is kept because bike might be returned later.
-			Assert.That(
-				bike.LockInfo.Location.Latitude,
-				Is.EqualTo(47.99).Within(0.001));
-			Assert.That(
-				bike.LockInfo.Location.Longitude,
-				Is.EqualTo(7.78).Within(0.001));
+			var subsequent = handler.HandleRequestOption1().Result;
 
 			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = "Updating lock state...";
-				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -1119,53 +120,58 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 		/// <summary>
 		/// Use case: Close lock
-		/// Final state: Same as initial state.
 		/// </summary>
 		[Test]
 		public void TestCloseCloseFailsOutOfReachException()
 		{
 			var bike = Substitute.For<IBikeInfoMutable>();
-			var connector = Substitute.For<IConnector>();
-			var command = Substitute.For<ICommand>();
-			var geolocation = Substitute.For<IGeolocationService>();
 			var locks = Substitute.For<ILocksService>();
 			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
 			var viewService = Substitute.For<IViewService>();
 			var bikesViewModel = Substitute.For<IBikesViewModel>();
-			var activeUser = Substitute.For<IUser>();
 
 			var handler = new BookedOpen(
 				bike,
 				() => true, // isConnectedDelegate
-				(isConnexted) => connector,
-				geolocation,
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocationService>(),
 				locks,
 				() => pollingManager,
 				Substitute.For<ISmartDevice>(),
 				viewService,
 				bikesViewModel,
-				activeUser);
-
+				Substitute.For<IUser>());
+#if !USELOCALINSTANCE
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>())
+				.Returns(async x =>
+					{
+						// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+						handler.ReportStep(Step.ClosingLock);
+						await handler.ReportStateAsync(CloseCommand.State.OutOfReachError, "");
+						throw new OutOfReachException();
+					}
+				);
+#else
 			locks[0].CloseAsync()
 				.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
 
+#endif
 			bike.State.Value.Returns(InUseStateEnum.Booked);
-			bike.LockInfo.State.Returns(LockingState.Open);
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); /// If <see cref="OutOfReachException"/> is fired lock state is set to state unknown because disconnected.
 
-			var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
+				viewService.DisplayAlert("Lock could not be closed!", "Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -1177,6 +183,133 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
 		}
 
+		[Test]
+		public void TestCloseCloseFailsCouldntCloseMovingException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocationService>(),
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				Substitute.For<IUser>());
+#if !USELOCALINSTANCE
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>())
+				.Returns(async x =>
+				{
+					// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+					handler.ReportStep(Step.ClosingLock);
+					await handler.ReportStateAsync(CloseCommand.State.CouldntCloseMovingError, "");
+					throw new CouldntCloseMovingException();
+				}
+				);
+
+			bike.LockInfo.State.Returns(LockingState.Open); // Locking state is open when CouldntCloseMovingException occurs.
+#else
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntCloseMovingException());
+
+#endif
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
+				bikesViewModel.ActionText = string.Empty;
+				viewService.DisplayAlert("Lock could not be closed!", "The process is motion sensitive. Step close to the lock, do not move, and try again.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartAsync(); // polling must be restarted again
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
+		}
+
+		[Test]
+		public void TestCloseCloseFailsCouldntCloseBoltBlockedException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+
+			var handler = new BookedOpen(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocationService>(),
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				Substitute.For<IUser>());
+
+#if !USELOCALINSTANCE
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>())
+				.Returns(async x =>
+				{
+					// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+					handler.ReportStep(Step.ClosingLock);
+					await handler.ReportStateAsync(CloseCommand.State.CouldntCloseBoltBlockedError, "");
+					throw new CouldntCloseBoltBlockedException();
+				}
+				);
+
+			bike.LockInfo.State.Returns(LockingState.UnknownFromHardwareError); // Locking state is unknown when CouldntCloseBoltBlockedException occurs.
+#else
+			locks[0].CloseAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntCloseBoltBlockedException());
+
+#endif
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			var subsequent = handler.HandleRequestOption1().Result;
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
+				bikesViewModel.ActionText = string.Empty;
+				viewService.DisplayAlert("Lock could not be closed!", "Lock bolt is blocked. Make sure that no spoke or any other obstacle prevents the lock from closing and try again.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartAsync(); // polling must be restarted again
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked disconnected" after action
+			Assert.AreEqual("Open lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
+
 		/// <summary>
 		/// Use case: Close lock
 		/// Final state: Same as initial state.
@@ -1206,26 +339,44 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel,
 				activeUser);
 
+#if !USELOCALINSTANCE
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>()).Returns(async x =>
+				{
+					// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+					handler.ReportStep(Step.ClosingLock);
+					await handler.ReportStateAsync(CloseCommand.State.GeneralCloseError, "Exception message.");
+					throw new Exception("Exception message.");
+				}
+			);
+
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // If CloseLock fires an exception of type Exception lock state is set to unknown.
+#else
 			locks[0].CloseAsync()
 				.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
-
+#endif
 			bike.State.Value.Returns(InUseStateEnum.Booked);
-			bike.LockInfo.State.Returns(LockingState.Open);
 
-			var subsequent = handler.HandleRequestOption2().Result;
+
+			var subsequent = handler.HandleRequestOption1().Result;
 
 			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
+#if USELOCALINSTANCE
 				locks.Received()[0].CloseAsync(); // Lock must be closed
+#endif
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
+				viewService.DisplayAlert(
+					"Lock could not be closed!",
+					"Exception message.",
+					"OK"
+				);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -1266,28 +417,41 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel,
 				activeUser);
 
+#if !USELOCALINSTANCE
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>()).Returns(async x =>
+				{
+					// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+					handler.ReportStep(Step.ClosingLock);
+					handler.ReportStep(Step.UpdateLockingState);
+					await handler.ReportStateAsync(CloseCommand.State.WebConnectFailed, "Context info");
+				}
+			);
+
+			bike.LockInfo.State.Returns(LockingState.Closed);
+#else
 			locks[0].CloseAsync()
 				.Returns(LockitLockingState.Closed); // Return lock state indicating success
 
 			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
-
+#endif
 			bike.State.Value.Returns(InUseStateEnum.Booked);
 
-			var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
+#if USELOCALINSTANCE
 				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+#endif
 				bikesViewModel.ActionText = "Internet must be available for updating lock status. Please establish an Internet connection!";
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -1328,28 +492,42 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel,
 				activeUser);
 
+#if !USELOCALINSTANCE
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>())
+					.Returns(async x =>
+					{
+						// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+						handler.ReportStep(Step.ClosingLock);
+						handler.ReportStep(Step.UpdateLockingState);
+						await handler.ReportStateAsync(CloseCommand.State.BackendUpdateFailed, "Exception message.");
+					}
+				);
+
+			bike.LockInfo.State.Returns(LockingState.Closed);
+#else
 			locks[0].CloseAsync()
 				.Returns(LockitLockingState.Closed); // Return lock state indicating success
 
 			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
-
+#endif
 			bike.State.Value.Returns(InUseStateEnum.Booked);
 
-			var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
+#if USELOCALINSTANCE
 				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+#endif
 				bikesViewModel.ActionText = "Connection error on updating locking status.";
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -1390,29 +568,43 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel,
 				activeUser);
 
+#if !USELOCALINSTANCE
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>())
+				.Returns(async x =>
+					{
+						// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+						handler.ReportStep(Step.ClosingLock);
+						handler.ReportStep(Step.UpdateLockingState);
+						await handler.ReportStateAsync(CloseCommand.State.ResponseIsInvalid, "Some invalid data received");
+					}
+				);
+
+			bike.LockInfo.State.Returns(LockingState.Closed);
+#else
 			locks[0].CloseAsync()
 				.Returns(LockitLockingState.Closed); // Return lock state indicating success
 
 			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
 				throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
+#endif
 			bike.State.Value.Returns(InUseStateEnum.Booked);
 
-			var subsequent = handler.HandleRequestOption2().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
+#if USELOCALINSTANCE
 				locks.Received()[0].CloseAsync(); // Lock must be closed
-				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
+#endif
 				bikesViewModel.ActionText = "Status error on updating lock state.";
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs
index 12a7d05..c2b19f6 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs
@@ -4,6 +4,7 @@ using Newtonsoft.Json;
 using NSubstitute;
 using NUnit.Framework;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command;
 using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.State;
@@ -19,6 +20,7 @@ using TINK.View;
 using TINK.ViewModel;
 using TINK.ViewModel.Bikes;
 using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.CloseCommand;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
@@ -92,7 +94,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -100,16 +102,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -154,13 +156,13 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
+				viewService.DisplayAlert("Lock could not be opened!", "Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -177,7 +179,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 		/// Final state: Same as initial state.
 		/// </summary>
 		[Test]
-		public void TestOpenOpenFailsCouldntOpenBoldBlockedException()
+		public void TestOpenOpenFailsCouldntOpenBoltBlockedException()
 		{
 			var bike = Substitute.For<IBikeInfoMutable>();
 			var connector = Substitute.For<IConnector>();
@@ -214,13 +216,13 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error while opening lock!", "Ensure that no obstacle prevents lock from opening and try again.", "OK");
+				viewService.DisplayAlert("Lock could not be opened!", "Lock bolt is blocked. Make sure that no spoke presses against the lock bolt and try again.", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -274,13 +276,13 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error while opening lock!", "After try to open lock state closed is reported.", "OK");
+				viewService.DisplayAlert("Lock could not be opened!", "Lock reports it is still closed. Please try again!", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -334,13 +336,13 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "";
-				viewService.DisplayAlert("Lock can not be opened!", "The lock could not be opened correctly. Try again!\r\n\r\nAttention! Your rental has already started.\r\nIf the lock still won't open, make sure the lock is closed and end rental.\r\nImportant: Send an email to the operator (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.", "OK");
+				viewService.DisplayAlert("Lock could not be opened!", "Position of lock bolt is unknown. Lock could be closed or open. Please try again!", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -394,13 +396,17 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
+				viewService.DisplayAdvancedAlert(
+					"Lock could not be opened!",
+					"Exception message.",
+					"Please try again.",
+					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -455,7 +461,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -464,16 +470,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 
@@ -520,7 +526,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -529,16 +535,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -585,7 +591,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -594,16 +600,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Internet must be available for updating lock status. Please establish an Internet connection!";
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -650,7 +656,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -659,16 +665,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Connection error on updating locking status.";
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -716,7 +722,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be closed
 				bikesViewModel.ActionText = "Reading charging level...";
@@ -725,16 +731,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Status error on updating lock state.";
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
-			// Verify state "Booked Open" after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -766,10 +772,17 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel,
 				activeUser);
 
-			locks[0].CloseAsync()
-				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
-
 			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed); // Return lock state indicating success
+
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>()).Returns(x =>
+			{
+				// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+				handler.ReportStep(Step.ClosingLock);
+				handler.ReportStep(Step.UpdateLockingState);
+				return Task.CompletedTask;
+			}
+			);
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
@@ -778,13 +791,11 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				bikesViewModel.ActionText = "Updating lock state...";
-				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -825,11 +836,18 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel,
 				activeUser);
 
-			locks[0].CloseAsync()
-				.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>())
+				.Returns(async x =>
+					{
+						// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+						handler.ReportStep(Step.ClosingLock);
+						await handler.ReportStateAsync(CloseCommand.State.OutOfReachError, "");
+						throw new OutOfReachException();
+					}
+				);
 
 			bike.State.Value.Returns(InUseStateEnum.Booked);
-			bike.LockInfo.State.Returns(LockingState.Open);
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); /// If <see cref="OutOfReachException"/> is fired lock state is set to state unknown because disconnected.
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
@@ -838,13 +856,12 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
+				viewService.DisplayAlert("Lock could not be closed!", "Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -885,11 +902,17 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel,
 				activeUser);
 
-			locks[0].CloseAsync()
-				.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>()).Returns(async x =>
+			{
+				// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+				handler.ReportStep(Step.ClosingLock);
+				await handler.ReportStateAsync(State.GeneralCloseError, "Exception message.");
+				throw new Exception("Exception message.");
+			}
+			);
 
 			bike.State.Value.Returns(InUseStateEnum.Booked);
-			bike.LockInfo.State.Returns(LockingState.Open);
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // If CloseLock fires an exception of type Exception lock state is set to unknown.
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
@@ -898,13 +921,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
+				viewService.DisplayAlert(
+					"Lock could not be closed!",
+					"Exception message.",
+					"OK"
+				);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -945,12 +971,17 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel,
 				activeUser);
 
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>()).Returns(async x =>
+			{
+				// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+				handler.ReportStep(Step.ClosingLock);
+				handler.ReportStep(Step.UpdateLockingState);
+				await handler.ReportStateAsync(CloseCommand.State.WebConnectFailed, "Context info");
+			}
+			);
 
 			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
@@ -959,14 +990,12 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				bikesViewModel.ActionText = "Updating lock state...";
-				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Internet must be available for updating lock status. Please establish an Internet connection!";
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -1007,12 +1036,18 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel,
 				activeUser);
 
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>())
+					.Returns(async x =>
+					{
+						// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+						handler.ReportStep(Step.ClosingLock);
+						handler.ReportStep(Step.UpdateLockingState);
+						await handler.ReportStateAsync(CloseCommand.State.BackendUpdateFailed, "Exception message.");
+					}
+				);
 
 			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
@@ -1021,14 +1056,12 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				bikesViewModel.ActionText = "Updating lock state...";
-				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Connection error on updating locking status.";
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -1069,13 +1102,18 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel,
 				activeUser);
 
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed); // Return lock state indicating success
-
-			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
-				throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>())
+				.Returns(async x =>
+				{
+					// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+					handler.ReportStep(Step.ClosingLock);
+					handler.ReportStep(Step.UpdateLockingState);
+					await handler.ReportStateAsync(CloseCommand.State.ResponseIsInvalid, "Some invalid data received");
+				}
+				);
 
 			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
@@ -1084,14 +1122,12 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				bikesViewModel.ActionText = "Updating lock state...";
-				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Status error on updating lock state.";
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
index d53dbbc..61cbd0b 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
@@ -154,7 +154,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reserving bike...";
 				connector.Command.DoReserve(bike); // Booking must be performed
 				bikesViewModel.ActionText = "Searching lock...";
@@ -169,16 +169,16 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -228,13 +228,13 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reserving bike...";
 				connector.Command.DoReserve(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert("Hint", string.Format("A reservation of bike {0} was rejected because the maximum allowed number of {1} reservations/rentals had already been made.", 0, 7), "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -293,13 +293,13 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reserving bike...";
 				connector.Command.DoReserve(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Connection error when reserving the bike!", "Context info.\r\nIs WIFI/mobile network available and mobile data activated?", "OK");
+				viewService.DisplayAlert("Connection to booking system not possible.", "A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -358,13 +358,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reserving bike...";
 				connector.Command.DoReserve(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error when reserving the bike!", "Exception message.", "OK");
+				viewService.DisplayAdvancedAlert(
+					"Bike could not be reserved!",
+					"Exception message.",
+					"Please try again.",
+					"OK"
+				);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -425,20 +430,20 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reserving bike...";
 				connector.Command.DoReserve(bike); // Booking must be performed
 				bikesViewModel.ActionText = "Searching lock...";
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = "Lock out of reach";
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -493,20 +498,20 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reserving bike...";
 				connector.Command.DoReserve(bike); // Booking must be performed
 				bikesViewModel.ActionText = "Searching lock...";
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = "Lock not found";
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -560,19 +565,19 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reserving bike...";
 				connector.Command.DoReserve(bike); // Booking must be performed
 				bikesViewModel.ActionText = "Searching lock...";
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
index f253f5e..b016dad 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
@@ -42,7 +42,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				Substitute.For<IUser>());
 
 			// Verify prerequisites.
-			Assert.AreEqual("Rent bike or close lock", handler.ButtonText);
+			Assert.AreEqual("Close lock or rent bike", handler.ButtonText);
 			Assert.IsTrue(handler.IsButtonVisible);
 			Assert.AreEqual(nameof(DisposableOpen), handler.LockitButtonText);
 			Assert.IsFalse(handler.IsLockitButtonVisible);
@@ -77,7 +77,9 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel,
 				activeUser);
 
-			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Rent bike", "Close lock").Returns(Task.FromResult(false));
 
 			locks[0].CloseAsync().Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed));
 
@@ -90,13 +92,13 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = "Disconnecting lock...";
 				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -137,7 +139,9 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel,
 				activeUser);
 
-			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Rent bike", "Close lock").Returns(Task.FromResult(false));
 
 			locks[0].CloseAsync().Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
 
@@ -153,13 +157,13 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
+				viewService.DisplayAlert("Lock could not be closed!", "Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -200,7 +204,9 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel,
 				activeUser);
 
-			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(false));
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Rent bike", "Close lock").Returns(Task.FromResult(false));
 
 			locks[0].CloseAsync().Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
 
@@ -216,13 +222,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
+				viewService.DisplayAdvancedAlert(
+					"Lock could not be closed!",
+					"Exception message.",
+					"Please try again.",
+					"OK"
+				);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -265,7 +276,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			bike.Id.Returns("0");
 
-			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Rent bike", "Close lock").Returns(Task.FromResult(true));
 
 			bike.State.Value.Returns(InUseStateEnum.Booked);
 			bike.LockInfo.State.Returns(LockingState.Open);
@@ -277,27 +288,27 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
 		/// Use case: Lock bike.
-		/// Final state: Disposabled Closed.
+		/// Final state: Disposable Closed.
 		/// </summary>
 		[Test]
 		public void TestDoBookDoBookFailsWebConnectFailureException()
@@ -326,7 +337,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			bike.Id.Returns("0");
 
-			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Rent bike", "Close lock").Returns(Task.FromResult(true));
 
 			connector.Command.DoBookAsync(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("chub")));
 
@@ -341,22 +352,22 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Connection error when renting the bike!",
-					string.Format("Attention: Lock is closed!\r\n{0}\r\n{1}", "Context info.", "Is WIFI/mobile network available and mobile data activated?"),
+					"Bike could not be rented!",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
-				bikesViewModel.ActionText = "Verschließe Schloss...";
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = "Disconnecting lock...";
 				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -370,7 +381,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 		/// <summary>
 		/// Use case: Lock bike.
-		/// Final state: Disposabled Closed.
+		/// Final state: Disposable Closed.
 		/// </summary>
 		[Test]
 		public void TestDoBookDoBookFailsException()
@@ -399,7 +410,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			bike.Id.Returns("0");
 
-			viewService.DisplayAlert(string.Empty, "Fahrrad Nr. 0 mieten oder Schloss schließen?", "Mieten", "Schloss schließen").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Rent bike", "Close lock").Returns(Task.FromResult(true));
 
 			connector.Command.DoBookAsync(bike).Returns(x => throw new Exception("Exception message."));
 
@@ -414,19 +425,19 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error when renting the bike!", "Attention: Lock is closed!\r\nException message.", "OK");
-				bikesViewModel.ActionText = "Verschließe Schloss...";
+				viewService.DisplayAlert("Bike could not be rented!", "Exception message.", "OK");
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = "Disconnecting lock...";
 				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
index 41ddca3..12135d6 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
@@ -44,7 +44,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				Substitute.For<IUser>());
 
 			// Verify prerequisites.
-			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.AreEqual("Cancel reservation", handler.ButtonText);
 			Assert.IsTrue(handler.IsButtonVisible);
 			Assert.AreEqual("Open lock & rent bike", handler.LockitButtonText);
 			Assert.IsTrue(handler.IsLockitButtonVisible);
@@ -97,7 +97,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -145,13 +145,13 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Booking must be performed
 				bikesViewModel.ActionText = "Disconnecting lock...";
 				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -219,22 +219,22 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Error when canceling the reservation!",
-					"Can not login user mustermann@server.de. Mail address unknown or password invalid.",
+					"Reservation could not be canceled!",
+					"Your session has expired. Please login new and try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -287,22 +287,22 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Connection error when canceling the reservation!",
-					"Context info.\r\nIs WIFI/mobile network available and mobile data activated?",
+					"Reservation could not be canceled!",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -355,22 +355,23 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert(
-					"Error when canceling the reservation!",
+				viewService.DisplayAdvancedAlert(
+					"Reservation could not be canceled!",
 					"Exception message.",
+					"Please try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -418,7 +419,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -470,7 +471,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
@@ -480,16 +481,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -539,23 +540,22 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert(
-					"Connection error when renting the bike!",
-					"Is WIFI/mobile network available and mobile data activated?",
-					"Context info",
+				viewService.DisplayAlert(
+					"Bike could not be rented!",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state "reserved closed" after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -608,23 +608,23 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAdvancedAlert(
-					"Error when renting the bike!",
-					"",
+					"Bike could not be rented!",
+					"Please try again.",
 					"Exception message.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state "reserved closed" after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -677,21 +677,26 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
+				viewService.DisplayAdvancedAlert(
+					"Lock could not be opened!",
+					"Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.",
+					"Attention! Your rental has already started.\r\nIf the lock still won't open, make sure the lock is closed and end rental.\r\nImportant: Send an email to customer support (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.",
+					"OK"
+					);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -744,21 +749,26 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
+				viewService.DisplayAdvancedAlert(
+					"Lock could not be opened!",
+					"Please try again.",
+					"Exception message.",
+					"OK"
+				);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -810,19 +820,19 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				locks.Received()[0].OpenAsync(); // Lock must be opened
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -876,7 +886,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
@@ -887,16 +897,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -947,7 +957,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
@@ -958,16 +968,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -1018,7 +1028,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
@@ -1029,16 +1039,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Internet must be available for updating lock status. Please establish an Internet connection!";
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -1089,7 +1099,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
@@ -1100,16 +1110,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Connection error on updating locking status.";
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -1161,7 +1171,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike, LockingAction.Open); // Booking must be performed
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
@@ -1172,16 +1182,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Status error on updating lock state.";
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
index a826f89..57402f2 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
@@ -42,7 +42,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				Substitute.For<IUser>());
 
 			// Verify prerequisites.
-			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.AreEqual("Cancel reservation", handler.ButtonText);
 			Assert.IsTrue(handler.IsButtonVisible);
 			Assert.AreEqual("Search lock", handler.LockitButtonText);
 			Assert.IsTrue(handler.IsLockitButtonVisible);
@@ -93,7 +93,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -141,11 +141,11 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Booking must be performed
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -211,22 +211,22 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Error when canceling the reservation!",
-					"Can not login user mustermann@server.de. Mail address unknown or password invalid.",
+					"Reservation could not be canceled!",
+					"Your session has expired. Please login new and try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -277,22 +277,22 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Connection error when canceling the reservation!",
-					"Context info\r\nIs WIFI/mobile network available and mobile data activated?",
+					"Reservation could not be canceled!",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -343,22 +343,23 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert(
-					"Error when canceling the reservation!",
+				viewService.DisplayAdvancedAlert(
+					"Reservation could not be canceled!",
 					"Exception message.",
+					"Please try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -415,7 +416,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				connector.Command.CalculateAuthKeys(bike);
 				bikesViewModel.ActionText = "Searching lock...";
@@ -430,16 +431,16 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel.ActionText = "Updating lock state...";
 				connector.Command.UpdateLockingStateAsync(bike, null);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -483,18 +484,22 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error when connecting to lock!", "Internet must be reachable to connect to lock of reserved bike. Please establish an Internet connection!\r\nContext info.\r\nIs WIFI/mobile network available and mobile data activated?", "OK");
+				viewService.DisplayAlert(
+					"Connection to booking system not possible.",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
+					"OK"
+				);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.AreEqual("Cancel reservation", handler.ButtonText);
 			Assert.IsTrue(handler.IsButtonVisible);
 			Assert.AreEqual("Search lock", handler.LockitButtonText);
 			Assert.IsTrue(handler.IsLockitButtonVisible);
@@ -541,18 +546,23 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error when connecting to lock!", "Communication error during lock search.\r\nException message.", "OK");
+				viewService.DisplayAdvancedAlert(
+					"Connection to the lock could not be established.",
+					"Exception message.",
+					"Please step as close as possible to the bike lock and try again.",
+					"OK"
+				);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.AreEqual("Cancel reservation", handler.ButtonText);
 			Assert.IsTrue(handler.IsButtonVisible);
 			Assert.AreEqual("Search lock", handler.LockitButtonText);
 			Assert.IsTrue(handler.IsLockitButtonVisible);
@@ -601,25 +611,24 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				connector.Command.CalculateAuthKeys(bike);
 				bikesViewModel.ActionText = "Searching lock...";
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Error when connecting to lock!",
-					"Lock can only be found when reserved bike is nearby.",
-					"Retry",
-					"Cancel");
+					"Connection to the lock could not be established.",
+					"Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.",
+					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.AreEqual("Cancel reservation", handler.ButtonText);
 			Assert.IsTrue(handler.IsButtonVisible);
 			Assert.AreEqual("Search lock", handler.LockitButtonText);
 			Assert.IsTrue(handler.IsLockitButtonVisible);
@@ -669,26 +678,26 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				connector.Command.CalculateAuthKeys(bike);
 				bikesViewModel.ActionText = "Searching lock...";
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAdvancedAlert(
-					"Error when connecting to lock!",
-					"Your mobile device does not connect to the bike lock. Please step as close as possible to the bike and try again.",
+					"Connection to the lock could not be established.",
+					"Please step as close as possible to the bike lock and try again.",
 					"",
 					"Retry",
 					"Cancel");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.AreEqual("Cancel reservation", handler.ButtonText);
 			Assert.IsTrue(handler.IsButtonVisible);
 			Assert.AreEqual("Search lock", handler.LockitButtonText);
 			Assert.IsTrue(handler.IsLockitButtonVisible);
@@ -737,21 +746,21 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Request server...";
 				connector.Command.CalculateAuthKeys(bike);
 				bikesViewModel.ActionText = "Searching lock...";
 				locks.ConnectAsync(Arg.Any<LockInfoAuthTdo>(), Arg.Any<TimeSpan>());
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error when connecting to lock!", "Lock status of the reserved bike could not be determined.", "OK");
+				viewService.DisplayAlert("Connection to the lock could not be established.", "Lock status could not be determined. Please contact customer support.", "OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", handler.ButtonText);
+			Assert.AreEqual("Cancel reservation", handler.ButtonText);
 			Assert.IsTrue(handler.IsButtonVisible);
 			Assert.AreEqual("Search lock", handler.LockitButtonText);
 			Assert.IsTrue(handler.IsLockitButtonVisible);
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
index 5289f10..f354269 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
@@ -43,7 +43,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				Substitute.For<IUser>());
 
 			// Verify prerequisites.
-			Assert.AreEqual("Rad zurückgeben oder mieten", handler.ButtonText);
+			Assert.AreEqual("Close lock or rent bike", handler.ButtonText);
 			Assert.IsTrue(handler.IsButtonVisible);
 			Assert.AreEqual("Alarm/ Sounds verwalten", handler.LockitButtonText);
 			Assert.IsFalse(handler.IsLockitButtonVisible);
@@ -78,7 +78,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel,
 				activeUser);
 
-			viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Close lock", "Rent bike").Returns(Task.FromResult(false));
 
 			bike.State.Value.Returns(InUseStateEnum.Booked); // Requesthandler factory queries state to create appropriate request handler object.
 			bike.LockInfo.State.Returns(LockingState.Open); // Requesthandler factory queries lock state to create appropriate request handler object.
@@ -90,22 +90,22 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
 		}
 
 		/// <summary>
@@ -137,7 +137,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel,
 				activeUser);
 
-			viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Close lock", "Rent bike").Returns(Task.FromResult(false));
 
 			connector.Command.DoBookAsync(bike).Returns(x => throw new WebConnectFailureException("Context info.", new Exception("Tst")));
 
@@ -152,26 +152,26 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Connection error when renting the bike!",
-					string.Format("Attention: Lock is closed!\r\n{0}\r\n{1}", "Context info.", "Is WIFI/mobile network available and mobile data activated?"),
+					"Bike could not be rented!",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
-				bikesViewModel.ActionText = "Wiederverschließe Schloss...";
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -206,7 +206,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bikesViewModel,
 				activeUser);
 
-			viewService.DisplayAlert(string.Empty, "Rad Nr. 0  abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(false));
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Close lock", "Rent bike").Returns(Task.FromResult(false));
 
 			connector.Command.DoBookAsync(bike).Returns(x => throw new Exception("Exception message."));
 
@@ -221,23 +221,27 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reading charging level...";
 				locks[0].GetBatteryPercentageAsync();
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.DoBookAsync(bike);
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert("Error when renting the bike!", "Attention: Lock is closed!\r\nException message.", "OK");
-				bikesViewModel.ActionText = "Wiederverschließe Schloss...";
+				viewService.DisplayAdvancedAlert(
+					"Bike could not be rented!",
+					"Exception message.",
+					"Please try again.",
+					"OK");
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -274,7 +278,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			bike.Id.Returns("0");
 
-			viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Close lock", "Rent bike").Returns(Task.FromResult(true));
 
 			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
@@ -287,15 +291,15 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike);
 				bikesViewModel.ActionText = "Disconnecting lock...";
 				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -339,10 +343,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			bike.Id.Returns("0");
 
 			viewService.DisplayAlert(
-				string.Empty,
-				"Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?",
-				"Zurückgeben",
-				"Mieten").Returns(Task.FromResult(true));
+				string.Empty, "Close lock or rent bike Nr. 0?", "Close lock", "Rent bike").Returns(Task.FromResult(true));
 
 			locks[0].CloseAsync()
 				.Returns<Task<LockitLockingState?>>(x => { throw new OutOfReachException(); });
@@ -359,23 +360,23 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Lock can not be closed!",
-					"Lock cannot be closed until bike is near.\r\nPlease try again to close bike or report bike to operator!",
+					"Lock could not be closed!",
+					"Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.",
 					"OK");
 
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -413,10 +414,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			bike.Id.Returns("0");
 
 			viewService.DisplayAlert(
-				string.Empty,
-				"Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?",
-				"Zurückgeben",
-				"Mieten").Returns(Task.FromResult(true));
+				string.Empty, "Close lock or rent bike Nr. 0?", "Close lock", "Rent bike").Returns(Task.FromResult(true));
 
 			locks[0].CloseAsync()
 				.Returns<Task<LockitLockingState?>>(x => { throw new Exception("Exception message."); });
@@ -433,22 +431,22 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Lock can not be closed!",
-					"Please try to lock again or report bike to operator!\r\nException message.",
+					"Lock could not be closed!",
+					"Step close to the lock and try again or report bike to operator!\r\nException message.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state after action
-			Assert.AreEqual("Cancel bike reservation", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
 			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
@@ -494,7 +492,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			bike.Id.Returns("0");
 
-			viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Close lock", "Rent bike").Returns(Task.FromResult(true));
 
 			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
@@ -511,18 +509,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike);
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Error when canceling the reservation!",
-					"Can not login user mustermann@server.de. Mail address unknown or password invalid.",
+					"Reservation could not be canceled!",
+					"Your session has expired. Please login new and try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -565,7 +563,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			bike.Id.Returns("0");
 
-			viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Close lock", "Rent bike").Returns(Task.FromResult(true));
 
 			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
@@ -582,18 +580,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike);
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Connection error when canceling the reservation!",
-					"Context info\r\nIs WIFI/mobile network available and mobile data activated?",
+					"Reservation could not be canceled!",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -636,7 +634,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			bike.Id.Returns("0");
 
-			viewService.DisplayAlert(string.Empty, "Rad Nr. 0 abschließen und zurückgeben oder Rad mieten?", "Zurückgeben", "Mieten").Returns(Task.FromResult(true));
+			viewService.DisplayAlert(string.Empty, "Close lock or rent bike Nr. 0?", "Close lock", "Rent bike").Returns(Task.FromResult(true));
 
 			locks[0].CloseAsync().Returns(LockitLockingState.Closed);
 
@@ -653,18 +651,19 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				locks[0].CloseAsync();
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike);
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAlert(
-					"Error when canceling the reservation!",
+				viewService.DisplayAdvancedAlert(
+					"Reservation could not be canceled!",
 					"Exception message.",
+					"Please try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs
index 9783bbc..c51b775 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs
@@ -4,6 +4,7 @@ using Newtonsoft.Json;
 using NSubstitute;
 using NUnit.Framework;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command;
 using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.State;
@@ -19,82 +20,80 @@ using TINK.View;
 using TINK.ViewModel;
 using TINK.ViewModel.Bikes;
 using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.CloseCommand;
 
 namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
+	[TestFixture]
 	public class TestReservedUnknown
 	{
-		[TestFixture]
-		public class TestBookedUnknown
+		/// <summary>
+		/// Test construction of object.
+		/// </summary>
+		[Test]
+		public void Testctor()
 		{
+			var handler = new ReservedUnknown(
+				Substitute.For<IBikeInfoMutable>(),
+				() => true, // isConnectedDelegate
+				(isConnexted) => Substitute.For<IConnector>(),
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
+				Substitute.For<ISmartDevice>(),
+				Substitute.For<IViewService>(),
+				Substitute.For<IBikesViewModel>(),
+				Substitute.For<IUser>());
 
-			/// <summary>
-			/// Test construction of object.
-			/// </summary>
-			[Test]
-			public void Testctor()
-			{
-				var handler = new ReservedUnknown(
-					Substitute.For<IBikeInfoMutable>(),
-					() => true, // isConnectedDelegate
-					(isConnexted) => Substitute.For<IConnector>(),
-					Substitute.For<IGeolocationService>(),
-					Substitute.For<ILocksService>(),
-					() => Substitute.For<IPollingUpdateTaskManager>(),
-					Substitute.For<ISmartDevice>(),
-					Substitute.For<IViewService>(),
-					Substitute.For<IBikesViewModel>(),
-					Substitute.For<IUser>());
+			// Verify prerequisites.
+			Assert.AreEqual("Open lock & rent bike", handler.ButtonText);
+			Assert.IsFalse(handler.IsButtonVisible);
+			Assert.AreEqual("Close lock", handler.LockitButtonText);
+			Assert.IsTrue(handler.IsLockitButtonVisible);
+		}
 
-				// Verify prerequisites.
-				Assert.AreEqual("Open lock & rent bike", handler.ButtonText);
-				Assert.IsFalse(handler.IsButtonVisible);
-				Assert.AreEqual("Close lock", handler.LockitButtonText);
-				Assert.IsTrue(handler.IsLockitButtonVisible);
-			}
+		/// <summary>
+		/// Use case: Opens lock
+		/// Final state: Booked opened.
+		/// </summary>
+		[Test]
+		public void TestOpen()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-			/// <summary>
-			/// Use case: Opens lock
-			/// Final state: Booked opened.
-			/// </summary>
-			[Test]
-			public void TestOpen()
-			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
+			locks[0].OpenAsync()
+				.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
 
-				locks[0].OpenAsync()
-					.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Open)); // Return lock state indicating success
+			bike.State.Value.Returns(InUseStateEnum.Booked);
 
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-
-				var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 					bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 					locks.Received()[0].OpenAsync(); // Lock must be closed
 					bikesViewModel.ActionText = "Reading charging level...";
@@ -102,363 +101,387 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					bikesViewModel.ActionText = "Updating lock state...";
 					connector.Command.UpdateLockingStateAsync(bike, null);
 					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					pollingManager.StartAsync(); // polling must be restarted again
 					bikesViewModel.ActionText = string.Empty;
 					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 				});
 
-				// Verify state "Booked Open" after action
-				Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
-				Assert.IsTrue(subsequent.IsButtonVisible);
-				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
-			}
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
+		}
 
-			/// <summary>
-			/// Use case: Open lock
-			/// Final state: Same as initial state.
-			/// </summary>
-			[Test]
-			public void TestOpenOpenFailsOutOfReachException()
-			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-				locks[0].OpenAsync()
-					.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
 
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-				bike.LockInfo.State.Returns(LockingState.Closed);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
 
-				var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 					bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 					locks.Received()[0].OpenAsync(); // Lock must be closed
 					bikesViewModel.ActionText = string.Empty;
-					viewService.DisplayAlert("Error while opening lock!", "Lock cannot be opened until bike is near.", "OK");
+					viewService.DisplayAdvancedAlert(
+						"Lock could not be opened!",
+						"Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.",
+						"Attention! Your rental has already started.\r\nIf the lock still won't open, make sure the lock is closed and end rental.\r\nImportant: Send an email to customer support (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.",
+						"OK"
+					);
 					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					pollingManager.StartAsync(); // polling must be restarted again
 					bikesViewModel.ActionText = string.Empty;
 					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 				});
 
-				// Verify state "Booked Disconnected" after action
-				Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
-				Assert.IsFalse(subsequent.IsButtonVisible);
-				Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
-			}
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-			/// <summary>
-			/// Use case: Open lock
-			/// Final state: Same as initial state.
-			/// </summary>
-			[Test]
-			public void TestOpenOpenFailsCouldntOpenBoldBlockedException()
-			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsCouldntOpenBoltBlockedException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-				locks[0].OpenAsync()
-					.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldIsBlockedException());
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldIsBlockedException());
 
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-				bike.LockInfo.State.Returns(LockingState.Closed);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
 
-				var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 					bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 					locks.Received()[0].OpenAsync(); // Lock must be closed
 					bikesViewModel.ActionText = string.Empty;
-					viewService.DisplayAlert("Error while opening lock!", "Ensure that no obstacle prevents lock from opening and try again.", "OK");
+					viewService.DisplayAdvancedAlert(
+						"Lock could not be opened!",
+						"Lock bolt is blocked. Make sure that no spoke presses against the lock bolt and try again.",
+						"Attention! Your rental has already started.\r\nIf the lock still won't open, make sure the lock is closed and end rental.\r\nImportant: Send an email to customer support (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.",
+						"OK"
+						);
 					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					pollingManager.StartAsync(); // polling must be restarted again
 					bikesViewModel.ActionText = string.Empty;
 					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 				});
 
-				// Verify state "Booked Unknown" after action
-				Assert.AreEqual("Open lock", subsequent.ButtonText);
-				Assert.IsTrue(subsequent.IsButtonVisible);
-				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
-			}
+			// Verify state "Booked Unknown" after action
+			Assert.AreEqual("Open lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-			/// <summary>
-			/// Use case: Open lock
-			/// Final state: Same as initial state.
-			/// </summary>
-			[Test]
-			public void TestOpenOpenFailsCouldntOpenInconsistentStateExecptionClosed()
-			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsCouldntOpenInconsistentStateExecptionClosed()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-				locks[0].OpenAsync()
-					.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenInconsistentStateExecption(LockingState.Closed));
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenInconsistentStateExecption(LockingState.Closed));
 
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-				bike.LockInfo.State.Returns(LockingState.Closed);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
 
-				var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 					bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 					locks.Received()[0].OpenAsync(); // Lock must be closed
 					bikesViewModel.ActionText = string.Empty;
-					viewService.DisplayAlert("Error while opening lock!", "After try to open lock state closed is reported.", "OK");
+					viewService.DisplayAdvancedAlert(
+						"Lock could not be opened!",
+						"Lock reports it is still closed. Please try again!",
+						"Attention! Your rental has already started.\r\nIf the lock still won't open, make sure the lock is closed and end rental.\r\nImportant: Send an email to customer support (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.",
+						"OK"
+					);
 					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					pollingManager.StartAsync(); // polling must be restarted again
 					bikesViewModel.ActionText = string.Empty;
 					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 				});
 
-				// Verify state "Booked Closed" after action
-				//Assert.AreEqual("End rental", subsequent.ButtonText);
-				//Assert.IsTrue(subsequent.IsButtonVisible);
-				Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
-			}
+			// Verify state "Booked Closed" after action
+			//Assert.AreEqual("End rental", subsequent.ButtonText);
+			//Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-			/// <summary>
-			/// Use case: Open lock
-			/// Final state: Same as initial state.
-			/// </summary>
-			[Test]
-			public void TestOpenOpenFailsCouldntOpenInconsistentStateExecption()
-			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsCouldntOpenInconsistentStateExecption()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-				locks[0].OpenAsync()
-					.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldStatusIsUnknownException());
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new CouldntOpenBoldStatusIsUnknownException());
 
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-				bike.LockInfo.State.Returns(LockingState.Closed);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
 
-				var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 					bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 					locks.Received()[0].OpenAsync(); // Lock must be closed
 					bikesViewModel.ActionText = string.Empty;
-					viewService.DisplayAlert("Lock can not be opened!", "The lock could not be opened correctly. Try again!\r\n\r\nAttention! Your rental has already started.\r\nIf the lock still won't open, make sure the lock is closed and end rental.\r\nImportant: Send an email to the operator (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.", "OK");
+					viewService.DisplayAdvancedAlert(
+						"Lock could not be opened!",
+						"Position of lock bolt is unknown. Lock could be closed or open. Please try again!",
+						"Attention! Your rental has already started.\r\nIf the lock still won't open, make sure the lock is closed and end rental.\r\nImportant: Send an email to customer support (otherwise your paid rental will continue!) with: Problem description, bike number, drop-off station.",
+						"OK");
 					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					pollingManager.StartAsync(); // polling must be restarted again
 					bikesViewModel.ActionText = string.Empty;
 					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 				});
 
-				// Verify state "Booked Disconnected" after action
-				Assert.AreEqual("Open lock", subsequent.ButtonText);
-				Assert.IsTrue(subsequent.IsButtonVisible);
-				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
-			}
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual("Open lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Close lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-			/// <summary>
-			/// Use case: Open lock
-			/// Final state: Same as initial state.
-			/// </summary>
-			[Test]
-			public void TestOpenOpenFailsException()
-			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestOpenOpenFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-				locks[0].OpenAsync()
-					.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
+			locks[0].OpenAsync()
+				.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
 
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-				bike.LockInfo.State.Returns(LockingState.Closed);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed);
 
-				var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 					bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 					locks.Received()[0].OpenAsync(); // Lock must be closed
 					bikesViewModel.ActionText = string.Empty;
-					viewService.DisplayAlert("Error while opening lock!", "Exception message.", "OK");
+					viewService.DisplayAdvancedAlert(
+						"Lock could not be opened!",
+						"Exception message.",
+						"Please try again.",
+						"OK"
+					);
 					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					pollingManager.StartAsync(); // polling must be restarted again
 					bikesViewModel.ActionText = string.Empty;
 					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 				});
 
-				// Verify state "Booked Disconnected" after action
-				Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
-				Assert.IsFalse(subsequent.IsButtonVisible);
-				Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
-			}
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual(nameof(BookedDisconnected), subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-			/// <summary>
-			/// Use case: Open lock
-			/// Final state: Booked open.
-			/// </summary>
-			[Test]
-			public void TestOpenUpdateLockingStateFailsWebConnectFailureException()
-			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestOpenUpdateLockingStateFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-				locks[0].OpenAsync()
-					.Returns(LockitLockingState.Open);
+			locks[0].OpenAsync()
+				.Returns(LockitLockingState.Open);
 
-				connector.Command.UpdateLockingStateAsync(bike, null).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
+			connector.Command.UpdateLockingStateAsync(bike, null).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
 
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-				bike.LockInfo.State.Returns(LockingState.Open);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
 
-				var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 					bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 					locks.Received()[0].OpenAsync(); // Lock must be closed
 					bikesViewModel.ActionText = "Reading charging level...";
@@ -467,63 +490,63 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					connector.Command.UpdateLockingStateAsync(bike, null);
 					bikesViewModel.ActionText = "Internet must be available for updating lock status. Please establish an Internet connection!";
 					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					pollingManager.StartAsync(); // polling must be restarted again
 					bikesViewModel.ActionText = string.Empty;
 					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 				});
 
-				// Verify state "Booked Open" after action
-				Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
-				Assert.IsTrue(subsequent.IsButtonVisible);
-				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
-			}
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
+		}
 
-			/// <summary>
-			/// Use case: Open lock
-			/// Final state: Booked open.
-			/// </summary>
-			[Test]
-			public void TestOpenUpdateLockingStateFailsException()
-			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestOpenUpdateLockingStateFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-				locks[0].OpenAsync()
-					.Returns(LockitLockingState.Open);
+			locks[0].OpenAsync()
+				.Returns(LockitLockingState.Open);
 
-				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
 
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-				bike.LockInfo.State.Returns(LockingState.Open);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
 
-				var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 					bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 					locks.Received()[0].OpenAsync(); // Lock must be closed
 					bikesViewModel.ActionText = "Reading charging level...";
@@ -532,64 +555,64 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 					bikesViewModel.ActionText = "Connection error on updating locking status.";
 					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					pollingManager.StartAsync(); // polling must be restarted again
 					bikesViewModel.ActionText = string.Empty;
 					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 				});
 
-				// Verify state "Booked Open" after action
-				Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
-				Assert.IsTrue(subsequent.IsButtonVisible);
-				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
-			}
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
+		}
 
-			/// <summary>
-			/// Use case: Open lock
-			/// Final state: Booked open.
-			/// </summary>
-			[Test]
-			public void TestOpenUpdateLockingStateFailsResponseException()
-			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
+		/// <summary>
+		/// Use case: Open lock
+		/// Final state: Booked open.
+		/// </summary>
+		[Test]
+		public void TestOpenUpdateLockingStateFailsResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-				locks[0].OpenAsync()
-					.Returns(LockitLockingState.Open);
+			locks[0].OpenAsync()
+				.Returns(LockitLockingState.Open);
 
-				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
-					throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
+				throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
 
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-				bike.LockInfo.State.Returns(LockingState.Open);
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Open);
 
-				var subsequent = handler.HandleRequestOption1().Result;
+			var subsequent = handler.HandleRequestOption1().Result;
 
 				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+					pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 					bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 					locks.Received()[0].OpenAsync(); // Lock must be closed
 					bikesViewModel.ActionText = "Reading charging level...";
@@ -598,192 +621,211 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 					bikesViewModel.ActionText = "Status error on updating lock state.";
 					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+					pollingManager.StartAsync(); // polling must be restarted again
 					bikesViewModel.ActionText = string.Empty;
 					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 				});
 
-				// Verify state "Booked Open" after action
-				Assert.AreEqual("Close lock & end rental", subsequent.ButtonText);
-				Assert.IsTrue(subsequent.IsButtonVisible);
-				Assert.AreEqual("Close lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
-			}
+			// Verify state after action
+			Assert.AreEqual("Close lock", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual(string.Empty, subsequent.LockitButtonText);
+			Assert.That(subsequent.IsLockitButtonVisible, Is.False);
+		}
 
-			/// <summary>
-			/// Use case: Close lock
-			/// Final state: Booked closed.
-			/// </summary>
-			[Test]
-			public void TestClose()
+		/// <summary>
+		/// Use case: Close lock
+		/// Final state: Booked closed.
+		/// </summary>
+		[Test]
+		public void TestClose()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
+
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>()).Returns(x =>
 			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
-
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
-
-				locks[0].CloseAsync()
-					.Returns(Task.FromResult((LockitLockingState?)LockitLockingState.Closed)); // Return lock state indicating success
-
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-
-				var subsequent = handler.HandleRequestOption2().Result;
-
-				// Verify behavior
-				Received.InOrder(() =>
-				{
-					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-					bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-					locks.Received()[0].CloseAsync(); // Lock must be closed
-					bikesViewModel.ActionText = "Updating lock state...";
-					connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
-					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-					bikesViewModel.ActionText = string.Empty;
-					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-				});
-
-				// Verify state "Booked Closed" after action
-				Assert.AreEqual("End rental", subsequent.ButtonText);
-				Assert.IsTrue(subsequent.IsButtonVisible);
-				Assert.AreEqual("Open lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+				// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+				handler.ReportStep(Step.ClosingLock);
+				handler.ReportStep(Step.UpdateLockingState);
+				return Task.CompletedTask;
 			}
+			);
 
-			[Test]
-			public void TestCloseCloseFailsOutOfReachException()
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.Closed); // Return lock state indicating success
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behavior
+			Received.InOrder(() =>
 			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
+				bikesViewModel.ActionText = "Updating lock state...";
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
+			// Verify state "Booked Closed" after action
+			Assert.AreEqual("End rental", subsequent.ButtonText);
+			Assert.IsTrue(subsequent.IsButtonVisible);
+			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-				locks[0].CloseAsync()
-					.Returns<Task<LockitLockingState?>>(x => throw new OutOfReachException());
+		[Test]
+		public void TestCloseCloseFailsOutOfReachException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-				bike.LockInfo.State.Returns(LockingState.Open);
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-				var subsequent = handler.HandleRequestOption2().Result;
-
-				// Verify behavior
-				Received.InOrder(() =>
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>())
+				.Returns(async x =>
 				{
-					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-					bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-					locks.Received()[0].CloseAsync(); // Lock must be closed
-					bikesViewModel.ActionText = string.Empty;
-					viewService.DisplayAlert("Lock can not be closed!", "Lock cannot be closed until bike is near.", "OK");
-					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-					bikesViewModel.ActionText = string.Empty;
-					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-				});
+					// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+					handler.ReportStep(Step.ClosingLock);
+					await handler.ReportStateAsync(CloseCommand.State.OutOfReachError, "");
+					throw new OutOfReachException();
+				}
+				);
 
-				// Verify state "Booked disconnected" after action
-				Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-				Assert.IsFalse(subsequent.IsButtonVisible);
-				Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
-			}
+			bike.State.Value.Returns(InUseStateEnum.Reserved);
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); /// If <see cref="OutOfReachException"/> is fired lock state is set to state unknown because disconnected.
 
-			/// <summary>
-			/// Use case: Close lock
-			/// Final state: Same as initial state.
-			/// </summary>
-			[Test]
-			public void TestCloseCloseFailsException()
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behavior
+			Received.InOrder(() =>
 			{
-				var bike = Substitute.For<IBikeInfoMutable>();
-				var connector = Substitute.For<IConnector>();
-				var command = Substitute.For<ICommand>();
-				var geolocation = Substitute.For<IGeolocationService>();
-				var locks = Substitute.For<ILocksService>();
-				var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
-				var viewService = Substitute.For<IViewService>();
-				var bikesViewModel = Substitute.For<IBikesViewModel>();
-				var activeUser = Substitute.For<IUser>();
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
+				bikesViewModel.ActionText = string.Empty;
+				viewService.DisplayAlert("Lock could not be closed!", "Make sure you have granted Bluetooth permission to the app. Step as close as possible to the bike lock and try again.", "OK");
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartAsync(); // polling must be restarted again
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
 
-				var handler = new ReservedUnknown(
-					bike,
-					() => true, // isConnectedDelegate
-					(isConnexted) => connector,
-					geolocation,
-					locks,
-					() => pollingManager,
-					Substitute.For<ISmartDevice>(),
-					viewService,
-					bikesViewModel,
-					activeUser);
+			// Verify state "Booked disconnected" after action
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
+			Assert.That(subsequent.IsButtonVisible, Is.True);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
+		}
 
-				locks[0].CloseAsync()
-					.Returns<Task<LockitLockingState?>>(x => throw new Exception("Exception message."));
+		/// <summary>
+		/// Use case: Close lock
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public void TestCloseCloseFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
 
-				bike.State.Value.Returns(InUseStateEnum.Booked);
-				bike.LockInfo.State.Returns(LockingState.Open);
+			var handler = new ReservedUnknown(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				geolocation,
+				locks,
+				() => pollingManager,
+				Substitute.For<ISmartDevice>(),
+				viewService,
+				bikesViewModel,
+				activeUser);
 
-				var subsequent = handler.HandleRequestOption2().Result;
-
-				// Verify behavior
-				Received.InOrder(() =>
-				{
-					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
-					bikesViewModel.ActionText = "One moment please...";
-					pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-					bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-					locks.Received()[0].CloseAsync(); // Lock must be closed
-					bikesViewModel.ActionText = string.Empty;
-					viewService.DisplayAlert("Lock can not be closed!", "Exception message.", "OK");
-					bikesViewModel.ActionText = "Updating...";
-					pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
-					bikesViewModel.ActionText = string.Empty;
-					bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
-				});
-
-				// Verify state "Booked Disconnected" after action
-				Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
-				Assert.IsFalse(subsequent.IsButtonVisible);
-				Assert.AreEqual("Search lock", subsequent.LockitButtonText);
-				Assert.IsTrue(subsequent.IsLockitButtonVisible);
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>()).Returns(async x =>
+			{
+				// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+				handler.ReportStep(Step.ClosingLock);
+				await handler.ReportStateAsync(CloseCommand.State.GeneralCloseError, "Exception message.");
+				throw new Exception("Exception message.");
 			}
+			);
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.LockInfo.State.Returns(LockingState.UnknownDisconnected); // If CloseLock fires an exception of type Exception lock state is set to unknown.
+
+			var subsequent = handler.HandleRequestOption2().Result;
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
+				bikesViewModel.ActionText = string.Empty;
+				viewService.DisplayAlert(
+					"Lock could not be closed!",
+					"Exception message.",
+					"OK"
+				);
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartAsync(); // polling must be restarted again
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state "Booked Disconnected" after action
+			Assert.AreEqual("BookedDisconnected", subsequent.ButtonText);
+			Assert.IsFalse(subsequent.IsButtonVisible);
+			Assert.AreEqual("Search lock", subsequent.LockitButtonText);
+			Assert.IsTrue(subsequent.IsLockitButtonVisible);
 		}
 
 		/// <summary>
@@ -815,12 +857,17 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel,
 				activeUser);
 
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>()).Returns(async x =>
+			{
+				// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+				handler.ReportStep(Step.ClosingLock);
+				handler.ReportStep(Step.UpdateLockingState);
+				await handler.ReportStateAsync(State.WebConnectFailed, "Context info");
+			}
+			);
 
-			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new WebConnectFailureException("Context info", new System.Exception("hoppla")));
-
-			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.State.Value.Returns(InUseStateEnum.Reserved);
+			bike.LockInfo.State.Returns(LockingState.Closed);
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
@@ -829,22 +876,20 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				bikesViewModel.ActionText = "Updating lock state...";
-				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Internet must be available for updating lock status. Please establish an Internet connection!";
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state "Booked Closed" after action
-			Assert.AreEqual("End rental", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
 		}
 
@@ -877,12 +922,18 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel,
 				activeUser);
 
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>())
+					.Returns(async x =>
+					{
+						// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+						handler.ReportStep(Step.ClosingLock);
+						handler.ReportStep(Step.UpdateLockingState);
+						await handler.ReportStateAsync(CloseCommand.State.BackendUpdateFailed, "Exception message.");
+					}
+				);
 
-			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x => throw new Exception("Exception message."));
-
-			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.State.Value.Returns(InUseStateEnum.Reserved);
+			bike.LockInfo.State.Returns(LockingState.Closed);
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
@@ -891,22 +942,20 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				bikesViewModel.ActionText = "Updating lock state...";
-				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Connection error on updating locking status.";
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state "Booked Closed" after action
-			Assert.AreEqual("End rental", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
 		}
 
@@ -939,13 +988,18 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				bikesViewModel,
 				activeUser);
 
-			locks[0].CloseAsync()
-				.Returns(LockitLockingState.Closed); // Return lock state indicating success
+			bike.CloseLockAsync(Arg.Any<ICloseCommandListener>(), Arg.Any<Task>())
+				.Returns(async x =>
+				{
+					// Add calls to ReportStep which IBikeInfoMutable implementation would do.
+					handler.ReportStep(Step.ClosingLock);
+					handler.ReportStep(Step.UpdateLockingState);
+					await handler.ReportStateAsync(CloseCommand.State.ResponseIsInvalid, "Some invalid data received");
+				}
+				);
 
-			connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>()).Returns(x =>
-				throw new ReturnBikeException(JsonConvert.DeserializeObject<ReservationCancelReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
-
-			bike.State.Value.Returns(InUseStateEnum.Booked);
+			bike.State.Value.Returns(InUseStateEnum.Reserved);
+			bike.LockInfo.State.Returns(LockingState.Closed);
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
@@ -954,22 +1008,20 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
-				bikesViewModel.ActionText = "<h4><b>Lock is closing.<br/>Please wait until it is completely closed.</b></h4>";
-				locks.Received()[0].CloseAsync(); // Lock must be closed
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Stay with the bike until the lock is closed.";
 				bikesViewModel.ActionText = "Updating lock state...";
-				connector.Command.UpdateLockingStateAsync(bike, Arg.Any<LocationDto>());
 				bikesViewModel.ActionText = "Status error on updating lock state.";
-				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
 
 			// Verify state "Booked Closed" after action
-			Assert.AreEqual("End rental", subsequent.ButtonText);
+			Assert.AreEqual("Cancel reservation", subsequent.ButtonText);
 			Assert.IsTrue(subsequent.IsButtonVisible);
-			Assert.AreEqual("Open lock", subsequent.LockitButtonText);
+			Assert.AreEqual("Open lock & rent bike", subsequent.LockitButtonText);
 			Assert.IsTrue(subsequent.IsLockitButtonVisible);
 		}
 	}
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs
index e4e9ede..e14a311 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs
@@ -1,14 +1,19 @@
 using System;
 using System.Collections.Generic;
+using NSubstitute;
 using NUnit.Framework;
 using TestFramework.Model.Services.Geolocation;
 using TestFramework.Services.BluetoothLock;
 using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.State;
 using TINK.Model.User;
+using TINK.Services.BluetoothLock;
+using TINK.Services.Geolocation;
+using TINK.ViewModel;
 using TINK.ViewModel.Bikes;
 using TINK.ViewModel.Bikes.Bike.BluetoothLock;
 using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
@@ -26,6 +31,11 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 		{
 			// Verify handler for disposable bike.
 			var bike = new BikeInfoMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
 				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri, 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "12"),
 				"My Station Name");
 			Assert.AreEqual(InUseStateEnum.Disposable, bike.State.Value);
@@ -39,13 +49,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					new GeolocationMock(), // geolocation
 					new LocksServiceMock(), // LockService
 					null, // viewUpdateManager
-					NSubstitute.Substitute.For<ISmartDevice>(),
+					Substitute.For<ISmartDevice>(),
 					null /* viewService */ ,
-					NSubstitute.Substitute.For<IBikesViewModel>(),
-					NSubstitute.Substitute.For<IUser>()).GetType());
+					Substitute.For<IBikesViewModel>(),
+					Substitute.For<IUser>()).GetType());
 
 			// Verify handler for requested bike with state unknown.
 			bike = new BikeInfoMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
 				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri, 0 /* lock Id */, new Guid(), /*K User*/ null, /*K Admin*/ null, /*K Seed*/  null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
 				"My Station Name");
 			Assert.AreEqual(
@@ -57,13 +72,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					new GeolocationMock(), // geolocation
 					new LocksServiceMock(), // LockService
 					null, // viewUpdateManager
-					NSubstitute.Substitute.For<ISmartDevice>(),
+					Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					NSubstitute.Substitute.For<IBikesViewModel>(),
-					NSubstitute.Substitute.For<IUser>()).GetType());
+					Substitute.For<IBikesViewModel>(),
+					Substitute.For<IUser>()).GetType());
 
 			// Verify handler for requested bike with state closed.
 			bike = new BikeInfoMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
 				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri, 0 /* lock Id*/, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
 				"My Station Name");
 			bike.LockInfo.State = LockingState.Closed;
@@ -76,13 +96,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					new GeolocationMock(), // geolocation
 					new LocksServiceMock(), // LockService
 					null, // viewUpdateManager
-					NSubstitute.Substitute.For<ISmartDevice>(),
+					Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					NSubstitute.Substitute.For<IBikesViewModel>(),
-					NSubstitute.Substitute.For<IUser>()).GetType());
+					Substitute.For<IBikesViewModel>(),
+					Substitute.For<IUser>()).GetType());
 
 			// Verify handler for requested bike with state open.
 			bike = new BikeInfoMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
 				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri, 0 /* lock Id*/, new Guid(), null /* user key */, null, null, new DateTime(2020, 1, 1), "a@b.com", "12", null, null, () => new DateTime(2020, 1, 1), false, new List<string>()),
 				"My Station Name");
 			bike.LockInfo.State = LockingState.Open;
@@ -95,13 +120,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					new GeolocationMock(), // geolocation
 					new LocksServiceMock(), // LockService
 					null, // viewUpdateManager
-					NSubstitute.Substitute.For<ISmartDevice>(),
+					Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					NSubstitute.Substitute.For<IBikesViewModel>(),
-					NSubstitute.Substitute.For<IUser>()).GetType());
+					Substitute.For<IBikesViewModel>(),
+					Substitute.For<IUser>()).GetType());
 
 			// Verify handler for booked bike with state closed.
 			bike = new BikeInfoMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
 				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri, 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
 				"My Station Name");
 			bike.LockInfo.State = LockingState.Closed;
@@ -114,13 +144,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					new GeolocationMock(), // geolocation
 					new LocksServiceMock(), // LockService
 					null, // viewUpdateManager
-					NSubstitute.Substitute.For<ISmartDevice>(),
+					Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					NSubstitute.Substitute.For<IBikesViewModel>(),
-					NSubstitute.Substitute.For<IUser>()).GetType());
+					Substitute.For<IBikesViewModel>(),
+					Substitute.For<IUser>()).GetType());
 
 			// Verify handler for booked bike with state open.
 			bike = new BikeInfoMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
 				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri, 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
 				"My Station Name");
 			bike.LockInfo.State = LockingState.Open;
@@ -133,13 +168,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					new GeolocationMock(), // geolocation
 					new LocksServiceMock(), // LockService
 					null, // viewUpdateManager
-					NSubstitute.Substitute.For<ISmartDevice>(),
+					Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					NSubstitute.Substitute.For<IBikesViewModel>(),
-					NSubstitute.Substitute.For<IUser>()).GetType());
+					Substitute.For<IBikesViewModel>(),
+					Substitute.For<IUser>()).GetType());
 
 			// Verify handler for booked bike with state unknown.
 			bike = new BikeInfoMutable(
+				Substitute.For<IGeolocationService>(),
+				Substitute.For<ILocksService>(),
+				() => false /* not connected */,
+				(_) => Substitute.For<IConnector>(),
+				() => Substitute.For<IPollingUpdateTaskManager>(),
 				new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.ILockIt, WheelType.Mono, TypeOfBike.Allround), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri, 0 /* lock Id*/, new Guid(), null, null, null, new System.DateTime(2020, 1, 1), "a@b.com", "12", null /*operator uri*/, null, false, new List<string>()),
 				"My Station Name");
 
@@ -152,10 +192,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					new GeolocationMock(), // geolocation
 					new LocksServiceMock(), // LockService
 					null, // viewUpdateManager
-					NSubstitute.Substitute.For<ISmartDevice>(),
+					Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					NSubstitute.Substitute.For<IBikesViewModel>(),
-					NSubstitute.Substitute.For<IUser>()).GetType());
+					Substitute.For<IBikesViewModel>(),
+					Substitute.For<IUser>()).GetType());
 		}
 	}
 }
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/TestReturnBikeActionViewModel.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/TestReturnBikeActionViewModel.cs
new file mode 100644
index 0000000..863d05f
--- /dev/null
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/TestReturnBikeActionViewModel.cs
@@ -0,0 +1,553 @@
+using System;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using NSubstitute;
+using NSubstitute.ExceptionExtensions;
+using NUnit.Framework;
+using TINK.Model;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
+using TINK.Model.State;
+using TINK.Model.User;
+using TINK.Repository.Exception;
+using TINK.Repository.Request;
+using TINK.Repository.Response;
+using TINK.Services.BluetoothLock;
+using TINK.Services.Geolocation;
+using TINK.View;
+using TINK.ViewModel;
+using TINK.ViewModel.Bikes;
+using TINK.ViewModel.Bikes.Bike.BluetoothLock;
+using TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler;
+using static TINK.Model.Bikes.BikeInfoNS.BluetoothLock.Command.GetLockedLocationCommand;
+
+namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock
+{
+	[TestFixture]
+	public class TestReturnBikeActionViewModel
+	{
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Booked, lock state unknown.
+		/// </summary>
+		/// <remarks> Replaces test TestReturnOutOfReach which was removed for sharee.bike version ~3.0.362. </remarks>
+		[Test]
+		public async Task TestReturnLastGeolocatonNullLockOutOfReach()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var returnBikeActionViewModel = new EndRentalActionViewModel<BookedClosed>(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				locks,
+				() => pollingManager,
+				viewService,
+				bikesViewModel);
+
+			bike.Id.Returns("0");
+
+			bike.GetLockedBikeLocationAsync(Arg.Any<IGetLockedLocationCommandListener>()).Throws((x) =>
+			{
+				returnBikeActionViewModel.ReportStep(Step.StartingQueryLocation);
+				returnBikeActionViewModel.ReportStateAsync(State.DisconnetedNoLocationError, "").Wait();
+				returnBikeActionViewModel.ReportStep(Step.DisconnectingLockOnDisconnectedNoLocationError);
+				returnBikeActionViewModel.ReportStateAsync(State.QueryLocationSucceeded, "").Wait();
+				throw new Exception();
+			});
+
+			bike.State.Value.Returns(InUseStateEnum.Booked);
+
+			await returnBikeActionViewModel.EndRentalAsync();
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				viewService.DisplayAlert(
+					"Rental could not be terminated!",
+					"We could not assign the bike to any station. For this we need your location information while you are standing right next to the bike. Only then your rental can be terminated!\r\n\r\nApproach the bike lock, turn on Bluetooth and Location services and try again.",
+					"OK");
+				bikesViewModel.ActionText = "Disconnecting lock...";
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+
+			// Verify state after action
+			Assert.That(
+				bike.LockInfo.State,
+				Is.EqualTo(LockingState.UnknownDisconnected));
+		}
+
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Booked, lock state unknown.
+		/// </summary>
+		/// <remarks>Replaces test TestReturnLockInReachNoGeolocation which was removed for sharee.bike older ~ 3.0.362.</remarks>
+		[Test]
+		public void TestReturnStartGetGeolocationException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new EndRentalActionViewModel<BookedClosed>(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				locks,
+				() => pollingManager,
+				viewService,
+				bikesViewModel);
+
+			bike.Id.Returns("0");
+
+			bike.GetLockedBikeLocationAsync(Arg.Any<IGetLockedLocationCommandListener>()).Throws((x) =>
+			{
+				handler.ReportStep(Step.StartingQueryLocation);
+				handler.ReportStateAsync(State.QueryLocationFailed, "Ups...").Wait();
+				throw new Exception();
+			});
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state does not change.
+
+			bike.LockInfo.State.Returns(LockingState.Closed);   // Locking state does not change.
+
+			var subsequent = handler.EndRentalAsync();
+
+			// Verify behavior
+			Received.InOrder(async () =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Query location...";
+				await viewService.DisplayAlert(
+					"Rental could not be terminated!",
+					"Grant Location permission, activate Location services and try again.",
+					"OK");
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+		}
+
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Booked, lock state unknown.
+		/// </summary>
+		[Test]
+		public async Task TestReturnGetGeolocationException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var geolocation = Substitute.For<IGeolocationService>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var activeUser = Substitute.For<IUser>();
+
+			var handler = new EndRentalActionViewModel<BookedClosed>(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				locks,
+				() => pollingManager,
+				viewService,
+				bikesViewModel);
+
+			bike.Id.Returns("0");
+
+			bike.GetLockedBikeLocationAsync(Arg.Any<IGetLockedLocationCommandListener>())
+				.Returns((x) =>
+			{
+				handler.ReportStep(Step.StartingQueryLocation);
+				handler.ReportStateAsync(State.QueryLocationFailed, "Ups...").Wait();
+				return Task.FromException<LocationDto>(new Exception("Ups..."));
+			});
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Booking state does not change.
+
+			bike.LockInfo.State.Returns(LockingState.Closed);   // Locking state does not change.
+
+			await handler.EndRentalAsync();
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "Query location...";
+				viewService.DisplayAlert(
+					"Rental could not be terminated!",
+					"Grant Location permission, activate Location services and try again.",
+					"OK");
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+		}
+
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Disposable closed
+		/// </summary>
+		[Test]
+		public async Task TestReturnLockInReach()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+			var listener = Substitute.For<IGetLockedLocationCommandListener>();
+
+			var returnBikeActionViewModel = new EndRentalActionViewModel<BookedClosed>(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				locks,
+				() => pollingManager,
+				viewService,
+				bikesViewModel);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "End rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			bike.GetLockedBikeLocationAsync(Arg.Any<IGetLockedLocationCommandListener>()).Returns((x) =>
+				{
+					returnBikeActionViewModel.ReportStep(Step.StartingQueryLocation);
+					returnBikeActionViewModel.ReportStateAsync(State.QueryLocationSucceeded, string.Empty).Wait();
+					return Task.FromResult(new LocationDto.Builder().Build());
+				});
+
+			bike.State.Value.Returns(InUseStateEnum.Disposable); // Request handler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Request handler factory queries lock state to create appropriate request handler object.
+
+			await returnBikeActionViewModel.EndRentalAsync();
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "Query location...";
+				bikesViewModel.ActionText = "One moment please...";
+				connector.Command.DoReturn(bike, Arg.Is<LocationDto>(x => x != null));
+				bikesViewModel.ActionText = "Disconnecting lock...";
+				locks.DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+				bikesViewModel.ActionText = "Updating...";
+				pollingManager.StartAsync(); // polling must be restarted again
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+		}
+
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public async Task TestReturnReturnFailsWebConnectFailureException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+
+			var handler = new EndRentalActionViewModel<BookedClosed>(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				locks,
+				() => pollingManager,
+				viewService,
+				bikesViewModel);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "End rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x => throw new WebConnectFailureException("Context info", new Exception("hoppla")));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Requesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
+
+			await handler.EndRentalAsync();
+
+			await locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			await locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "One moment please...";
+				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = string.Empty;
+				viewService.DisplayAlert(
+					"Rental could not be terminated!",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
+					"OK");
+				pollingManager.StartAsync(); // polling must be restarted again
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+		}
+
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public async Task TestReturnReturnFailsNotAtStationException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+
+			var handler = new EndRentalActionViewModel<BookedClosed>(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				locks,
+				() => pollingManager,
+				viewService,
+				bikesViewModel);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "End rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			NotAtStationException.IsNotAtStation("Failure 2178: bike 1545 out of GEO fencing. 15986 meter distance to next station 42. OK: bike 1545 locked confirmed", out NotAtStationException notAtStationException);
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x =>
+				throw notAtStationException);
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Requesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
+
+			await handler.EndRentalAsync();
+
+			await locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "One moment please...";
+				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = string.Empty;
+				viewService.DisplayAlert("Rental could not be terminated!", "End rental outside or at wrong station is not possible. Distance to next suitable station 42 is 15986 m.", "OK");
+				pollingManager.StartAsync(); // polling must be restarted again
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+		}
+
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public async Task TestReturnReturnFailsNoGPSDataException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+
+			var handler = new EndRentalActionViewModel<BookedClosed>(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				locks,
+				() => pollingManager,
+				viewService,
+				bikesViewModel);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "End rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			NoGPSDataException.IsNoGPSData("Failure 2245: No GPS data, state change forbidden.", out NoGPSDataException noGPSDataException);
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x =>
+				throw noGPSDataException);
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Requesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
+
+			await handler.EndRentalAsync();
+
+			await locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "One moment please...";
+				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = string.Empty;
+				viewService.DisplayAlert("Rental could not be terminated!", "End rental at an unknown location is not possible.\r\nRental can be ended if\r\n- location information is available when closing lock\r\n- bike is in reach and location information is available when pressing button \"End rental\"", "OK");
+				pollingManager.StartAsync(); // polling must be restarted again
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+		}
+
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public async Task TestReturnReturnFailsResponseException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+
+			var handler = new EndRentalActionViewModel<BookedClosed>(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				locks,
+				() => pollingManager,
+				viewService,
+				bikesViewModel);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "End rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x =>
+				throw new ReturnBikeException(JsonConvert.DeserializeObject<DoReturnResponse>(@"{ ""response_text"" : ""Some invalid data received!""}"), "Outer message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Requesthandler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Requesthandler factory queries lock state to create appropriate request handler object.
+
+			await handler.EndRentalAsync();
+
+			await locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "One moment please...";
+				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = string.Empty;
+				viewService.DisplayAdvancedAlert("Rental could not be terminated!", "Outer message.", "Some invalid data received!", "OK");
+				pollingManager.StartAsync(); // polling must be restarted again
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+		}
+
+		/// <summary>
+		/// Use case: End rental.
+		/// Final state: Same as initial state.
+		/// </summary>
+		[Test]
+		public async Task TestReturnReturnFailsException()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			var connector = Substitute.For<IConnector>();
+			var command = Substitute.For<ICommand>();
+			var locks = Substitute.For<ILocksService>();
+			var pollingManager = Substitute.For<IPollingUpdateTaskManager>();
+			var viewService = Substitute.For<IViewService>();
+			var bikesViewModel = Substitute.For<IBikesViewModel>();
+
+			var returnBikeActionViewModel = new EndRentalActionViewModel<BookedClosed>(
+				bike,
+				() => true, // isConnectedDelegate
+				(isConnexted) => connector,
+				locks,
+				() => pollingManager,
+				viewService,
+				bikesViewModel);
+
+			bike.Id.Returns("0");
+
+			viewService.DisplayAlert(string.Empty, "End rental of bike Nr. 0?", "Yes", "No").Returns(Task.FromResult(true));
+
+			locks[0].GetDeviceState().Returns(DeviceState.Connected); // Simulate bike in reach. If bike is out of reach bluetooth state changes to unknown.
+
+			connector.Command.DoReturn(bike, Arg.Any<LocationDto>()).Returns<BookingFinishedModel>(x => throw new Exception("Exception message."));
+
+			bike.State.Value.Returns(InUseStateEnum.Booked); // Request handler factory queries state to create appropriate request handler object.
+			bike.LockInfo.State.Returns(LockingState.Closed); // Request handler factory queries lock state to create appropriate request handler object.
+
+			await returnBikeActionViewModel.EndRentalAsync();
+
+			await locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
+
+			// Verify behavior
+			Received.InOrder(() =>
+			{
+				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
+				bikesViewModel.ActionText = "One moment please...";
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
+				bikesViewModel.ActionText = "One moment please...";
+				connector.Command.DoReturn(bike, Arg.Any<LocationDto>());
+				bikesViewModel.ActionText = string.Empty;
+				viewService.DisplayAlert(
+					"Rental could not be terminated!",
+					"Exception message.",
+					"OK"
+				);
+				pollingManager.StartAsync(); // polling must be restarted again
+				bikesViewModel.ActionText = string.Empty;
+				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
+			});
+		}
+
+	}
+}
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs
index ebc4bb3..99ac36d 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs
@@ -56,17 +56,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				connector.Command.OpenLockAsync(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert(
-					"Connection error when opening the lock!",
-					"Is WIFI/mobile network available and mobile data activated?",
-					"Context info",
+				viewService.DisplayAlert(
+					"Connection to booking system not possible.",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -126,16 +125,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				connector.Command.OpenLockAsync(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Error while opening lock!",
+					"Lock could not be opened!",
 					"Some error",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -193,11 +192,11 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				connector.Command.OpenLockAsync(bike); // Booking must be performed
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs
index 957137e..7008bf3 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs
@@ -56,17 +56,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				connector.Command.OpenLockAsync(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert(
-					"Connection error when opening the lock!",
-					"Is WIFI/mobile network available and mobile data activated?",
-					"Context info",
+				viewService.DisplayAlert(
+					"Connection to booking system not possible.",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -126,16 +125,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				connector.Command.OpenLockAsync(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Error while opening lock!",
+					"Lock could not be opened!",
 					"Some error",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -193,11 +192,11 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "<h4><b>Lock is opening.<br/>Please wait until it is completely open.</b></h4>";
 				connector.Command.OpenLockAsync(bike); // Booking must be performed
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs
index bd9deee..c07a9cd 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs
@@ -124,17 +124,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.BookAndOpenAync(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert(
-					"Connection error when renting the bike!",
-					"Is WIFI/mobile network available and mobile data activated?",
-					"Context info",
+				viewService.DisplayAlert(
+					"Connection to booking system not possible.",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -200,16 +199,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.BookAndOpenAync(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Error when renting the bike!",
+					"Bike could not be rented!",
 					"Some error",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -273,11 +272,11 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.BookAndOpenAync(bike); // Booking must be performed
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -409,7 +408,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reserving bike...";
 				connector.Command.DoReserve(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
@@ -418,7 +417,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					"A reservation of bike Nr. 0 was rejected because the maximum allowed number of 4 reservations/rentals had already been made.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -486,17 +485,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reserving bike...";
 				connector.Command.DoReserve(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert(
-					"Connection error when reserving the bike!",
-					"Is WIFI/mobile network available and mobile data activated?",
-					"Context info",
+				viewService.DisplayAlert(
+					"Connection to booking system not possible.",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -564,16 +562,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reserving bike...";
 				connector.Command.DoReserve(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Error when reserving the bike!",
+					"Bike could not be reserved!",
 					"Some error",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -639,11 +637,11 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Reserving bike...";
 				connector.Command.DoReserve(bike); // Booking must be performed
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs
index 86c3812..bc63af6 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs
@@ -54,17 +54,17 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				viewService.DisplayUserFeedbackPopup(Arg.Any<IBattery>(), Arg.Any<string>());
 				bikesViewModel.ActionText = "Submitting feedback...";
 				connector.Command.DoSubmitFeedback(Arg.Any<TINK.Model.Connector.IUserFeedback>(), Arg.Any<Uri>()); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
 					"Submitting feedback failed!",
-					"Your feedback could not be send to server successfully.",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -116,12 +116,12 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				viewService.DisplayUserFeedbackPopup(Arg.Any<IBattery>(), Arg.Any<string>());
 				bikesViewModel.ActionText = "Submitting feedback...";
 				connector.Command.DoSubmitFeedback(Arg.Any<TINK.Model.Connector.IUserFeedback>(), Arg.Any<Uri>()); // Booking must be performed
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -175,13 +175,13 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				viewService.DisplayUserFeedbackPopup(Arg.Any<IBattery>(), Arg.Any<string>());
 				bikesViewModel.ActionText = "Submitting feedback...";
 				connector.Command.DoSubmitFeedback(Arg.Any<TINK.Model.Connector.IUserFeedback>(), Arg.Any<Uri>()); // Booking must be performed
 				viewService.PushModalAsync(ViewTypes.MiniSurvey);
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs
index 71658b5..400390a 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs
@@ -69,7 +69,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			// Verify state after action
 			Assert.That(
 				subsequent.ButtonText,
-				Is.EqualTo("Cancel bike reservation"));
+				Is.EqualTo("Cancel reservation"));
 			Assert.That(
 				subsequent.IsButtonVisible,
 				Is.True);
@@ -122,16 +122,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Error when canceling the reservation!",
-					"Can not login user otto@mustermann.de. Mail address unknown or password invalid.",
+					"Reservation could not be canceled!",
+					"Your session has expired. Please login new and try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -139,7 +139,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			// Verify state after action
 			Assert.That(
 			  subsequent.ButtonText,
-			  Is.EqualTo("Cancel bike reservation"));
+			  Is.EqualTo("Cancel reservation"));
 			Assert.That(
 				subsequent.IsButtonVisible,
 				Is.True);
@@ -191,17 +191,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert(
-					"Connection error when canceling the reservation!",
-					"Is WIFI/mobile network available and mobile data activated?",
-					"Context info",
+				viewService.DisplayAlert(
+					"Reservation could not be canceled!",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -209,7 +208,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			// Verify state after action
 			Assert.That(
 				subsequent.ButtonText,
-				Is.EqualTo("Cancel bike reservation"));
+				Is.EqualTo("Cancel reservation"));
 			Assert.That(
 				subsequent.IsButtonVisible,
 				Is.True);
@@ -265,16 +264,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Cancel reservation must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAlert(
-					"Error when canceling the reservation!",
+					"Reservation could not be canceled!",
 					"Some error",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -282,7 +281,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			// Verify state after action
 			Assert.That(
 				subsequent.ButtonText,
-				Is.EqualTo("Cancel bike reservation"));
+				Is.EqualTo("Cancel reservation"));
 			Assert.That(
 				subsequent.IsButtonVisible,
 				Is.True);
@@ -336,11 +335,11 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Canceling reservation...";
 				connector.Command.DoCancelReservation(bike); // Cancel reservation must be performed
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -410,7 +409,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			// Verify state after action
 			Assert.That(
 				  subsequent.ButtonText,
-				  Is.EqualTo("Cancel bike reservation"));
+				  Is.EqualTo("Cancel reservation"));
 			Assert.That(
 				subsequent.IsButtonVisible,
 				Is.True);
@@ -466,17 +465,16 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.BookAndOpenAync(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
-				viewService.DisplayAdvancedAlert(
-					"Connection error when renting the bike!",
-					"Is WIFI/mobile network available and mobile data activated?",
-					"Context info",
+				viewService.DisplayAlert(
+					"Connection to booking system not possible.",
+					"A stable Internet connection is required. Connect to WIFI or to mobile network and activate mobile data. Try again.",
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -484,7 +482,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			// Verify state after action
 			Assert.That(
 				  subsequent.ButtonText,
-				  Is.EqualTo("Cancel bike reservation"));
+				  Is.EqualTo("Cancel reservation"));
 			Assert.That(
 				subsequent.IsButtonVisible,
 				Is.True);
@@ -540,17 +538,17 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.BookAndOpenAync(bike); // Booking must be performed
 				bikesViewModel.ActionText = string.Empty;
 				viewService.DisplayAdvancedAlert(
-					"Error when renting the bike!",
+					"Bike could not be rented!",
 					"Some error",
 					String.Empty,
 					"OK");
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
@@ -558,7 +556,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			// Verify state after action
 			Assert.That(
 				subsequent.ButtonText,
-				Is.EqualTo("Cancel bike reservation"));
+				Is.EqualTo("Cancel reservation"));
 			Assert.That(
 				subsequent.IsButtonVisible,
 				Is.True);
@@ -614,11 +612,11 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
 				bikesViewModel.ActionText = "One moment please...";
-				pollingManager.StopUpdatePeridically(); // Polling must be stopped before any COPR and lock service action
+				pollingManager.StopAsync(); // Polling must be stopped before any COPR and lock service action
 				bikesViewModel.ActionText = "Renting bike...";
 				connector.Command.BookAndOpenAync(bike); // Booking must be performed
 				bikesViewModel.ActionText = "Updating...";
-				pollingManager.StartUpdateAyncPeridically(); // polling must be restarted again
+				pollingManager.StartAsync(); // polling must be restarted again
 				bikesViewModel.ActionText = string.Empty;
 				bikesViewModel.Received(1).IsIdle = true; // GUI must be unlocked
 			});
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelFactory.cs b/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelFactory.cs
index bdf54e6..2a0746e 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelFactory.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelFactory.cs
@@ -1,12 +1,16 @@
 using System;
+using NSubstitute;
 using NUnit.Framework;
 using TestFramework.Model.Services.Geolocation;
 using TestFramework.Services.BluetoothLock;
 using TINK.Model.Bikes.BikeInfoNS.BC;
 using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS;
+using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.User;
+using TINK.Services.BluetoothLock;
+using TINK.Services.Geolocation;
 using TINK.ViewModel;
 using TINK.ViewModel.Bikes;
 using TINK.ViewModel.Bikes.Bike;
@@ -49,13 +53,19 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 					new LocksServiceMock(), // lock service
 					(index) => { }, // bikeRemoveDelegate
 					null, // viewUpdateManager
-					NSubstitute.Substitute.For<ISmartDevice>(),
+					Substitute.For<ISmartDevice>(),
 					null, // viewService
-					new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", LockModel.ILockIt), new Drive(), DataSource.Copri, 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
-					NSubstitute.Substitute.For<IUser>(), // user
-					new ViewContext (PageContext.BikesAtStation, "FR1012"), // Context does not matter for this test.
-					NSubstitute.Substitute.For<IInUseStateInfoProvider>(),
-					NSubstitute.Substitute.For<IBikesViewModel>(),
+					new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfoMutable(
+						Substitute.For<IGeolocationService>(),
+						Substitute.For<ILocksService>(),
+						() => false /* not connected */,
+						(_) => Substitute.For<IConnector>(),
+						() => Substitute.For<IPollingUpdateTaskManager>(),
+						new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", LockModel.ILockIt), new Drive(), DataSource.Copri, 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
+					Substitute.For<IUser>(), // user
+					null /*ViewContext*/, 
+					Substitute.For<IInUseStateInfoProvider>(),
+					Substitute.For<IBikesViewModel>(),
 					url => { }).GetType()); // stateInfoProvider
 		}
 
diff --git a/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs b/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
index c6a6da0..7e58ade 100644
--- a/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
+++ b/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
@@ -299,7 +299,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
 			Assert.AreEqual("Available.", bike1315.StateText);
 			Assert.AreEqual("Available.", bike1543.StateText);
-			Assert.AreEqual("Close lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Close lock", bike1545.ButtonText);
+			Assert.AreEqual(string.Empty, bike1545.LockitButtonText);
 			Assert.AreEqual("Open lock", bike1537.LockitButtonText);
 			Assert.AreEqual("DisposableDisconnected", bike1315.LockitButtonText);
 			Assert.AreEqual("DisposableDisconnected", bike1543.LockitButtonText);
@@ -1108,8 +1109,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await bikesAtStation.OnAppearingOrRefresh();
 
-			Assert.AreEqual("Offline.", bikesAtStation.StatusInfoText);
-
 			// Verify list of bikes
 			Assert.AreEqual(2, bikesAtStation.Count); // Count of bikes was 3. There is no more bike with id 26.
 			Assert.IsTrue(bikesAtStation.IsIdle);
@@ -1199,8 +1198,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await bikesAtStation.OnAppearingOrRefresh();
 
-			Assert.AreEqual("Connection interrupted, server unreachable.", bikesAtStation.StatusInfoText);
-
 			// Verify list of bikes
 			Assert.AreEqual(2, bikesAtStation.Count); // Count of bikes was 3. There is no more bike with id 26.
 			Assert.IsTrue(bikesAtStation.IsIdle);
@@ -1291,8 +1288,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await bikesAtStation.OnAppearingOrRefresh();
 
-			Assert.AreEqual("Connection interrupted.", bikesAtStation.StatusInfoText);
-
 			// Verify list of bikes
 			Assert.AreEqual(2, bikesAtStation.Count); // Count of bikes was 3. There is no more bike with id 26.
 			Assert.IsTrue(bikesAtStation.IsIdle);
diff --git a/TestShareeLib/ViewModel/Map/TestMapPageViewModel.cs b/TestShareeLib/ViewModel/Map/TestMapPageViewModel.cs
index a0a26de..9cd06c1 100644
--- a/TestShareeLib/ViewModel/Map/TestMapPageViewModel.cs
+++ b/TestShareeLib/ViewModel/Map/TestMapPageViewModel.cs
@@ -406,9 +406,6 @@ namespace TestShareeLib.UseCases.Startup
 				Assert.AreEqual(Color.White, viewModel.TinkColor, "TINK bikes are hidden.");
 
 				Assert.AreEqual(Color.FromRgba(0, 0, 0, 0), viewModel.KonradColor, "Konrad bikes are shown.");
-
-
-				Assert.AreEqual("Offline.", viewModel.StatusInfoText);
 			}
 			finally
 			{
@@ -497,8 +494,6 @@ namespace TestShareeLib.UseCases.Startup
 				Assert.AreEqual(Color.White, viewModel.TinkColor, "TINK bikes are hidden.");
 
 				Assert.AreEqual(Color.FromRgba(0, 0, 0, 0), viewModel.KonradColor, "Konrad bikes are shown.");
-
-				Assert.AreEqual("Connection interrupted, server unreachable.", viewModel.StatusInfoText);
 			}
 			finally
 			{
@@ -588,8 +583,6 @@ namespace TestShareeLib.UseCases.Startup
 				Assert.AreEqual(Color.White, viewModel.TinkColor, "TINK bikes are hidden.");
 
 				Assert.AreEqual(Color.FromRgba(0, 0, 0, 0), viewModel.KonradColor, "Konrad bikes are shown.");
-
-				Assert.AreEqual("Connection interrupted.", viewModel.StatusInfoText);
 			}
 			finally
 			{
diff --git a/TestShareeLib/ViewModel/MyBikes/TestMyBikesPageViewModel.cs b/TestShareeLib/ViewModel/MyBikes/TestMyBikesPageViewModel.cs
index 93ea0b1..bb422de 100644
--- a/TestShareeLib/ViewModel/MyBikes/TestMyBikesPageViewModel.cs
+++ b/TestShareeLib/ViewModel/MyBikes/TestMyBikesPageViewModel.cs
@@ -124,7 +124,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			var bike1537 = myBikes.FirstOrDefault(x => x.Id == "1537") as TINK.ViewModel.Bikes.Bike.BluetoothLock.BikeViewModel;
 			Assert.AreEqual($"Rented since {DateTime.Parse("2020-11-06 17:53:22.784681+01"):dd. MMMM HH:mm}.", bike1545.StateText);
 			Assert.AreEqual($"Rented since {DateTime.Parse("2020-10-12 08:38:12.374231+02"):dd. MMMM HH:mm}.", bike1537.StateText);
-			Assert.AreEqual("Close lock", bike1545.LockitButtonText);
+			Assert.AreEqual("Close lock", bike1545.ButtonText);
+			Assert.AreEqual(string.Empty, bike1545.LockitButtonText);
 			Assert.AreEqual("Open lock", bike1537.LockitButtonText);
 
 			Assert.IsFalse(myBikes.IsNoBikesOccupiedVisible);
@@ -664,8 +665,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await myBikes.OnAppearingOrRefresh();
 
-			Assert.AreEqual("Offline.", myBikes.StatusInfoText);
-
 			Assert.AreEqual(2, myBikes.Count);
 			Assert.IsTrue(myBikes.IsIdle);
 			Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
@@ -750,8 +749,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await myBikes.OnAppearingOrRefresh();
 
-			Assert.AreEqual("Connection interrupted, server unreachable.", myBikes.StatusInfoText);
-
 			Assert.AreEqual(2, myBikes.Count);
 			Assert.IsTrue(myBikes.IsIdle);
 			Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
@@ -836,8 +833,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await myBikes.OnAppearingOrRefresh();
 
-			Assert.AreEqual("Connection interrupted.", myBikes.StatusInfoText);
-
 			Assert.AreEqual(2, myBikes.Count);
 			Assert.IsTrue(myBikes.IsIdle);
 			Assert.IsTrue(myBikes.IsBikesListVisible, "If there are any bikes, list must be visible.");
diff --git a/TestShareeLib/ViewModel/TestPollingTaskManager.cs b/TestShareeLib/ViewModel/TestPollingTaskManager.cs
index ff8f494..b27ab05 100644
--- a/TestShareeLib/ViewModel/TestPollingTaskManager.cs
+++ b/TestShareeLib/ViewModel/TestPollingTaskManager.cs
@@ -13,12 +13,12 @@ namespace UITest.Fixtures.ObjectTests
 		{
 			var l_oManger = new PollingUpdateTaskManager(() => Task.Delay(1000));
 
-			await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
+			await l_oManger.StartAsync(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
 
-			l_oManger.StopUpdatePeridically().Wait();
+			l_oManger.StopAsync().Wait();
 
 			// Should not lead to dead lock.
-			l_oManger.StopUpdatePeridically().Wait();
+			l_oManger.StopAsync().Wait();
 		}
 
 		[Test]
@@ -26,12 +26,12 @@ namespace UITest.Fixtures.ObjectTests
 		{
 			var l_oManger = new PollingUpdateTaskManager(() => Task.Delay(1000));
 
-			await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
+			await l_oManger.StartAsync(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
 
 			// Should not lead to dead lock.
-			await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
+			await l_oManger.StartAsync(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
 
-			l_oManger.StopUpdatePeridically().Wait();
+			l_oManger.StopAsync().Wait();
 		}
 
 		[Test]
@@ -40,7 +40,7 @@ namespace UITest.Fixtures.ObjectTests
 			var l_oManger = new PollingUpdateTaskManager(() => Task.Delay(1000));
 
 			// Should not lead to dead lock.
-			await l_oManger.StartUpdateAyncPeridically(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
+			await l_oManger.StartAsync(new PollingParameters(new System.TimeSpan(0, 0, 2), true));
 		}
 	}
 }
diff --git a/TestShareeSharedGuiLib/TestShareeSharedGuiLib.csproj b/TestShareeSharedGuiLib/TestShareeSharedGuiLib.csproj
index 060735a..2b0f9a1 100644
--- a/TestShareeSharedGuiLib/TestShareeSharedGuiLib.csproj
+++ b/TestShareeSharedGuiLib/TestShareeSharedGuiLib.csproj
@@ -8,6 +8,14 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>$(DefineConstants);NOXCT</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>$(DefineConstants);NOXCT</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="NUnit" Version="3.13.3" />
diff --git a/TestShareeSharedGuiLib/TestShareeSharedGuiLib.sln b/TestShareeSharedGuiLib/TestShareeSharedGuiLib.sln
new file mode 100644
index 0000000..81ad398
--- /dev/null
+++ b/TestShareeSharedGuiLib/TestShareeSharedGuiLib.sln
@@ -0,0 +1,309 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32014.148
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TINKLib", "..\TINKLib\TINKLib.csproj", "{B77F4222-0860-4494-A07C-EE8E09FA9983}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LockItShared", "..\LockItShared\LockItShared.csproj", "{3589ED1D-E734-429D-976F-1BEA4371DF14}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LockItBLE", "..\LockItBLE\LockItBLE.csproj", "{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFramework", "..\TestFramework\TestFramework.csproj", "{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ShareeSharedGuiLib", "..\ShareeSharedGuiLib\ShareeSharedGuiLib.shproj", "{96FB99D1-0854-424F-B7AC-E52C3471CF9A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestShareeSharedGuiLib", "TestShareeSharedGuiLib.csproj", "{835439B0-71C7-480E-94DC-0350784B9F93}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D5B69C6F-3413-4773-923E-21A65B21C3A3}"
+	ProjectSection(SolutionItems) = preProject
+		..\.editorconfig = ..\.editorconfig
+		..\.vsspell = ..\.vsspell
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
+		Ad-Hoc|ARM = Ad-Hoc|ARM
+		Ad-Hoc|iPhone = Ad-Hoc|iPhone
+		Ad-Hoc|iPhoneSimulator = Ad-Hoc|iPhoneSimulator
+		Ad-Hoc|x64 = Ad-Hoc|x64
+		Ad-Hoc|x86 = Ad-Hoc|x86
+		AppStore|Any CPU = AppStore|Any CPU
+		AppStore|ARM = AppStore|ARM
+		AppStore|iPhone = AppStore|iPhone
+		AppStore|iPhoneSimulator = AppStore|iPhoneSimulator
+		AppStore|x64 = AppStore|x64
+		AppStore|x86 = AppStore|x86
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|x64.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.AppStore|x86.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|x64.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Debug|x86.Build.0 = Debug|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|ARM.Build.0 = Release|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|iPhone.Build.0 = Release|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|x64.ActiveCfg = Release|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|x64.Build.0 = Release|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|x86.ActiveCfg = Release|Any CPU
+		{B77F4222-0860-4494-A07C-EE8E09FA9983}.Release|x86.Build.0 = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|x64.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.AppStore|x86.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|ARM.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|x64.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Debug|x86.Build.0 = Debug|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|ARM.Build.0 = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|iPhone.Build.0 = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|x64.ActiveCfg = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|x64.Build.0 = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|x86.ActiveCfg = Release|Any CPU
+		{3589ED1D-E734-429D-976F-1BEA4371DF14}.Release|x86.Build.0 = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|x64.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.AppStore|x86.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|ARM.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|x64.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Debug|x86.Build.0 = Debug|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|ARM.ActiveCfg = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|ARM.Build.0 = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|iPhone.Build.0 = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|x64.ActiveCfg = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|x64.Build.0 = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|x86.ActiveCfg = Release|Any CPU
+		{BDE9CE26-15CF-47DA-A4F6-B6956D02D0FC}.Release|x86.Build.0 = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|x64.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.AppStore|x86.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|x64.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Debug|x86.Build.0 = Debug|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|ARM.Build.0 = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|iPhone.Build.0 = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|x64.ActiveCfg = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|x64.Build.0 = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|x86.ActiveCfg = Release|Any CPU
+		{9EA4ED8C-C4C3-48DC-8CBE-9281E0A7CA8D}.Release|x86.Build.0 = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|x64.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.AppStore|x86.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|ARM.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|x64.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Debug|x86.Build.0 = Debug|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|ARM.ActiveCfg = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|ARM.Build.0 = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|iPhone.Build.0 = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|x64.ActiveCfg = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|x64.Build.0 = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|x86.ActiveCfg = Release|Any CPU
+		{835439B0-71C7-480E-94DC-0350784B9F93}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C6529CD7-C3F7-4E80-89B5-002E2B8E3EB5}
+	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\ShareeSharedGuiLib\ShareeSharedGuiLib.projitems*{835439b0-71c7-480e-94dc-0350784b9f93}*SharedItemsImports = 5
+		..\ShareeSharedGuiLib\ShareeSharedGuiLib.projitems*{96fb99d1-0854-424f-b7ac-e52c3471cf9a}*SharedItemsImports = 13
+	EndGlobalSection
+	GlobalSection(MonoDevelopProperties) = preSolution
+		Policies = $0
+		$0.DotNetNamingPolicy = $1
+		$1.DirectoryNamespaceAssociation = PrefixedHierarchical
+		version = 3.0
+	EndGlobalSection
+EndGlobal
diff --git a/TestShareeSharedGuiLib/View/StringNotNullOrEmptyToVisibleConverter.cs b/TestShareeSharedGuiLib/View/StringNotNullOrEmptyToVisibleConverter.cs
new file mode 100644
index 0000000..451b3d5
--- /dev/null
+++ b/TestShareeSharedGuiLib/View/StringNotNullOrEmptyToVisibleConverter.cs
@@ -0,0 +1,22 @@
+using System.Globalization;
+using Xamarin.Forms;
+
+namespace TINK.View
+{
+	/// <summary> Converts a string into visible state. If string is null or empty element becomes invisible.</summary>
+	public class StringNotNullOrEmptyToVisibleConverter : IValueConverter
+	{
+		/// <summary> Converts a string into visible state.</summary>
+		/// <param name="value">Text value from view model used to derive whether object is visible or not.</param>
+		/// <returns>Boolean value indicating whether object is visible or not.</returns>
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return value != null && value is string text && !string.IsNullOrEmpty(text);
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return "";
+		}
+	}
+}
diff --git a/TestTINKLib/TestTINKLib.csproj b/TestTINKLib/TestTINKLib.csproj
index ef2f0b7..4df9740 100644
--- a/TestTINKLib/TestTINKLib.csproj
+++ b/TestTINKLib/TestTINKLib.csproj
@@ -107,5 +107,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup />
+  
+  <ItemGroup>
+    <Reference Include="Mono.Android">
+      <HintPath>..\..\..\..\..\..\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\MonoAndroid\v12.0\Mono.Android.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.iOS">
+      <HintPath>..\..\..\..\..\..\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.iOS\v1.0\Xamarin.iOS.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/en-US_User.dic b/en-US_User.dic
index 67beb62..083f9d8 100644
--- a/en-US_User.dic
+++ b/en-US_User.dic
@@ -23,6 +23,7 @@ popup
 pwd
 refactored
 serializer
+unsubscribing
 uri
 uris
 Url