diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
index 975753a..c2deab7 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.360" android:versionCode="360">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.361" android:versionCode="361">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- 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 3275cbd..daf0276 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.0.0.73")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.93")]
 	public partial class Resource
 	{
 		
diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist
index b4cc507..bd58ee7 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>360</string>
+	<string>361</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.360</string>
+	<string>3.0.361</string>
 </dict>
 </plist>
diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
index 50cf382..e6aea39 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.360" android:versionCode="360">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.361" android:versionCode="361">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- 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 cf3fffb..67a528c 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.0.0.73")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.93")]
 	public partial class Resource
 	{
 		
diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist
index 7fa2cb0..8f69fb4 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>360</string>
+	<string>361</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.360</string>
+	<string>3.0.361</string>
 </dict>
 </plist>
diff --git a/Meinkonrad/TINK/View/Bike/ILockItBike.xaml b/Meinkonrad/TINK/View/Bike/ILockItBike.xaml
index 60ea2bf..35acb27 100644
--- a/Meinkonrad/TINK/View/Bike/ILockItBike.xaml
+++ b/Meinkonrad/TINK/View/Bike/ILockItBike.xaml
@@ -12,217 +12,231 @@
         <ContentView.Resources>
             <conv:StringNotNullOrEmptyToVisibleConverter x:Key="Label_Converter"/>
         </ContentView.Resources>
-        <StackLayout 
-            Padding="10">
-			<Grid Padding="0,0,5,10">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="*" />
-				</Grid.ColumnDefinitions>
-				<!-- Icon of the bike -->
-				<Image
-                Source="{Binding DisplayedBikeImageSourceString}"
-                    HeightRequest="80"
-                    Aspect="AspectFit"
-                    HorizontalOptions="Start"
-                    VerticalOptions="End"
-                    Grid.Column="0"/>
-				<!-- Battery level -->
-				<sharedGui:BarLevelView
-                    Current="{Binding CurrentChargeBars}"
-                    Maximum="{Binding MaxChargeBars}"
-                    Grid.Column="1"
-                    VerticalOptions="End"
-                    IsVisible="{Binding IsBatteryChargeVisible}"/>
-				<!-- Name of the bike -->
-				<StackLayout Grid.Column="2">
-					<Label 
-                        FontAttributes="Bold"
-                        FontSize="Large"
-                        HorizontalTextAlignment="Right"
-                        Text="{Binding Name}"/>
+		<Frame
+				Padding="10"
+				Margin="0,5,0,5"
+				HorizontalOptions="FillAndExpand"
+				VerticalOptions="FillAndExpand"
+				BackgroundColor="White">
+
+			<StackLayout
+					Orientation="Vertical"
+					Padding="10">
+
+				<!-- Icons, Name, ID -->
+				<Grid Padding="0,0,5,10"
+					ColumnDefinitions="Auto,Auto,*"
+					RowDefinitions="Auto,Auto">
+
+					<!-- Icon of the bike -->
+					<Image
+						Grid.Column="0"
+						Grid.Row="0"
+						Grid.RowSpan="2"
+						Source="{Binding DisplayedBikeImageSourceString}"
+						HeightRequest="60"
+						Aspect="AspectFit"
+						HorizontalOptions="Start"
+						VerticalOptions="End"/>
+
+					<!-- Battery level -->
+					<sharedGui:BarLevelView
+						Grid.Column="1"
+						Grid.Row="1"
+						Current="{Binding CurrentChargeBars}"
+						Maximum="{Binding MaxChargeBars}"
+						VerticalOptions="End"
+						IsVisible="{Binding IsBatteryChargeVisible}"/>
+
+					<!-- Name of the bike -->
+					<Label
+						Grid.Column="1"
+						Grid.ColumnSpan="2"
+						Grid.Row="0"
+						FontAttributes="Bold"
+						FontSize="Large"
+						HorizontalTextAlignment="Right"
+						Text="{Binding Name}"/>
+
 					<!-- Id of the bike -->
-					<Label 
-                        FontAttributes="Bold"
-                        HorizontalTextAlignment="Right"
-                        IsVisible="{Binding DisplayId, Converter={StaticResource Label_Converter}}"
-                        Text="{Binding DisplayId}"/>
-				</StackLayout>
-			</Grid>
-			<!-- Rental state -->
-            <Label 
-                Text="{Binding StateText}"
-                TextColor="{Binding StateColor}"/>
-            <Label 
-                Text="{Binding ErrorText}"
-                IsVisible="{Binding ErrorText, Converter={StaticResource Label_Converter}}"
-                TextColor="Red"/>
-            <!-- Low Battery level -->
-            <Label
-                x:Name="LowLevelLabel"
-                Text="{x:Static resources:AppResources.StatusTextLowBatteryLevel}"
-                FontSize="Small"
-                IsVisible="{Binding IsCurrentChargeLow}" />
-            <Button 
-                Text="{Binding ButtonText}"
-                IsVisible="{Binding IsButtonVisible}"
-                IsEnabled="{Binding IsIdle}"
-                Command="{Binding OnButtonClicked}"/>
-			<Button
-                Style="{StaticResource SecondaryButton}"
-                Text="{Binding LockitButtonText}"
-                IsVisible="{Binding IsLockitButtonVisible}"
-                IsEnabled="{Binding IsIdle}"
-                Command="{Binding OnLockitButtonClicked}"/>
-			<!-- Rental description (tarif name, options and rental info -->
-            <Grid
+					<Label
+						Grid.Column="2"
+						Grid.Row="1"
+						FontAttributes="Bold"
+						HorizontalTextAlignment="Right"
+						IsVisible="{Binding DisplayId, Converter={StaticResource Label_Converter}}"
+						Text="{Binding DisplayId}"/>
+
+				</Grid>
+
+				<!-- Rental state -->
+				<Label 
+						Text="{Binding StateText}"
+						TextColor="{Binding StateColor}"/>
+				<Label 
+						Text="{Binding ErrorText}"
+						IsVisible="{Binding ErrorText, Converter={StaticResource Label_Converter}}"
+						TextColor="Red"/>
+
+				<!-- Buttons -->
+				<Button 
+						Text="{Binding ButtonText}"
+						IsVisible="{Binding IsButtonVisible}"
+						Command="{Binding OnButtonClicked}"/>
+				<Button
+						Style="{StaticResource SecondaryButton}"
+						Text="{Binding LockitButtonText}"
+						IsVisible="{Binding IsLockitButtonVisible}"
+						Command="{Binding OnLockitButtonClicked}"/>
+				<!-- Rental description (tarif name, options and rental info -->
+				<Grid
                 RowSpacing="0" 
                 IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}">
-                <Grid.RowDefinitions>
-                    <!-- start tarif- entries -->
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <!-- start rental info -->
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
+					<Grid.RowDefinitions>
+						<!-- start tarif- entries -->
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<!-- start rental info -->
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
 
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <!-- start tarif- entries (should be a CollectionView) -->
-                <Label 
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="*" />
+					</Grid.ColumnDefinitions>
+					<!-- start tarif- entries (should be a CollectionView) -->
+					<Label 
                     Text= "{x:Static resources:AppResources.MessageBikesManagementTariffDescriptionTariffHeader}"
                     IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}"
                     Grid.Row="0" 
                     FontAttributes="Bold"/>
-                <Label 
+					<Label 
                     Text="{Binding TariffDescription.Header}"
                     IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}"
                     Grid.Row="0" 
                     Grid.Column="1"
                     FontAttributes="Bold"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.TarifEntry1.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry1.Description, Converter={StaticResource Label_Converter}}"
                     Grid.Row="1"/>
-                <Label 
+					<Label 
                     Text="{Binding TariffDescription.TarifEntry1.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry1.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="1" 
                     Grid.Column="1"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.TarifEntry2.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry2.Description, Converter={StaticResource Label_Converter}}"
                     Grid.Row="2"/>
-                <Label 
+					<Label 
                     Text="{Binding TariffDescription.TarifEntry2.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry2.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="2" 
                     Grid.Column="1"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.TarifEntry3.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry3.Description, Converter={StaticResource Label_Converter}}"
                     Grid.Row="3"/>
-                <Label 
+					<Label 
                     Text="{Binding TariffDescription.TarifEntry3.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry3.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="3" 
                     Grid.Column="1"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.TarifEntry4.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry4.Description, Converter={StaticResource Label_Converter}}"
                     Grid.Row="4"/>
-                <Label 
+					<Label 
                     Text="{Binding TariffDescription.TarifEntry4.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry4.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="4" 
                     Grid.Column="1"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.TarifEntry5.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry5.Description, Converter={StaticResource Label_Converter}}"
                     Grid.Row="5"/>
-                <Label 
+					<Label 
                     Text="{Binding TariffDescription.TarifEntry5.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry5.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="5" 
                     Grid.Column="1"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.TarifEntry6.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry6.Description, Converter={StaticResource Label_Converter}}"
                     Grid.Row="6"/>
-                <Label 
+					<Label 
                     Text="{Binding TariffDescription.TarifEntry6.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry6.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="6" 
                     Grid.Column="1"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.TarifEntry7.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry7.Description, Converter={StaticResource Label_Converter}}"
                     Grid.Row="7"/>
-                <Label 
+					<Label 
                     Text="{Binding TariffDescription.TarifEntry7.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry7.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="7" 
                     Grid.Column="1"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.TarifEntry8.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry8.Description, Converter={StaticResource Label_Converter}}"
                     Grid.Row="8"/>
-                <Label 
+					<Label 
                     Text="{Binding TariffDescription.TarifEntry8.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry8.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="8" 
                     Grid.Column="1"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.TarifEntry9.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry9.Description, Converter={StaticResource Label_Converter}}"
                     Grid.Row="9"/>
-                <Label 
+					<Label 
                     Text="{Binding TariffDescription.TarifEntry9.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry9.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="9" 
                     Grid.Column="1"/>
-                <!-- start tarif- entries (should be a CollectionView) -->
-                <Label 
+					<!-- start tarif- entries (should be a CollectionView) -->
+					<Label 
                     Text= "{Binding TariffDescription.InfoEntry1}"
                     IsVisible="{Binding TariffDescription.InfoEntry1, Converter={StaticResource Label_Converter}}"
                     Grid.Row="10"
                     Grid.ColumnSpan="2"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.InfoEntry2}"
                     IsVisible="{Binding TariffDescription.InfoEntry2, Converter={StaticResource Label_Converter}}"
                     Grid.Row="11"
                     Grid.ColumnSpan="2"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.InfoEntry3}"
                     IsVisible="{Binding TariffDescription.InfoEntry3, Converter={StaticResource Label_Converter}}"
                     Grid.Row="12"
                     Grid.ColumnSpan="2"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.InfoEntry4}"
                     IsVisible="{Binding TariffDescription.InfoEntry4, Converter={StaticResource Label_Converter}}"
                     Grid.Row="13"
                     Grid.ColumnSpan="2"/>
-                <Label 
+					<Label 
                     Text= "{Binding TariffDescription.TrackingInfoText}"
                     IsVisible="{Binding TariffDescription.TrackingInfoText, Converter={StaticResource Label_Converter}}"
                     Grid.Row="14"
                     Grid.ColumnSpan="2"/>
-            </Grid>
-        </StackLayout>
-    </ContentView>
+				</Grid>
+			</StackLayout>
+		</Frame>
+	</ContentView>
 </ViewCell>
diff --git a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml
index 80ea253..0868834 100644
--- a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml
+++ b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml
@@ -5,6 +5,7 @@
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
 	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
+	BackgroundColor="{DynamicResource background-color}"
 	Shell.FlyoutBehavior="Disabled"
 	Shell.NavBarIsVisible="{Binding IsIdle}">
 
@@ -16,6 +17,7 @@
 		</Grid>
 	</Shell.TitleView>
 
+
 	<ContentPage.Resources>
 		<ResourceDictionary>
 			<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
@@ -26,109 +28,160 @@
 
 		<!--Grid for Bike(s) view and Running process in same row-->
 		<Grid>
+			<!-- Grid for Content -->
+			<Grid
+				Grid.Row="0"
+				RowSpacing="0"
+				RowDefinitions="Auto,1*,Auto">
 
-			<StackLayout Grid.Row="0" Spacing="0">
+				<StackLayout
+						Grid.Row="0"
+						Spacing="0"
+						Orientation="Vertical">
 
-				<!--No Network Connection-->
-				<sharedGui:NotConnectedToNetView/>
+					<!--Station-->
+					<StackLayout
+						BackgroundColor="{DynamicResource secondary-back-title-color}"
+						IsVisible="{Binding IsIdle}"
+						Padding="20,0,20,0">
 
-				<Frame>
+						<!--Line-->
+						<BoxView
+							HeightRequest="1"
+							WidthRequest="400"
+							HorizontalOptions="Center"
+							Color="White"/>
 
-					<!-- Grid for Content -->
-					<Grid
-						RowDefinitions="Auto,1*,Auto,Auto">
+						<Grid
+							ColumnDefinitions="Auto,1*"
+							RowDefinitions="Auto"
+							Padding="0,0,0,5">
 
-						<!--Station-->
-						<StackLayout
-							Orientation="Vertical">
-
-							<!--Title-->
-							<Label 
-								HorizontalOptions="Center"
-								FontAttributes="Bold"
-								TextColor="{DynamicResource primary-back-title-color}"
-								Text="{Binding StationDetailText}"/>
-
-							<!--Line-->
-							<BoxView
-								HeightRequest="1"
-								Color="{DynamicResource primary-back-title-color}"/>
-
-						</StackLayout>
-
-						<!--Bike(s)-->
-						<StackLayout
-							Spacing="0"
-							Grid.Row="1"
-							IsVisible="{Binding IsBikesListVisible}"
-							Orientation="Vertical">
-
-							<!--Hint for Outdated Data.-->
-							<sharedGui:HintForRefreshingPageView/>
-
-							<ListView
-							x:Name="BikesAtStationListView"  
-							SelectionMode="None"
-							SelectedItem="{Binding SelectedBike}"
-							IsEnabled="{Binding IsIdle}"
-							HasUnevenRows="True"
-							ItemTemplate="{StaticResource bikeTemplateSelector}"
-							IsPullToRefreshEnabled="True"
-							RefreshCommand="{Binding RefreshCommand}"
-							IsRefreshing="{Binding IsRefreshing}"/>
-
-						</StackLayout>
-
-						<!--No Bikes-->
+							<!--Station id-->
 							<Label
-							IsVisible="{Binding IsNoBikesAtStationVisible}"
-							Text="{Binding NoBikesAtStationText}"/>
-
-							<!--Info text-->
-						<Label
-							Grid.Row="2"
-							Text="{Binding StatusInfoText}"
-							IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
-							FontSize="Small"
-							HorizontalOptions="CenterAndExpand"
-							VerticalOptions="CenterAndExpand"/>
-
-						<!-- Contact and Login at end of page-->
-						<StackLayout
-							Grid.Row="3"
-							Orientation="Vertical">
-
-							<!--Line-->
-							<BoxView
-								HeightRequest="1"
-								Color="{DynamicResource primary-back-title-color}"/>
+									Grid.Column="0"
+									Grid.Row="0"
+									FontSize="Small"
+									HorizontalOptions="Start"
+									TextColor="White"
+									Text="{Binding StationDetailText}"/>
 
 							<!--Contact to operator-->
-							<Label 
-								TextType="Html"
-								Text="{Binding ContactSupportHintText}">
+							<Label
+									Grid.Column="1"
+									Grid.Row="0"
+									TextType="Html"
+									FontSize="Small"
+									HorizontalOptions="End"
+									TextColor="White"
+									Text="{Binding ContactSupportHintText}">
 								<Label.GestureRecognizers>
 									<TapGestureRecognizer Command="{Binding ContactSupportClickedCommand}"/>
 								</Label.GestureRecognizers>
 							</Label>
 
-							<!--Login required-->
-							<Label 
-								IsVisible="{Binding IsLoginRequiredHintVisible}"
-								TextType="Html"
-								Text="{Binding LoginRequiredHintText}">
-								<Label.GestureRecognizers>
-									<TapGestureRecognizer Command="{Binding LoginRequiredHintClickedCommand}"/>
-								</Label.GestureRecognizers>
-							</Label>
+						</Grid>
 
-						</StackLayout>
+					</StackLayout>
 
-					</Grid>
+					<!--No Network Connection-->
+					<sharedGui:NotConnectedToNetView/>
 
-				</Frame>
+					<!--Bike(s)-->
+					<StackLayout
+						IsVisible="{Binding IsBikesListVisible}"
+						Spacing="0">
 
-			</StackLayout>
+						<!--Hint for Outdated Data.-->
+						<sharedGui:HintForRefreshingPageView/>
+
+						<ListView
+							Grid.Row="1"
+							x:Name="BikesAtStationListView"  
+							SelectionMode="None"
+							SelectedItem="{Binding SelectedBike}"
+							IsEnabled="{Binding IsIdle}"
+							HasUnevenRows="True"
+							SeparatorVisibility="None"
+							ItemTemplate="{StaticResource bikeTemplateSelector}"
+							IsPullToRefreshEnabled="True"
+							RefreshCommand="{Binding RefreshCommand}"
+							IsRefreshing="{Binding IsRefreshing}"/>
+
+					</StackLayout>
+
+				</StackLayout>
+
+				<!--No Bikes-->
+				<Label
+					Grid.Row="1"
+					Margin="20"
+					IsVisible="{Binding IsNoBikesAtStationVisible}"
+					Text="{Binding NoBikesAtStationText}"/>
+
+				<!--Info at End of Page-->
+				<StackLayout
+					Grid.Row="2"
+					Orientation="Vertical"
+					Spacing="0"
+					Padding="20,0,20,0">
+
+					<!--Info text-->
+					<Label
+						Text="{Binding StatusInfoText}"
+						IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
+						FontSize="Small"
+						TextColor="DimGray"
+						Padding="5"
+						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>
+
+					<!--Login-->
+					<StackLayout Spacing="0">
+						<StackLayout.Triggers>
+							<DataTrigger TargetType="StackLayout"
+							 Binding="{Binding IsLoginRequiredHintVisible}"
+							 Value="false">
+								<Setter Property="HeightRequest" Value="0" />
+							</DataTrigger>
+						</StackLayout.Triggers>
+
+						<!--Line-->
+						<BoxView
+							HeightRequest="1"
+							WidthRequest="400"
+							HorizontalOptions="Center"
+							IsVisible="{Binding IsLoginRequiredHintVisible}"
+							Color="DimGray" />
+
+						<!--Login required-->
+						<Label
+							IsVisible="{Binding IsLoginRequiredHintVisible}"
+							TextType="Html"
+							TextColor="DimGray" 
+							Text="{Binding LoginRequiredHintText}">
+							<Label.GestureRecognizers>
+								<TapGestureRecognizer Command="{Binding LoginRequiredHintClickedCommand}"/>
+							</Label.GestureRecognizers>
+						</Label>
+
+					</StackLayout>
+
+				</StackLayout>
+
+			</Grid>
 
 			<!--While process is running-->
 			<sharedGui:RunningProcessView
@@ -138,5 +191,5 @@
 		</Grid>
 
 	</ContentPage.Content>
-	
+
 </ContentPage>
diff --git a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml
index c3b70a0..a1705e7 100644
--- a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml
+++ b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml
@@ -4,7 +4,8 @@
 	x:Class="TINK.View.FindBike.FindBikePage"
 	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
-	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View">
+	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
+	BackgroundColor="{DynamicResource background-color}">
 
 	<Shell.TitleView>
 		<Grid ColumnDefinitions="Auto, 1*">
@@ -23,68 +24,88 @@
 
 		<!--Grid for Bike(s) view and Running process in same row-->
 		<Grid>
-			<StackLayout Grid.Row="0">
 
-				<!--No Network Connection-->
-				<sharedGui:NotConnectedToNetView/>
+			<Grid
+					RowDefinitions="1*,Auto"
+				RowSpacing="0"
+					Grid.Row="0">
 
-				<Frame>
+				<StackLayout
+						Grid.Row="0"
+						Spacing="0"
+						Orientation="Vertical">
 
-					<Grid
-					RowDefinitions="1*,32">
+					<!--No Network Connection-->
+					<sharedGui:NotConnectedToNetView/>
 
-						<!--Search bike-->
-						<StackLayout>
-							<Entry
-						Placeholder="{x:Static resources:AppResources.PlaceholderFindBike}"
+					<!--Search bike-->
+					<StackLayout 
+						BackgroundColor="White"
 						IsVisible="{Binding IsSelectBikeVisible}"
-						MaxLength="10"
-						CursorPosition="0"
-						Text="{Binding BikeIdUserInput}"/>
+						Padding="20">
 
-							<Button
-						Text="{x:Static resources:AppResources.MarkingFindBike}"
-						IsEnabled="{Binding IsSelectBikeEnabled}"
-						IsVisible="{Binding IsSelectBikeVisible}"
-						Command="{Binding OnSelectBikeRequest}"/>
+						<Entry
+							Placeholder="{x:Static resources:AppResources.PlaceholderFindBike}"
+							MaxLength="10"
+							CursorPosition="0"
+							Text="{Binding BikeIdUserInput}"/>
 
-							<StackLayout
+						<Button
+							Text="{x:Static resources:AppResources.MarkingFindBike}"
+							IsEnabled="{Binding IsSelectBikeEnabled}"
+							Command="{Binding OnSelectBikeRequest}"/>
+
+					</StackLayout>
+
+					<!-- Bike -->
+					<StackLayout 
 						Spacing="0"
 						IsVisible="{Binding IsBikesListVisible}"
 						Orientation="Vertical">
 
-								<!--Hint for Outdated Data.-->
-								<sharedGui:HintForRefreshingPageView/>
+						<!--Hint for Outdated Data.-->
+						<sharedGui:HintForRefreshingPageView/>
 
-								<ListView
-						x:Name="FindBikeListView"
-						SelectionMode="None"
-						SelectedItem="{Binding SelectedBike}"
-						IsEnabled="{Binding IsIdle}"                
-						HasUnevenRows="True"
-						ItemTemplate="{StaticResource bikeTemplateSelector}"
-						IsPullToRefreshEnabled="True"
-						RefreshCommand="{Binding RefreshCommand}"
-						IsRefreshing="{Binding IsRefreshing}"/>
+						<ListView 
+								x:Name="FindBikeListView"
+								SelectionMode="None"
+								SelectedItem="{Binding SelectedBike}"
+								IsEnabled="{Binding IsIdle}"                
+								HasUnevenRows="True"
+								SeparatorVisibility="None"
+								ItemTemplate="{StaticResource bikeTemplateSelector}"
+								IsPullToRefreshEnabled="True"
+								RefreshCommand="{Binding RefreshCommand}"
+								IsRefreshing="{Binding IsRefreshing}"/>
 
-							</StackLayout>
+					</StackLayout>
 
-						</StackLayout>
+				</StackLayout>
 
-						<!--Info text-->
-						<Label
+				<!--Info text-->
+				<Label
 						Grid.Row="1"
 						Text="{Binding StatusInfoText}"
 						IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
 						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>
 
-					</Grid>
-
-				</Frame>
-				
-			</StackLayout>
+			</Grid>
 
 			<!--While process is running-->
 			<sharedGui:RunningProcessView
@@ -94,5 +115,5 @@
 		</Grid>
 
 	</ContentPage.Content>
-	
+
 </ContentPage>
diff --git a/Meinkonrad/TINK/View/Map/MapPage.xaml b/Meinkonrad/TINK/View/Map/MapPage.xaml
index 9c06b51..57e02df 100644
--- a/Meinkonrad/TINK/View/Map/MapPage.xaml
+++ b/Meinkonrad/TINK/View/Map/MapPage.xaml
@@ -7,7 +7,7 @@
 	x:Class="TINK.View.Map.MapPage"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
 	Shell.NavBarIsVisible="{Binding IsNavBarVisible}"
-	BackgroundColor="{DynamicResource Key=primary-back-title-color}">
+	BackgroundColor="{DynamicResource Key=background-color}">
 
 	<Shell.TitleView >
 		<Grid ColumnDefinitions="Auto, 1*">
@@ -17,6 +17,7 @@
 		</Grid>
 	</Shell.TitleView>
 
+
 	<ContentPage.Content>
 
 		<!--Grid for Map with Buttons and Running process-->
@@ -28,21 +29,22 @@
 
 				<sharedGui:NotConnectedToNetView/>
 
-				<Grid  Grid.Row="1"
-			RowDefinitions="3,46,1*,32"
-			ColumnDefinitions="1*,Auto,1*"
-			IsEnabled="{Binding IsMapPageEnabled}"
-			VerticalOptions="FillAndExpand">
+				<Grid
+					RowDefinitions="20,46,1*,Auto"
+					ColumnDefinitions="1*,Auto,1*"
+					RowSpacing="0"
+					IsEnabled="{Binding IsMapPageEnabled}"
+					VerticalOptions="FillAndExpand">
 
 					<!--Map-->
 					<maps:Map
-			Grid.RowSpan="3"
-			Grid.ColumnSpan="3"
-			WidthRequest="320"
-			HeightRequest="800"
-			x:Name="MyMap"
-			MyLocationEnabled="True"
-			MapType="Street">
+						Grid.RowSpan="3"
+						Grid.ColumnSpan="3"
+						WidthRequest="320"
+						HeightRequest="800"
+						x:Name="MyMap"
+						MyLocationEnabled="True"
+						MapType="Street">
 						<maps:Map.Behaviors>
 							<bindings:BindingPinsBehavior Value="{Binding Pins}"/>
 							<bindings:PinClickedToCommandBehavior Command="{Binding PinClickedCommand}"/>
@@ -51,68 +53,159 @@
 
 					<!--Buttons for choosing bike type-->
 					<Frame
-				CornerRadius="13"
-				Grid.Row="1"
-				Grid.Column="1"
-				Margin="0"
-				Padding="0"
-				IsVisible="{Binding IsNavBarVisible}"
-				BackgroundColor="{DynamicResource secondary-back-title-color}">
+						CornerRadius="13"
+						Grid.Row="1"
+						Grid.Column="1"
+						Margin="0"
+						Padding="0"
+						IsVisible="{Binding IsNavBarVisible}"
+						BackgroundColor="{DynamicResource secondary-back-title-color}">
 						<StackLayout
-					Orientation="Horizontal"
-					Margin="0"
-					Padding="0">
+							Orientation="Horizontal"
+							Margin="0"
+							Padding="0">
 							<Button
-						x:Name="KonradButton"
-						AutomationId ="FilterKonrad_button"                    
-						Text="{x:Static resources:AppResources.MarkingCityBike}"
-						Command="{Binding OnToggleTinkToKonrad}" 
-						IsVisible="{Binding IsToggleVisible}"
-						BackgroundColor="{Binding KonradColor}"
-						BorderColor="{Binding KonradColor}"
-						BorderWidth="0"
-						VerticalOptions="Center"
-						HorizontalOptions="Center"
-						WidthRequest="94"
-						HeightRequest="40"
-						BorderRadius="10"
-						Margin="3,0,0,0"
-						FontSize="Small"
-						FontAttributes="Bold"
-						TextColor="{Binding NoKonradColor}">
+								x:Name="KonradButton"
+								AutomationId ="FilterKonrad_button"                    
+								Text="{x:Static resources:AppResources.MarkingCityBike}"
+								Command="{Binding OnToggleTinkToKonrad}" 
+								IsVisible="{Binding IsToggleVisible}"
+								BackgroundColor="{Binding KonradColor}"
+								BorderColor="{Binding KonradColor}"
+								BorderWidth="0"
+								VerticalOptions="Center"
+								HorizontalOptions="Center"
+								WidthRequest="94"
+								HeightRequest="40"
+								CornerRadius="10"
+								Margin="3,0,0,0"
+								FontSize="Small"
+								FontAttributes="Bold"
+								TextColor="{Binding NoKonradColor}">
 							</Button>
 							<Button
-						x:Name="TINKButton"
-						AutomationId ="FilterTINK_button"
-						Text="{x:Static resources:AppResources.MarkingCargoBike}"
-						Command="{Binding OnToggleKonradToTink}"
-						IsVisible="{Binding IsToggleVisible}"
-						BackgroundColor="{Binding TinkColor}"
-						BorderColor="{Binding TinkColor}"
-						BorderWidth="0"
-						VerticalOptions="Center"
-						HorizontalOptions="Center"
-						WidthRequest="94"
-						HeightRequest="40"
-						BorderRadius="10"
-						Margin="0,0,3,0"
-						FontSize="Small"
-						FontAttributes="Bold"
-						TextColor="{Binding NoTinkColor}">
+								x:Name="TINKButton"
+								AutomationId ="FilterTINK_button"
+								Text="{x:Static resources:AppResources.MarkingCargoBike}"
+								Command="{Binding OnToggleKonradToTink}"
+								IsVisible="{Binding IsToggleVisible}"
+								BackgroundColor="{Binding TinkColor}"
+								BorderColor="{Binding TinkColor}"
+								BorderWidth="0"
+								VerticalOptions="Center"
+								HorizontalOptions="Center"
+								WidthRequest="94"
+								HeightRequest="40"
+								CornerRadius="10"
+								Margin="0,0,3,0"
+								FontSize="Small"
+								FontAttributes="Bold"
+								TextColor="{Binding NoTinkColor}">
 							</Button>
 						</StackLayout>
 					</Frame>
 
+					<!--MyBikes-->
+					<Frame
+						Grid.Row="2"
+						Grid.Column="0"
+						Grid.ColumnSpan="3"
+						Margin="0,0,0,20"
+						Padding="0"
+						BackgroundColor="White"
+						HasShadow="True"
+						VerticalOptions="End"
+						HorizontalOptions="CenterAndExpand"
+						BorderColor="{DynamicResource primary-back-title-color}"
+						CornerRadius="10">
+						<Frame.Triggers>
+							<DataTrigger
+								TargetType="Frame"
+								Binding="{Binding Path=MyBikesCountText.Length}" Value="0">
+								<Setter Property="IsVisible" Value="false" />
+							</DataTrigger>
+						</Frame.Triggers>
+						<Frame.GestureRecognizers>
+							<TapGestureRecognizer Command="{Binding OnMyBikesButtonClicked}" />
+						</Frame.GestureRecognizers>
+						<Grid
+							RowDefinitions="18,Auto,1*"
+							ColumnDefinitions="Auto"
+							RowSpacing="0">
+							<Image
+								Grid.Row="1"
+								Margin="-5">
+								<Image.Source>
+									<FontImageSource
+										Glyph="{StaticResource IconMyBikes}"
+										Color="DimGray" FontFamily="FA-S"/>
+								</Image.Source>
+							</Image>
+							<BoxView
+								Grid.Row="0"
+								Grid.RowSpan="2"
+								BackgroundColor="{DynamicResource primary-back-title-color}"
+								WidthRequest="20"
+								HeightRequest="20"
+								CornerRadius="10"
+								HorizontalOptions="End"
+								VerticalOptions="Start"
+								Margin="5"/>
+							<Frame
+								Grid.Row="0"
+								Grid.RowSpan="2"
+								BackgroundColor="{DynamicResource primary-back-title-color}"
+								WidthRequest="20"
+								HeightRequest="20"
+								CornerRadius="50"
+								HasShadow="False"
+								HorizontalOptions="End"
+								VerticalOptions="Start"
+								Padding="0"
+								Margin="5">
+								<Label
+									Text="{Binding MyBikesCountText}"
+									FontSize="Medium"
+									FontAttributes="Bold"
+									VerticalOptions="Center"
+									HorizontalOptions="Center"
+									TextColor="White"
+									Padding="0"
+									Margin="-10"/>
+							</Frame>
+							<Label
+								Grid.Row="2"
+								Text="{x:Static resources:AppResources.MarkingMyBikes}"
+								FontSize="Micro"
+								TextColor="DimGray"
+								VerticalOptions="Center"
+								Margin="10,0,10,5"
+								Padding="0"/>
+						</Grid>
+					</Frame>
+
 					<!--Info text-->
 					<Label
-				Grid.Row="3"
-				Grid.ColumnSpan="3"
-				Text="{Binding StatusInfoText}"
-				IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
-				TextColor="White"
-				FontSize="Small"
-				HorizontalOptions="CenterAndExpand"
-				VerticalOptions="CenterAndExpand"/>
+						Grid.Row="3"
+						Grid.ColumnSpan="3"
+						Text="{Binding StatusInfoText}"
+						IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
+						FontSize="Small"
+						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>
 
 				</Grid>
 
@@ -122,9 +215,8 @@
 			<sharedGui:RunningProcessView
 					IsVisible="{Binding IsProcessWithRunningProcessView}"
 					Grid.Row="0"/>
-
 		</Grid>
 
 	</ContentPage.Content>
-	
+
 </ContentPage>
diff --git a/Meinkonrad/TINK/View/Map/MapPage.xaml.cs b/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
index 712326e..5f1c4aa 100644
--- a/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
@@ -175,16 +175,6 @@ namespace TINK.View.Map
 				return;
 			}
 
-			try
-			{
-				ApplyCustomiOSStyling();
-			}
-			catch (Exception exception)
-			{
-				// Continue because styling is not essential.
-				Log.ForContext<MapPage>().Error("IOS specific styling of map page failed. {Exception}", exception);
-			}
-
 			try
 			{
 				base.OnAppearing();
@@ -250,22 +240,6 @@ namespace TINK.View.Map
 				Navigation);
 		}
 
-		/// <summary>
-		/// Applies iOS specific styling to branded Buttons.
-		/// </summary>
-		private void ApplyCustomiOSStyling()
-		{
-			if (Device.RuntimePlatform == Device.iOS)
-			{
-				TINKButton.BackgroundColor = Color.LightGray;
-				TINKButton.BorderColor = Color.Black;
-				TINKButton.Margin = new Thickness(10, 10, 10, 10);
-				KonradButton.BackgroundColor = Color.LightGray;
-				KonradButton.BorderColor = Color.Black;
-				KonradButton.Margin = new Thickness(10, 10, 10, 10);
-			}
-		}
-
 		/// <summary>
 		/// Invoked when pages is closed/ hidden. 
 		/// Stops update process.
diff --git a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml
index 91c4f2e..ca73a1f 100644
--- a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml
+++ b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml
@@ -6,7 +6,9 @@
 	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
-	Shell.FlyoutBehavior="{Binding FlyoutBehavior}">
+	BackgroundColor="{DynamicResource background-color}"
+	Shell.FlyoutBehavior="{Binding FlyoutBehavior}"
+	>
 
 	<Shell.TitleView>
 		<Grid ColumnDefinitions="Auto, 1*">
@@ -16,6 +18,7 @@
 		</Grid>
 	</Shell.TitleView>
 
+
 	<ContentPage.Resources>
 		<ResourceDictionary>
 			<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
@@ -27,59 +30,75 @@
 		<!--Grid for Bike(s) view and Running process in same row-->
 		<Grid>
 
-			<StackLayout Grid.Row="0">
+			<!--Bike(s) view-->
+			<Grid
+					RowDefinitions="1*,Auto"
+				RowSpacing="0"
+					Grid.Row="0">
 
-				<!--No Network Connection-->
-				<sharedGui:NotConnectedToNetView/>
+				<StackLayout
+						Grid.Row="0"
+						Spacing="0"
+						Orientation="Vertical">
 
-				<Frame>
+					<!--No Network Connection-->
+					<sharedGui:NotConnectedToNetView/>
 
-					<!--Bike(s) view-->
-					<Grid
-					RowDefinitions="1*,32">
-
-						<!--Bike(s)-->
-						<StackLayout
+					<!--Bike(s)-->
+					<StackLayout 
 						Spacing="0"
 						IsVisible="{Binding IsBikesListVisible}"
 						Orientation="Vertical">
 
-							<!--Hint for Outdated Data.-->
-							<sharedGui:HintForRefreshingPageView/>
+						<!--Hint for Outdated Data.-->
+						<sharedGui:HintForRefreshingPageView/>
 
-							<ListView
+						<ListView
 						x:Name="MyBikesListView"
 						SelectionMode="None"
 						SelectedItem="{Binding SelectedBike}"
 						IsEnabled="{Binding IsIdle}"                
 						HasUnevenRows="True"
+						SeparatorVisibility="None"
 						ItemTemplate="{StaticResource bikeTemplateSelector}"
 						IsPullToRefreshEnabled="True"
 						RefreshCommand="{Binding RefreshCommand}"
 						IsRefreshing="{Binding IsRefreshing}"/>
 
-						</StackLayout>
+					</StackLayout>
 
-						<!--No Bikes-->
-						<Label
-						Grid.Row="0"
+					<!--No Bikes-->
+					<Label
+						Margin="20"
 						IsVisible="{Binding IsNoBikesOccupiedVisible}"
 						Text="{Binding NoBikesOccupiedText}"/>
 
-						<!--Info text-->
-						<Label
+				</StackLayout>
+
+				<!--Info text-->
+				<Label
 						Grid.Row="1"
 						Text="{Binding StatusInfoText}"
 						IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
 						FontSize="Small"
-						HorizontalOptions="CenterAndExpand"
-						VerticalOptions="CenterAndExpand"/>
+						TextColor="DimGray"
+						Padding="5"
+						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>
 
-					</Grid>
-
-				</Frame>
-
-			</StackLayout>
+			</Grid>
 
 			<!--While process is running-->
 			<sharedGui:RunningProcessView
@@ -89,5 +108,5 @@
 		</Grid>
 
 	</ContentPage.Content>
-	
+
 </ContentPage>
diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml
index ce2c57c..33f9f49 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.360" android:versionCode="360">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.361" android:versionCode="361">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- 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 1ace544..7358aaf 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.0.0.73")]
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.93")]
 	public partial class Resource
 	{
 		
diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist
index d9d4a22..8ba33f9 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>360</string>
+	<string>361</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.360</string>
+	<string>3.0.361</string>
 </dict>
 </plist>
diff --git a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml
index 4ea0c9a..6101105 100644
--- a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml
+++ b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml
@@ -7,7 +7,7 @@
 	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
 	Shell.FlyoutBehavior="Disabled"
-	BackgroundColor="#f6f6f6"
+	BackgroundColor="{DynamicResource background-color}"
 	Shell.NavBarIsVisible="{Binding IsIdle}">
 
 	<Shell.TitleView>
@@ -28,9 +28,11 @@
 		<!--Grid for Bike(s) view and Running process in same row-->
 		<Grid>
 			<!-- Grid for Content -->
-			<Grid Grid.Row="0"
-					RowDefinitions="Auto,1*,Auto">
-
+			<Grid
+				Grid.Row="0"
+				RowSpacing="0"
+				RowDefinitions="Auto,1*,Auto">
+  
 				<StackLayout
 						Grid.Row="0"
 						Spacing="0"
@@ -38,22 +40,46 @@
 
 					<!--Station-->
 					<StackLayout
-						BackgroundColor="{DynamicResource primary-back-title-color}">
+						BackgroundColor="{DynamicResource primary-back-title-color}"
+						IsVisible="{Binding IsIdle}"
+						Padding="20,0,20,0">
 
 						<!--Line-->
 						<BoxView
-								HeightRequest="1"
-								WidthRequest="260"
-								HorizontalOptions="Center"
-								Color="White"/>
+							HeightRequest="1"
+							WidthRequest="400"
+							HorizontalOptions="Center"
+							Color="White"/>
 
-						<!--Title-->
-						<Label 
-								HorizontalOptions="Center"
-								FontAttributes="Bold"
-								Padding="10,0,10,10"
-								TextColor="White"
-								Text="{Binding StationDetailText}"/>
+						<Grid
+							ColumnDefinitions="Auto,1*"
+							RowDefinitions="Auto"
+							Padding="0,0,0,5">
+
+								<!--Station id-->
+								<Label
+									Grid.Column="0"
+									Grid.Row="0"
+									FontSize="Small"
+									HorizontalOptions="Start"
+									TextColor="White"
+									Text="{Binding StationDetailText}"/>
+							
+								<!--Contact to operator-->
+								<Label
+									Grid.Column="1"
+									Grid.Row="0"
+									TextType="Html"
+									FontSize="Small"
+									HorizontalOptions="End"
+									TextColor="White"
+									Text="{Binding ContactSupportHintText}">
+									<Label.GestureRecognizers>
+										<TapGestureRecognizer Command="{Binding ContactSupportClickedCommand}"/>
+									</Label.GestureRecognizers>
+								</Label>
+
+						</Grid>
 
 					</StackLayout>
 
@@ -68,73 +94,89 @@
 						<!--Hint for Outdated Data.-->
 						<sharedGui:HintForRefreshingPageView/>
 
-						<ListView Grid.Row="1"
-						x:Name="BikesAtStationListView"  
-						SelectionMode="None"
-						SelectedItem="{Binding SelectedBike}"
-						IsEnabled="{Binding IsIdle}"
-						HasUnevenRows="True"
-						SeparatorVisibility="None"
-						ItemTemplate="{StaticResource bikeTemplateSelector}"
-						IsPullToRefreshEnabled="True"
-						RefreshCommand="{Binding RefreshCommand}"
-						IsRefreshing="{Binding IsRefreshing}"/>
+						<ListView
+							Grid.Row="1"
+							x:Name="BikesAtStationListView"  
+							SelectionMode="None"
+							SelectedItem="{Binding SelectedBike}"
+							IsEnabled="{Binding IsIdle}"
+							HasUnevenRows="True"
+							SeparatorVisibility="None"
+							ItemTemplate="{StaticResource bikeTemplateSelector}"
+							IsPullToRefreshEnabled="True"
+							RefreshCommand="{Binding RefreshCommand}"
+							IsRefreshing="{Binding IsRefreshing}"/>
 
 					</StackLayout>
 
 				</StackLayout>
 
 				<!--No Bikes-->
-				<Label Grid.Row="1" Padding="10"
-						IsVisible="{Binding IsNoBikesAtStationVisible}"
-						Text="{Binding NoBikesAtStationText}"/>
+				<Label
+					Grid.Row="1"
+					Margin="20"
+					IsVisible="{Binding IsNoBikesAtStationVisible}"
+					Text="{Binding NoBikesAtStationText}"/>
 
+				<!--Info at End of Page-->
 				<StackLayout
 					Grid.Row="2"
 					Orientation="Vertical"
-					BackgroundColor="{DynamicResource primary-back-title-color}"
-					Padding="0,0,0,10">
+					Spacing="0"
+					Padding="20,0,20,0">
 
 					<!--Info text-->
 					<Label
 						Text="{Binding StatusInfoText}"
 						IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
 						FontSize="Small"
-						Padding="10,5,10,0"
-						TextColor="White"
-						HorizontalOptions="CenterAndExpand"
-						VerticalOptions="CenterAndExpand"/>
-
-					<!-- Contact and Login at end of page-->
-					<!--Line-->
-					<BoxView
-							HeightRequest="1"
-							WidthRequest="260"
-							HorizontalOptions="Center"
-							Color="White"/>
-
-					<!--Contact to operator-->
-					<Label
-							TextType="Html"
-							Padding="10,5,10,0"
-							TextColor="White"
-							Text="{Binding ContactSupportHintText}">
-						<Label.GestureRecognizers>
-							<TapGestureRecognizer Command="{Binding ContactSupportClickedCommand}"/>
-						</Label.GestureRecognizers>
+						TextColor="DimGray"
+						Padding="5"
+						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>
 
-					<!--Login required-->
-					<Label
+					<!--Login-->
+					<StackLayout Spacing="0">
+						<StackLayout.Triggers>
+							<DataTrigger TargetType="StackLayout"
+							 Binding="{Binding IsLoginRequiredHintVisible}"
+							 Value="false">
+								<Setter Property="HeightRequest" Value="0" />
+							</DataTrigger>
+						</StackLayout.Triggers>
+
+						<!--Line-->
+						<BoxView
+							HeightRequest="1"
+							WidthRequest="400"
+							HorizontalOptions="Center"
+							IsVisible="{Binding IsLoginRequiredHintVisible}"
+							Color="DimGray" />
+
+						<!--Login required-->
+						<Label
 							IsVisible="{Binding IsLoginRequiredHintVisible}"
 							TextType="Html"
-							Padding="10,5,10,0"
-							TextColor="White"
+							TextColor="DimGray" 
 							Text="{Binding LoginRequiredHintText}">
-						<Label.GestureRecognizers>
-							<TapGestureRecognizer Command="{Binding LoginRequiredHintClickedCommand}"/>
-						</Label.GestureRecognizers>
-					</Label>
+							<Label.GestureRecognizers>
+								<TapGestureRecognizer Command="{Binding LoginRequiredHintClickedCommand}"/>
+							</Label.GestureRecognizers>
+						</Label>
+
+					</StackLayout>
 
 				</StackLayout>
 
diff --git a/TINK/TINK/View/Contact/SelectStationPage.xaml b/TINK/TINK/View/Contact/SelectStationPage.xaml
index dac0a4a..ee5d0bb 100644
--- a/TINK/TINK/View/Contact/SelectStationPage.xaml
+++ b/TINK/TINK/View/Contact/SelectStationPage.xaml
@@ -19,8 +19,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">
 
@@ -114,14 +115,22 @@
 
 			<!--Info text-->
 			<Label
-				Grid.Row="3"
-				Grid.ColumnSpan="3"
-				Text="{Binding StatusInfoText}"
-				IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
-				TextColor="White"
-				FontSize="Small"
-				HorizontalOptions="CenterAndExpand"
-				VerticalOptions="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>
+				</Label.Triggers>
+			</Label>
 
 			<!--While process is running-->
 			<sharedGui:RunningProcessView
diff --git a/TINK/TINK/View/FindBike/FindBikePage.xaml b/TINK/TINK/View/FindBike/FindBikePage.xaml
index 4c53d91..9dc251d 100644
--- a/TINK/TINK/View/FindBike/FindBikePage.xaml
+++ b/TINK/TINK/View/FindBike/FindBikePage.xaml
@@ -6,7 +6,7 @@
 	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
-	BackgroundColor="#f6f6f6">
+	BackgroundColor="{DynamicResource background-color}">
 	
 	<Shell.TitleView>
 		<Grid ColumnDefinitions="Auto, 1*">
@@ -28,6 +28,7 @@
 
 			<Grid
 					RowDefinitions="1*,Auto"
+				RowSpacing="0"
 					Grid.Row="0">
 
 				<StackLayout
@@ -42,7 +43,7 @@
 					<StackLayout 
 						BackgroundColor="White"
 						IsVisible="{Binding IsSelectBikeVisible}"
-						Padding="10">
+						Padding="20">
 
 						<Entry
 							Placeholder="{x:Static resources:AppResources.PlaceholderFindBike}"
@@ -83,19 +84,27 @@
 				</StackLayout>
 
 				<!--Info text-->
-				<StackLayout
-					BackgroundColor="#f6f6f6"
-					Padding="10,5,10,10"
-					Grid.Row="1">
-
-					<Label
+				<Label
+						Grid.Row="1"
 						Text="{Binding StatusInfoText}"
 						IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
 						FontSize="Small"
-						HorizontalOptions="CenterAndExpand"
-						VerticalOptions="CenterAndExpand"/>
-
-				</StackLayout>
+						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>
 
 			</Grid>
 
diff --git a/TINK/TINK/View/Map/MapPage.xaml b/TINK/TINK/View/Map/MapPage.xaml
index e3dd21f..ab2273d 100644
--- a/TINK/TINK/View/Map/MapPage.xaml
+++ b/TINK/TINK/View/Map/MapPage.xaml
@@ -7,7 +7,7 @@
 			x:Class="TINK.View.Map.MapPage"
 			xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
 			Shell.NavBarIsVisible="{Binding IsNavBarVisible}"
-			BackgroundColor="{DynamicResource Key=primary-back-title-color}">
+			BackgroundColor="{DynamicResource Key=background-color}">
 
 	<Shell.TitleView >
 		<Grid ColumnDefinitions="Auto, 1*">
@@ -28,8 +28,9 @@
 			<sharedGui:NotConnectedToNetView/>
 
 				<Grid
-			RowDefinitions="3,46,1*,32"
+			RowDefinitions="20,46,1*,Auto"
 			ColumnDefinitions="1*,Auto,1*"
+					RowSpacing="0"
 			IsEnabled="{Binding IsMapPageEnabled}"
 			VerticalOptions="FillAndExpand">
 
@@ -49,7 +50,7 @@
 				</maps:Map>
 
 				<!--Buttons for choosing bike type-->
-				<Frame
+					<Frame
 				CornerRadius="13"
 				Grid.Row="1"
 				Grid.Column="1"
@@ -57,11 +58,11 @@
 				Padding="0"
 				IsVisible="{Binding IsNavBarVisible}"
 				BackgroundColor="{DynamicResource secondary-back-title-color}">
-					<StackLayout
+						<StackLayout
 					Orientation="Horizontal"
 					Margin="0"
 					Padding="0">
-						<Button
+							<Button
 						x:Name="KonradButton"
 						AutomationId ="FilterKonrad_button"                    
 						Text="{x:Static resources:AppResources.MarkingCityBike}"
@@ -74,13 +75,13 @@
 						HorizontalOptions="Center"
 						WidthRequest="94"
 						HeightRequest="40"
-						BorderRadius="10"
+						CornerRadius="10"
 						Margin="3,0,0,0"
 						FontSize="Small"
 						FontAttributes="Bold"
 						TextColor="{Binding NoKonradColor}">
-						</Button>
-						<Button
+							</Button>
+							<Button
 						x:Name="TINKButton"
 						AutomationId ="FilterTINK_button"
 						Text="{x:Static resources:AppResources.MarkingCargoBike}"
@@ -93,27 +94,118 @@
 						HorizontalOptions="Center"
 						WidthRequest="94"
 						HeightRequest="40"
-						BorderRadius="10"
+						CornerRadius="10"
 						Margin="0,0,3,0"
 						FontSize="Small"
 						FontAttributes="Bold"
 						TextColor="{Binding NoTinkColor}">
-						</Button>
-					</StackLayout>
-				</Frame>
+							</Button>
+						</StackLayout>
+					</Frame>
 
-				<!--Info text-->
-				<Label
-				Grid.Row="3"
-				Grid.ColumnSpan="3"
-				Text="{Binding StatusInfoText}"
-				IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
-				TextColor="White"
-				FontSize="Small"
-				HorizontalOptions="CenterAndExpand"
-				VerticalOptions="CenterAndExpand"/>
+					<!--MyBikes-->
+					<Frame
+						Grid.Row="2"
+						Grid.Column="0"
+						Grid.ColumnSpan="3"
+						Margin="0,0,0,20"
+						Padding="0"
+						BackgroundColor="White"
+						HasShadow="True"
+						VerticalOptions="End"
+						HorizontalOptions="CenterAndExpand"
+						BorderColor="{DynamicResource primary-back-title-color}"
+						CornerRadius="10">
+						<Frame.Triggers>
+							<DataTrigger
+								TargetType="Frame"
+								Binding="{Binding Path=MyBikesCountText.Length}" Value="0">
+								<Setter Property="IsVisible" Value="false" />
+							</DataTrigger>
+						</Frame.Triggers>
+						<Frame.GestureRecognizers>
+							<TapGestureRecognizer Command="{Binding OnMyBikesButtonClicked}" />
+						</Frame.GestureRecognizers>
+						<Grid
+							RowDefinitions="18,Auto,1*"
+							ColumnDefinitions="Auto"
+							RowSpacing="0">
+							<Image
+								Grid.Row="1"
+								Margin="-5">
+								<Image.Source>
+									<FontImageSource
+										Glyph="{StaticResource IconMyBikes}"
+										Color="DimGray" FontFamily="FA-S"/>
+								</Image.Source>
+							</Image>
+							<BoxView
+								Grid.Row="0"
+								Grid.RowSpan="2"
+								BackgroundColor="{DynamicResource primary-back-title-color}"
+								WidthRequest="20"
+								HeightRequest="20"
+								CornerRadius="10"
+								HorizontalOptions="End"
+								VerticalOptions="Start"
+								Margin="5"/>
+							<Frame
+								Grid.Row="0"
+								Grid.RowSpan="2"
+								BackgroundColor="{DynamicResource primary-back-title-color}"
+								WidthRequest="20"
+								HeightRequest="20"
+								CornerRadius="50"
+								HasShadow="False"
+								HorizontalOptions="End"
+								VerticalOptions="Start"
+								Padding="0"
+								Margin="5">
+								<Label
+									Text="{Binding MyBikesCountText}"
+									FontSize="Medium"
+									FontAttributes="Bold"
+									VerticalOptions="Center"
+									HorizontalOptions="Center"
+									TextColor="White"
+									Padding="0"
+									Margin="-10"/>
+							</Frame>
+							<Label
+								Grid.Row="2"
+								Text="{x:Static resources:AppResources.MarkingMyBikes}"
+								FontSize="Micro"
+								TextColor="DimGray"
+								VerticalOptions="Center"
+								Margin="10,0,10,5"
+								Padding="0"/>
+						</Grid>
+					</Frame>
 
-			</Grid>
+					<!--Info text-->
+					<Label
+						Grid.Row="3"
+						Grid.ColumnSpan="3"
+						Text="{Binding StatusInfoText}"
+						IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
+						FontSize="Small"
+						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>
+					
+				</Grid>
 
 			</StackLayout>
 
diff --git a/TINK/TINK/View/Map/MapPage.xaml.cs b/TINK/TINK/View/Map/MapPage.xaml.cs
index 712326e..5f1c4aa 100644
--- a/TINK/TINK/View/Map/MapPage.xaml.cs
+++ b/TINK/TINK/View/Map/MapPage.xaml.cs
@@ -175,16 +175,6 @@ namespace TINK.View.Map
 				return;
 			}
 
-			try
-			{
-				ApplyCustomiOSStyling();
-			}
-			catch (Exception exception)
-			{
-				// Continue because styling is not essential.
-				Log.ForContext<MapPage>().Error("IOS specific styling of map page failed. {Exception}", exception);
-			}
-
 			try
 			{
 				base.OnAppearing();
@@ -250,22 +240,6 @@ namespace TINK.View.Map
 				Navigation);
 		}
 
-		/// <summary>
-		/// Applies iOS specific styling to branded Buttons.
-		/// </summary>
-		private void ApplyCustomiOSStyling()
-		{
-			if (Device.RuntimePlatform == Device.iOS)
-			{
-				TINKButton.BackgroundColor = Color.LightGray;
-				TINKButton.BorderColor = Color.Black;
-				TINKButton.Margin = new Thickness(10, 10, 10, 10);
-				KonradButton.BackgroundColor = Color.LightGray;
-				KonradButton.BorderColor = Color.Black;
-				KonradButton.Margin = new Thickness(10, 10, 10, 10);
-			}
-		}
-
 		/// <summary>
 		/// Invoked when pages is closed/ hidden. 
 		/// Stops update process.
diff --git a/TINK/TINK/View/MyBikes/MyBikesPage.xaml b/TINK/TINK/View/MyBikes/MyBikesPage.xaml
index 032f457..aff8ed8 100644
--- a/TINK/TINK/View/MyBikes/MyBikesPage.xaml
+++ b/TINK/TINK/View/MyBikes/MyBikesPage.xaml
@@ -6,7 +6,7 @@
 	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
-	BackgroundColor="#f6f6f6"
+	BackgroundColor="{DynamicResource background-color}"
 	Shell.FlyoutBehavior="{Binding FlyoutBehavior}">
 	
 	<Shell.TitleView>
@@ -30,6 +30,7 @@
 			<!--Bike(s) view-->
 			<Grid
 					RowDefinitions="1*,Auto"
+				RowSpacing="0"
 					Grid.Row="0">
 
 				<StackLayout
@@ -65,26 +66,34 @@
 
 					<!--No Bikes-->
 					<Label
-						Padding="10"
+						Margin="20"
 						IsVisible="{Binding IsNoBikesOccupiedVisible}"
 						Text="{Binding NoBikesOccupiedText}"/>
 					
 				</StackLayout>
 
 				<!--Info text-->
-				<StackLayout
-					BackgroundColor="#f6f6f6"
-					Padding="10,5,10,10"
-					Grid.Row="1">
-
-					<Label
+				<Label
+						Grid.Row="1"
 						Text="{Binding StatusInfoText}"
 						IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
 						FontSize="Small"
-						HorizontalOptions="CenterAndExpand"
-						VerticalOptions="CenterAndExpand"/>
-
-				</StackLayout>
+						TextColor="DimGray"
+						Padding="5"
+						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>
 
 			</Grid>
 
diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs
index 6d78434..6fbd728 100644
--- a/TINKLib/Model/WhatsNew.cs
+++ b/TINKLib/Model/WhatsNew.cs
@@ -676,6 +676,11 @@ namespace TINK.Model
 					new Version(3, 0, 360),
 					AppResources.ChangeLog_3_0_358_MK_SB,
 					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
+				},
+												{
+					new Version(3, 0, 361),
+					AppResources.ChangeLog_3_0_361_MK_SB,
+					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
 				},
 		};
 
diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs
index d9d3c08..7636d4c 100644
--- a/TINKLib/MultilingualResources/AppResources.Designer.cs
+++ b/TINKLib/MultilingualResources/AppResources.Designer.cs
@@ -757,6 +757,15 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to 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 &apos;My bikes&apos; page. We have also made small design changes..
+        /// </summary>
+        public static string ChangeLog_3_0_361_MK_SB {
+            get {
+                return ResourceManager.GetString("ChangeLog_3_0_361_MK_SB", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to We have fixed some bugs. Enjoy the ride!.
         /// </summary>
@@ -1873,7 +1882,7 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Station id: {0}.
+        ///   Looks up a localized string similar to ID: {0}.
         /// </summary>
         public static string MarkingBikesAtStationStationId {
             get {
@@ -1945,7 +1954,7 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &lt;font color=&quot;blue&quot;&gt;&lt;u&gt;Contact&lt;/u&gt;&lt;/font&gt; {0}..
+        ///   Looks up a localized string similar to &lt;u&gt;Contact&lt;/u&gt; {0}..
         /// </summary>
         public static string MarkingContactSupport {
             get {
diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx
index 5ddfed1..f90f00a 100644
--- a/TINKLib/MultilingualResources/AppResources.de.resx
+++ b/TINKLib/MultilingualResources/AppResources.de.resx
@@ -599,7 +599,7 @@ Layout Anzeige Radnamen und nummern verbessert.</value>
     <value>Wahl eines Rads über die Radnummer hinzugefügt.</value>
   </data>
   <data name="MarkingContactSupport" xml:space="preserve">
-    <value>{0} &lt;font color="blue"&gt;&lt;u&gt;kontaktieren&lt;/u&gt;&lt;/font&gt;.</value>
+    <value>{0} &lt;u&gt;kontaktieren&lt;/u&gt;.</value>
   </data>
   <data name="MarkingLoginRequiredToRerserve" xml:space="preserve">
     <value>Bitte Anmelden um Fahrräder zu reservieren! &lt;font color="blue"&gt;&lt;u&gt;Hier&lt;/u&gt;&lt;/font&gt; tippen, um auf Anmeldeseite zu wechseln.</value>
@@ -694,7 +694,7 @@ Kleinere Verbesserungen.</value>
     <value>Komponenten von Fremdanbietern aktualisiert.</value>
   </data>
   <data name="MarkingBikesAtStationStationId" xml:space="preserve">
-    <value>Stationskennung: {0}</value>
+    <value>ID: {0}</value>
   </data>
   <data name="ChangeLog3_0_250" xml:space="preserve">
     <value>Anzeige Stationskennung.
@@ -1140,4 +1140,7 @@ Wenn sich das Schloss weiterhin nicht öffnen lässt, vergewissern Sie sich, das
     <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;
 &lt;br/&gt;Außerdem:&lt;ul&gt;&lt;li&gt;Software Pakete wurde aktualisiert.&lt;/li&gt;&lt;li&gt;Kleinere Fehlerbehebungen.&lt;/li&gt;&lt;/ul&gt;</value>
   </data>
+  <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>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx
index 87254f0..b35f71f 100644
--- a/TINKLib/MultilingualResources/AppResources.resx
+++ b/TINKLib/MultilingualResources/AppResources.resx
@@ -717,7 +717,7 @@ Layout of bike names and id display improved.</value>
     <value>Contact operator?</value>
   </data>
   <data name="MarkingContactSupport" xml:space="preserve">
-    <value>&lt;font color="blue"&gt;&lt;u&gt;Contact&lt;/u&gt;&lt;/font&gt; {0}.</value>
+    <value>&lt;u&gt;Contact&lt;/u&gt; {0}.</value>
   </data>
   <data name="MarkingLoginRequiredToRerserve" xml:space="preserve">
     <value>Please login to reserve bikes! Tap &lt;font color="blue"&gt;&lt;u&gt;here&lt;/u&gt;&lt;/font&gt; to switch to login page.</value>
@@ -802,7 +802,7 @@ Minor fixes.</value>
     <value>Third-party components updated.</value>
   </data>
   <data name="MarkingBikesAtStationStationId" xml:space="preserve">
-    <value>Station id: {0}</value>
+    <value>ID: {0}</value>
   </data>
   <data name="ChangeLog3_0_250" xml:space="preserve">
     <value>Station id displayed.
@@ -1230,4 +1230,7 @@ Try it out!</value>
   <data name="MarkingNoNetworkConnection" 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>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf
index 4d92614..25ce770 100644
--- a/TINKLib/MultilingualResources/TINKLib.de.xlf
+++ b/TINKLib/MultilingualResources/TINKLib.de.xlf
@@ -802,8 +802,8 @@ Layout Anzeige Radnamen und nummern verbessert.</target>
           <target state="translated">Wahl eines Rads über die Radnummer hinzugefügt.</target>
         </trans-unit>
         <trans-unit id="MarkingContactSupport" translate="yes" xml:space="preserve">
-          <source><bpt id="1">&lt;font color="blue"&gt;</bpt><bpt id="2">&lt;u&gt;</bpt>Contact<ept id="2">&lt;/u&gt;</ept><ept id="1">&lt;/font&gt;</ept> {0}.</source>
-          <target state="translated">{0} <bpt id="1">&lt;font color="blue"&gt;</bpt><bpt id="2">&lt;u&gt;</bpt>kontaktieren<ept id="2">&lt;/u&gt;</ept><ept id="1">&lt;/font&gt;</ept>.</target>
+          <source><bpt id="1">&lt;u&gt;</bpt>Contact<ept id="1">&lt;/u&gt;</ept> {0}.</source>
+          <target state="translated">{0} <bpt id="1">&lt;u&gt;</bpt>kontaktieren<ept id="1">&lt;/u&gt;</ept>.</target>
         </trans-unit>
         <trans-unit id="MarkingLoginRequiredToRerserve" translate="yes" xml:space="preserve">
           <source>Please login to reserve bikes! Tap <bpt id="1">&lt;font color="blue"&gt;</bpt><bpt id="2">&lt;u&gt;</bpt>here<ept id="2">&lt;/u&gt;</ept><ept id="1">&lt;/font&gt;</ept> to switch to login page.</source>
@@ -929,8 +929,8 @@ Kleinere Verbesserungen.</target>
           <target state="translated">Komponenten von Fremdanbietern aktualisiert.</target>
         </trans-unit>
         <trans-unit id="MarkingBikesAtStationStationId" translate="yes" xml:space="preserve">
-          <source>Station id: {0}</source>
-          <target state="translated">Stationskennung: {0}</target>
+          <source>ID: {0}</source>
+          <target state="translated">ID: {0}</target>
         </trans-unit>
         <trans-unit id="ChangeLog3_0_250" translate="yes" xml:space="preserve">
           <source>Station id displayed.
@@ -1562,6 +1562,10 @@ Wenn sich das Schloss weiterhin nicht öffnen lässt, vergewissern Sie sich, das
           <target state="translated">Neue Funktionen:<bpt id="1">&lt;ul&gt;</bpt><bpt id="2">&lt;li&gt;</bpt>Wenn Ihr Gerät nicht mit dem Internet verbunden ist, wird dies nun oben angezeigt.<ept id="2">&lt;/li&gt;</ept><bpt id="3">&lt;li&gt;</bpt>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.<ept id="3">&lt;/li&gt;</ept><ept id="1">&lt;/ul&gt;</ept>
 &lt;br/&gt;Außerdem:<bpt id="4">&lt;ul&gt;</bpt><bpt id="5">&lt;li&gt;</bpt>Software Pakete wurde aktualisiert.<ept id="5">&lt;/li&gt;</ept><bpt id="6">&lt;li&gt;</bpt>Kleinere Fehlerbehebungen.<ept id="6">&lt;/li&gt;</ept><ept id="4">&lt;/ul&gt;</ept></target>
         </trans-unit>
+        <trans-unit id="ChangeLog_3_0_361_MK_SB" translate="yes" xml:space="preserve">
+          <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>
       </group>
     </body>
   </file>
diff --git a/TINKLib/Repository/CopriCallsMemory.cs b/TINKLib/Repository/CopriCallsMemory.cs
index 9fa4bb9..6f58000 100644
--- a/TINKLib/Repository/CopriCallsMemory.cs
+++ b/TINKLib/Repository/CopriCallsMemory.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
-using TINK.Model.Device;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
 
diff --git a/TINKLib/View/Themes/Konrad.xaml b/TINKLib/View/Themes/Konrad.xaml
index ed37b0f..9f5f504 100644
--- a/TINKLib/View/Themes/Konrad.xaml
+++ b/TINKLib/View/Themes/Konrad.xaml
@@ -9,6 +9,9 @@
 	<!--Secondary color-->
     <Color x:Key="secondary-back-title-color">#FF0020</Color>
 
+	<!--Background color-->
+	<Color x:Key="background-color">#BEBEBE</Color>
+
 	<!--Attention color-->
 	<Color x:Key="attention-color">#06D1B1</Color>
 
diff --git a/TINKLib/View/Themes/ShareeBike.xaml b/TINKLib/View/Themes/ShareeBike.xaml
index 8857381..928a84a 100644
--- a/TINKLib/View/Themes/ShareeBike.xaml
+++ b/TINKLib/View/Themes/ShareeBike.xaml
@@ -6,6 +6,9 @@
 	<!--Main color-->
 	<Color x:Key="primary-back-title-color">#009899</Color>
 
+	<!--Background color-->
+	<Color x:Key="background-color">#BEBEBE</Color>
+
 	<!--Attention color-->
 	<Color x:Key="attention-color">#FC870D</Color>
 
diff --git a/TINKLib/ViewModel/Bikes/BikesViewModel.cs b/TINKLib/ViewModel/Bikes/BikesViewModel.cs
index 3ee4cc1..ca22487 100644
--- a/TINKLib/ViewModel/Bikes/BikesViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/BikesViewModel.cs
@@ -387,6 +387,11 @@ namespace TINK.ViewModel.Bikes
 					return Exception.GetShortErrorInfoText(IsReportLevelVerbose);
 				}
 
+				if (!IsConnected)
+				{
+					return AppResources.ActivityTextConnectionStateOffline;
+				}
+
 				return ActionText ?? string.Empty;
 			}
 		}
diff --git a/TINKLib/ViewModel/Map/MapPageViewModel.cs b/TINKLib/ViewModel/Map/MapPageViewModel.cs
index 558ebbf..78cfb51 100644
--- a/TINKLib/ViewModel/Map/MapPageViewModel.cs
+++ b/TINKLib/ViewModel/Map/MapPageViewModel.cs
@@ -27,6 +27,11 @@ using TINK.Repository;
 using TINK.Services.Geolocation;
 using TINK.Model.State;
 using TINK.ViewModel.Bikes;
+using Location = Xamarin.Essentials.Location;
+
+
+
+
 
 
 
@@ -238,31 +243,38 @@ namespace TINK.ViewModel.Map
 		{
 			Log.ForContext<MapPageViewModel>().Debug($"Starting update of stations pins color for {stationsColorList.Count} stations...");
 
+			int MyBikesCount = 0;
 			// Update colors of pins.
 			for (int pinIndex = 0; pinIndex < stationsColorList.Count; pinIndex++)
 			{
-					var indexPartPrefix = int.TryParse(Pins[pinIndex].Tag.ToString(), out int stationId)
-					&& stationId <= CUSTOM_ICONS_COUNT
-					? $"{stationId}" // there is a station marker with index letter for given station id
-					: "Open"; // there is no station marker. Use open marker.
+				var indexPartPrefix = int.TryParse(Pins[pinIndex].Tag.ToString(), out int stationId)
+				&& stationId <= CUSTOM_ICONS_COUNT
+				? $"{stationId}" // there is a station marker with index letter for given station id
+				: "Open"; // there is no station marker. Use open marker.
 
-					var colorPartPrefix = GetRessourceNameColorPart(stationsColorList[pinIndex]);
+				var colorPartPrefix = GetRessourceNameColorPart(stationsColorList[pinIndex]);
+				if (colorPartPrefix == "Blue" || colorPartPrefix == "LightBlue")
+				{
+					MyBikesCount = MyBikesCount + 1;
+				};
 
-					var name = $"{indexPartPrefix.ToString().PadLeft(2, '0')}_{colorPartPrefix}{(DeviceInfo.Platform == DevicePlatform.Android ? ".png" : string.Empty)}";
-					try
-					{
-						Pins[pinIndex].Icon = BitmapDescriptorFactory.FromBundle(name);
-					}
-					catch (Exception excption)
-					{
-						Log.ForContext<MapPageViewModel>().Error("Station icon {name} can not be loaded. {@excption}.", name, excption);
-						Pins[pinIndex].Label = stationId.ToString();
-						Pins[pinIndex].Icon = BitmapDescriptorFactory.DefaultMarker(stationsColorList[pinIndex]);
-					}
+				var name = $"{indexPartPrefix.ToString().PadLeft(2, '0')}_{colorPartPrefix}{(DeviceInfo.Platform == DevicePlatform.Android ? ".png" : string.Empty)}";
+				try
+				{
+					Pins[pinIndex].Icon = BitmapDescriptorFactory.FromBundle(name);
+				}
+				catch (Exception excption)
+				{
+					Log.ForContext<MapPageViewModel>().Error("Station icon {name} can not be loaded. {@excption}.", name, excption);
+					Pins[pinIndex].Label = stationId.ToString();
+					Pins[pinIndex].Icon = BitmapDescriptorFactory.DefaultMarker(stationsColorList[pinIndex]);
+				}
 
 				Pins[pinIndex].IsVisible = true;
 			}
 
+			MyBikesCountText = MyBikesCount > 0 ? string.Format(MyBikesCount.ToString()) : string.Empty;
+
 			var pinsCount = Pins.Count;
 			for (int pinIndex = stationsColorList.Count; pinIndex < pinsCount; pinIndex++)
 			{
@@ -273,6 +285,20 @@ namespace TINK.ViewModel.Map
 			Log.ForContext<MapPageViewModel>().Debug("Update of stations pins color done.");
 		}
 
+		/// <summary>
+		/// label for number of reserved/rented bikes;
+		/// </summary>
+		private string _myBikesCountText = string.Empty;
+		public string MyBikesCountText
+		{
+			get { return _myBikesCountText; }
+			set
+			{
+				_myBikesCountText = value;
+				PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(MyBikesCountText)));
+			}
+		}
+
 		/// <summary> Gets the color related part of the ressrouce name.</summary>
 		/// <param name="color">Color to get name for.</param>
 		/// <returns>Resource name.</returns>
@@ -340,7 +366,7 @@ namespace TINK.ViewModel.Map
 				{
 					// Context switch should not be required because code is called from GUI thread
 					// but a xf-issue requires call (see issue #594).
-					TinkApp.PostAction( async (x) =>
+					TinkApp.PostAction(async (x) =>
 					{
 						// Show COPRI message once. 
 						await ViewService.DisplayAlert(
@@ -376,11 +402,11 @@ namespace TINK.ViewModel.Map
 				{
 					var status = await PermissionsService.CheckStatusAsync();
 					if (status == Status.Granted)
-						{
-							// Get from smart device
-							mapSpan = await GetFromLocationService(status);
-						}
+					{
+						// Get from smart device
+						mapSpan = await GetFromLocationService(status);
 					}
+				}
 
 				if (mapSpan == null)
 				{
@@ -462,16 +488,16 @@ namespace TINK.ViewModel.Map
 		{
 			if (Pins.Count > 0 && Pins.Count != stations.Count)
 			{
-					// Either
-					// - user logged in/ logged out which might lead to more/ less stations beeing available
-					// - new stations were added/ existing ones remove
-					Pins.Clear();
+				// Either
+				// - user logged in/ logged out which might lead to more/ less stations beeing available
+				// - new stations were added/ existing ones remove
+				Pins.Clear();
 			}
 
 			// Check if there are alreay any pins to the map
 			// i.e detecte first call of member OnAppearing after construction
 			if (Pins.Count <= 0)
-				{
+			{
 				Log.ForContext<MapPageViewModel>().Debug($"{(ActiveFilterMap.GetGroup().Any() ? $"Active map filter is {string.Join(",", ActiveFilterMap.GetGroup())}." : "Map filter is off.")}");
 
 				// Map was not yet initialized.
@@ -546,15 +572,15 @@ namespace TINK.ViewModel.Map
 					AppResources.MessageAnswerYes,
 					AppResources.MessageAnswerNo);
 
-					if (dialogResult)
-					{
-						// User decided to give access to locations permissions.
-						PermissionsService.OpenAppSettings();
-						ActionText = string.Empty;
-						IsProcessWithRunningProcessView = false;
-						IsNavBarVisible = true;
-						IsMapPageEnabled = true;
-					}
+				if (dialogResult)
+				{
+					// User decided to give access to locations permissions.
+					PermissionsService.OpenAppSettings();
+					ActionText = string.Empty;
+					IsProcessWithRunningProcessView = false;
+					IsNavBarVisible = true;
+					IsMapPageEnabled = true;
+				}
 			}
 			return status;
 		}
@@ -661,40 +687,40 @@ namespace TINK.ViewModel.Map
 		/// <param name="selectedStationId">Id of station user clicked on.</param>
 		public async void OnStationClicked(string selectedStationId)
 		{
-				try
-				{
-					Log.ForContext<MapPageViewModel>().Information($"User taped station {selectedStationId}.");
+			try
+			{
+				Log.ForContext<MapPageViewModel>().Information($"User taped station {selectedStationId}.");
 
-					// Lock action to prevent multiple instances of "BikeAtStation" being opened.
-					IsMapPageEnabled = false;
+				// Lock action to prevent multiple instances of "BikeAtStation" being opened.
+				IsMapPageEnabled = false;
 
-					TinkApp.SelectedStation = TinkApp.Stations.FirstOrDefault(x => x.Id == selectedStationId)
-					?? new Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updatd in background task.
+				TinkApp.SelectedStation = TinkApp.Stations.FirstOrDefault(x => x.Id == selectedStationId)
+				?? new Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updatd in background task.
 
 #if TRYNOTBACKSTYLE
                 m_oNavigation.ShowPage(
                     typeof(BikesAtStationPage),
                     p_strStationName);
 #else
-					{
-						// Show page.
-						await ViewService.PushAsync(ViewTypes.BikesAtStation);
-
-						IsMapPageEnabled = true;
-						ActionText = string.Empty;
-					}
-				}
-				catch (Exception exception)
 				{
+					// Show page.
+					await ViewService.PushAsync(ViewTypes.BikesAtStation);
+
 					IsMapPageEnabled = true;
 					ActionText = string.Empty;
-
-					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");
 				}
+			}
+			catch (Exception exception)
+			{
+				IsMapPageEnabled = true;
+				ActionText = string.Empty;
+
+				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");
+			}
 #endif
 		}
 
@@ -858,11 +884,44 @@ namespace TINK.ViewModel.Map
 					// An error occurred getting data from copri.
 					return Exception.GetShortErrorInfoText(TinkApp.IsReportLevelVerbose);
 				}
+				if (!IsConnected)
+				{
+					return AppResources.ActivityTextConnectionStateOffline;
+				}
 
 				return ActionText ?? string.Empty;
 			}
 		}
 
+		/// <summary> Processes request to view my bikes.</summary>
+		public System.Windows.Input.ICommand OnMyBikesButtonClicked => new Xamarin.Forms.Command(async () =>
+		{
+			try
+			{
+				Log.ForContext<MapPageViewModel>().Information($"User clicked on MyBikesButton.");
+
+				// Lock action to prevent multiple instances of "BikeAtStation" being opened.
+				IsMapPageEnabled = false;
+
+				// Show page.
+				await ViewService.PushAsync(ViewTypes.MyBikesPage);
+
+				IsMapPageEnabled = true;
+				ActionText = string.Empty;
+			}
+			catch (Exception exception)
+			{
+				IsMapPageEnabled = true;
+				ActionText = string.Empty;
+
+				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");
+			}
+		});
+
 		/// <summary> Command object to bind login button to view model.</summary>
 		public System.Windows.Input.ICommand OnToggleTinkToKonrad => new Xamarin.Forms.Command(async () => await ToggleTinkToKonrad());
 
diff --git a/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs b/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
index 6abd1f9..f84ed67 100644
--- a/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
+++ b/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using TestFramework.Repository;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
-using TINK.Model.Device;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
diff --git a/TestTINKLib/Fixtures/ObjectTests/Settings/BluetoothLock/TestLockIt.cs b/TestLockItBLE/Services/BluetoothLock/BLE/TestLockIt.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Settings/BluetoothLock/TestLockIt.cs
rename to TestLockItBLE/Services/BluetoothLock/BLE/TestLockIt.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestIntersectFilter.cs b/TestShareeLib/Model/Connector/Filter/TestIntersectFilter.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestIntersectFilter.cs
rename to TestShareeLib/Model/Connector/Filter/TestIntersectFilter.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestNullFilter.cs b/TestShareeLib/Model/Connector/Filter/TestNullFilter.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Connector/Filter/TestNullFilter.cs
rename to TestShareeLib/Model/Connector/Filter/TestNullFilter.cs
diff --git a/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs b/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs
index 7d85279..b5f926b 100644
--- a/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs
+++ b/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs
@@ -188,7 +188,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 
 			cache.IsBikesAvailableExpired.Returns(true);
 			cache.GetBikesAvailableAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE)));
-			https.GetBikesAvailableAsync().Returns<BikesAvailableResponse>(x => { throw new WebConnectFailureException("Bang...", new Exception()); });
+			https.GetBikesAvailableAsync().Returns<BikesAvailableResponse>(x => { throw new WebConnectFailureException("Bang...", new System.Exception()); });
 
 			var provider = new CopriProviderHttps(
 				new Uri("http://1.2.3.4"),
@@ -288,7 +288,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 
 			cache.IsBikesOccupiedExpired.Returns(true);
 			cache.GetBikesOccupiedAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED)));
-			https.GetBikesOccupiedAsync().Returns<BikesReservedOccupiedResponse>(x => { throw new WebConnectFailureException("Bang...", new Exception()); });
+			https.GetBikesOccupiedAsync().Returns<BikesReservedOccupiedResponse>(x => { throw new WebConnectFailureException("Bang...", new System.Exception()); });
 
 			var provider = new CopriProviderHttps(
 				new Uri("http://1.2.3.4"),
@@ -387,7 +387,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 
 			cache.IsStationsExpired.Returns(true);
 			cache.GetStationsAsync().Returns(Task.Run(() => JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL)));
-			https.GetStationsAsync().Returns<StationsAvailableResponse>(x => { throw new WebConnectFailureException("Bang...", new Exception()); });
+			https.GetStationsAsync().Returns<StationsAvailableResponse>(x => { throw new WebConnectFailureException("Bang...", new System.Exception()); });
 
 			var provider = new CopriProviderHttps(
 				new Uri("http://1.2.3.4"),
@@ -424,7 +424,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 			try
 			{
 				// Do not add if an excption occurred
-				provider.AddToCache(new Result<StationsAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL), new GeneralData(), new Exception("Bang...")));
+				provider.AddToCache(new Result<StationsAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<StationsAvailableResponse>(STATIONSALL), new GeneralData(), new System.Exception("Bang...")));
 				stations = await provider.GetStations(true);
 				Assert.AreEqual(0, stations.Response.stations.Count);
 
@@ -464,7 +464,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 			try
 			{
 				// Do not add if an excption occurred
-				provider.AddToCache(new Result<BikesAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE), new GeneralData(), new Exception("Bang...")));
+				provider.AddToCache(new Result<BikesAvailableResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesAvailableResponse>(BIKESAVAILABLE), new GeneralData(), new System.Exception("Bang...")));
 				bikes = await provider.GetBikesAvailable(true);
 				Assert.AreEqual(0, bikes.Response.bikes.Count);
 
@@ -506,7 +506,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 			try
 			{
 				// Do not add if an excption occurred
-				provider.AddToCache(new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED), new GeneralData(), new Exception("Bang...")));
+				provider.AddToCache(new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsHttps), JsonConvert.DeserializeObject<BikesReservedOccupiedResponse>(BIKESOCCUPIED), new GeneralData(), new System.Exception("Bang...")));
 				bikes = await provider.GetBikesOccupied(true);
 				Assert.AreEqual(0, bikes.Response.bikes_occupied.Count);
 
diff --git a/TestTINKLib/Fixtures/ObjectTests/Logging/TestLoggingDirectoryManager.cs b/TestShareeLib/Model/Logging/TestLoggingDirectoryManager.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Logging/TestLoggingDirectoryManager.cs
rename to TestShareeLib/Model/Logging/TestLoggingDirectoryManager.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/TestFilterCollectionStore.cs b/TestShareeLib/Model/Settings/TestFilterCollectionStore.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/TestFilterCollectionStore.cs
rename to TestShareeLib/Model/Settings/TestFilterCollectionStore.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Settings/TestSettings.cs b/TestShareeLib/Model/Settings/TestSettings.cs
similarity index 94%
rename from TestTINKLib/Fixtures/ObjectTests/Settings/TestSettings.cs
rename to TestShareeLib/Model/Settings/TestSettings.cs
index a04969d..96ac009 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Settings/TestSettings.cs
+++ b/TestShareeLib/Model/Settings/TestSettings.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using NUnit.Framework;
 using Serilog.Events;
 using TINK.Model.Services.CopriApi.ServerUris;
@@ -6,7 +6,7 @@ using TINK.Settings;
 using TINK.ViewModel.Map;
 using TINK.ViewModel.Settings;
 
-namespace TestTINKLib.Fixtures.ObjectTests.Settings
+namespace TestTINKLib.Fixtures.ObjectTests.SettingsNS
 {
 	[TestFixture]
 	public class TestSettings
diff --git a/TestTINKLib/Fixtures/ObjectTests/State/TestStateBookedInfo.cs b/TestShareeLib/Model/State/TestStateBookedInfo.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/State/TestStateBookedInfo.cs
rename to TestShareeLib/Model/State/TestStateBookedInfo.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/State/TestStateDisposableInfo.cs b/TestShareeLib/Model/State/TestStateDisposableInfo.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/State/TestStateDisposableInfo.cs
rename to TestShareeLib/Model/State/TestStateDisposableInfo.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoSerializeJSON.cs b/TestShareeLib/Model/State/TestStateInfoSerializeJSON.cs
similarity index 99%
rename from TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoSerializeJSON.cs
rename to TestShareeLib/Model/State/TestStateInfoSerializeJSON.cs
index 8be1bb7..030bb98 100644
--- a/TestTINKLib/Fixtures/ObjectTests/State/TestStateInfoSerializeJSON.cs
+++ b/TestShareeLib/Model/State/TestStateInfoSerializeJSON.cs
@@ -1,6 +1,7 @@
-using System;
+using System;
 using Newtonsoft.Json;
 using NUnit.Framework;
+using TestFramework;
 using TINK.Model.State;
 
 
diff --git a/TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfoSerializeJSON.cs b/TestShareeLib/Model/State/TestStateRequestedInfoSerializeJSON.cs
similarity index 98%
rename from TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfoSerializeJSON.cs
rename to TestShareeLib/Model/State/TestStateRequestedInfoSerializeJSON.cs
index affe799..bd6a2b6 100644
--- a/TestTINKLib/Fixtures/ObjectTests/State/TestStateRequestedInfoSerializeJSON.cs
+++ b/TestShareeLib/Model/State/TestStateRequestedInfoSerializeJSON.cs
@@ -1,6 +1,7 @@
 using System;
 using Newtonsoft.Json;
 using NUnit.Framework;
+using TestFramework;
 using TINK.Model.State;
 
 
diff --git a/TestTINKLib/Fixtures/ObjectTests/Station/TestNullStation.cs b/TestShareeLib/Model/Station/TestNullStation.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Station/TestNullStation.cs
rename to TestShareeLib/Model/Station/TestNullStation.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Station/TestStation.cs b/TestShareeLib/Model/Station/TestStation.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Station/TestStation.cs
rename to TestShareeLib/Model/Station/TestStation.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccount.cs b/TestShareeLib/Model/User/Account/TestAccount.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/User/Account/TestAccount.cs
rename to TestShareeLib/Model/User/Account/TestAccount.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/User/Account/TestValidator.cs b/TestShareeLib/Model/User/Account/TestValidator.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/User/Account/TestValidator.cs
rename to TestShareeLib/Model/User/Account/TestValidator.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/User/TestUser.cs b/TestShareeLib/Model/User/TestUser.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/User/TestUser.cs
rename to TestShareeLib/Model/User/TestUser.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Exception/TestAuthcookieNotDefinedException.cs b/TestShareeLib/Repository/Exception/TestAuthcookieNotDefinedException.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Connector/Exception/TestAuthcookieNotDefinedException.cs
rename to TestShareeLib/Repository/Exception/TestAuthcookieNotDefinedException.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesAvailableResponse.cs b/TestShareeLib/Repository/TestBikesAvailableResponse.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesAvailableResponse.cs
rename to TestShareeLib/Repository/TestBikesAvailableResponse.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesOccupiedResponse.cs b/TestShareeLib/Repository/TestBikesOccupiedResponse.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBikesOccupiedResponse.cs
rename to TestShareeLib/Repository/TestBikesOccupiedResponse.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBookingResponse.cs b/TestShareeLib/Repository/TestBookingResponse.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestBookingResponse.cs
rename to TestShareeLib/Repository/TestBookingResponse.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsMemory.cs.cs b/TestShareeLib/Repository/TestCopriCallsMemory.cs.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsMemory.cs.cs
rename to TestShareeLib/Repository/TestCopriCallsMemory.cs.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseBase.cs b/TestShareeLib/Repository/TestResponseBase.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseBase.cs
rename to TestShareeLib/Repository/TestResponseBase.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseHelper.cs b/TestShareeLib/Repository/TestResponseHelper.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestResponseHelper.cs
rename to TestShareeLib/Repository/TestResponseHelper.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestStationsAllResponse.cs b/TestShareeLib/Repository/TestStationsAllResponse.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Connector/Response/TestStationsAllResponse.cs
rename to TestShareeLib/Repository/TestStationsAllResponse.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Crypto/TestCryptoHelper.cs b/TestShareeLib/Services/BluetoothLock/Crypto/TestCryptoHelper.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Crypto/TestCryptoHelper.cs
rename to TestShareeLib/Services/BluetoothLock/Crypto/TestCryptoHelper.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Tdo/TestLockInfoAuthTdo.cs b/TestShareeLib/Services/BluetoothLock/Tdo/TestLockInfoAuthTdo.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/Tdo/TestLockInfoAuthTdo.cs
rename to TestShareeLib/Services/BluetoothLock/Tdo/TestLockInfoAuthTdo.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockServiceSimulation.cs b/TestShareeLib/Services/BluetoothLock/TestLockServiceSimulation.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Services/BluetoothLock/TestLockServiceSimulation.cs
rename to TestShareeLib/Services/BluetoothLock/TestLockServiceSimulation.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Services/TestLocksServicesContainerMutable.cs b/TestShareeLib/Services/BluetoothLock/TestLocksServicesContainerMutable.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Services/TestLocksServicesContainerMutable.cs
rename to TestShareeLib/Services/BluetoothLock/TestLocksServicesContainerMutable.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriServerUriList.cs b/TestShareeLib/Services/CopriApi/ServerUris/TestCopriServerUriList.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriServerUriList.cs
rename to TestShareeLib/Services/CopriApi/ServerUris/TestCopriServerUriList.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs
similarity index 89%
rename from TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs
rename to TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs
index 6e458bc..e4e9ede 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/TestRequestHandlerFactory.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using Rhino.Mocks;
 using TestFramework.Model.Services.Geolocation;
 using TestFramework.Services.BluetoothLock;
 using TINK.Model.Bikes.BikeInfoNS.BikeNS;
@@ -42,8 +41,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					null, // viewUpdateManager
 					NSubstitute.Substitute.For<ISmartDevice>(),
 					null /* viewService */ ,
-					MockRepository.GenerateStub<IBikesViewModel>(),
-					MockRepository.GenerateStub<IUser>()).GetType());
+					NSubstitute.Substitute.For<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IUser>()).GetType());
 
 			// Verify handler for requested bike with state unknown.
 			bike = new BikeInfoMutable(
@@ -60,8 +59,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					null, // viewUpdateManager
 					NSubstitute.Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					MockRepository.GenerateStub<IBikesViewModel>(),
-					MockRepository.GenerateStub<IUser>()).GetType());
+					NSubstitute.Substitute.For<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IUser>()).GetType());
 
 			// Verify handler for requested bike with state closed.
 			bike = new BikeInfoMutable(
@@ -79,8 +78,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					null, // viewUpdateManager
 					NSubstitute.Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					MockRepository.GenerateStub<IBikesViewModel>(),
-					MockRepository.GenerateStub<IUser>()).GetType());
+					NSubstitute.Substitute.For<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IUser>()).GetType());
 
 			// Verify handler for requested bike with state open.
 			bike = new BikeInfoMutable(
@@ -98,8 +97,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					null, // viewUpdateManager
 					NSubstitute.Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					MockRepository.GenerateStub<IBikesViewModel>(),
-					MockRepository.GenerateStub<IUser>()).GetType());
+					NSubstitute.Substitute.For<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IUser>()).GetType());
 
 			// Verify handler for booked bike with state closed.
 			bike = new BikeInfoMutable(
@@ -117,8 +116,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					null, // viewUpdateManager
 					NSubstitute.Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					MockRepository.GenerateStub<IBikesViewModel>(),
-					MockRepository.GenerateStub<IUser>()).GetType());
+					NSubstitute.Substitute.For<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IUser>()).GetType());
 
 			// Verify handler for booked bike with state open.
 			bike = new BikeInfoMutable(
@@ -136,8 +135,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					null, // viewUpdateManager
 					NSubstitute.Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					MockRepository.GenerateStub<IBikesViewModel>(),
-					MockRepository.GenerateStub<IUser>()).GetType());
+					NSubstitute.Substitute.For<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IUser>()).GetType());
 
 			// Verify handler for booked bike with state unknown.
 			bike = new BikeInfoMutable(
@@ -155,8 +154,8 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 					null, // viewUpdateManager
 					NSubstitute.Substitute.For<ISmartDevice>(),
 					null /* viewService */,
-					MockRepository.GenerateStub<IBikesViewModel>(),
-					MockRepository.GenerateStub<IUser>()).GetType());
+					NSubstitute.Substitute.For<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IUser>()).GetType());
 		}
 	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModelFactory.cs b/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelFactory.cs
similarity index 85%
rename from TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModelFactory.cs
rename to TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelFactory.cs
index dc0d89b..821ae54 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeViewModelFactory.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelFactory.cs
@@ -1,6 +1,5 @@
 using System;
 using NUnit.Framework;
-using Rhino.Mocks;
 using TestFramework.Model.Services.Geolocation;
 using TestFramework.Services.BluetoothLock;
 using TINK.Model.Bikes.BikeInfoNS.BC;
@@ -32,9 +31,9 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 					NSubstitute.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"),
-					MockRepository.GenerateStub<IUser>(), // user
-					MockRepository.GenerateStub<IInUseStateInfoProvider>(),
-					MockRepository.GenerateStub<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IUser>(), // user
+					NSubstitute.Substitute.For<IInUseStateInfoProvider>(),
+					NSubstitute.Substitute.For<IBikesViewModel>(),
 					url => { }).GetType()); // stateInfoProvider
 		}
 
@@ -53,9 +52,9 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 					NSubstitute.Substitute.For<ISmartDevice>(),
 					null, // viewService
 					new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", LockModel.ILockIt), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri, "17", new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo.Builder { State = TINK.Model.Bikes.BikeInfoNS.CopriLock.LockingState.Closed }.Build()), "My Station Name"),
-					MockRepository.GenerateStub<IUser>(), // user
-					MockRepository.GenerateStub<IInUseStateInfoProvider>(),
-					MockRepository.GenerateStub<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IUser>(), // user
+					NSubstitute.Substitute.For<IInUseStateInfoProvider>(),
+					NSubstitute.Substitute.For<IBikesViewModel>(),
 					url => { }).GetType()); // stateInfoProvider
 		}
 
@@ -73,9 +72,9 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 					NSubstitute.Substitute.For<ISmartDevice>(),
 					null, // viewService
 					new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), DataSource.Copri, 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
-					MockRepository.GenerateStub<IUser>(), // user
-					MockRepository.GenerateStub<IInUseStateInfoProvider>(),
-					MockRepository.GenerateStub<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IUser>(), // user
+					NSubstitute.Substitute.For<IInUseStateInfoProvider>(),
+					NSubstitute.Substitute.For<IBikesViewModel>(),
 					url => { }),
 				Is.Null);
 		}
diff --git a/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs b/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
index 802b40e..19c1caa 100644
--- a/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
+++ b/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
@@ -1109,7 +1109,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await bikesAtStation.OnAppearingOrRefresh();
 
-			//Assert.AreEqual("Offline.", bikesAtStation.StatusInfoText);
+			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.
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Info/TestInfoViewModel.cs b/TestShareeLib/ViewModel/Info/TestInfoViewModel.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/ViewModel/Info/TestInfoViewModel.cs
rename to TestShareeLib/ViewModel/Info/TestInfoViewModel.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/TestFilterCollection.cs b/TestShareeLib/ViewModel/Map/TestFilterCollection.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/TestFilterCollection.cs
rename to TestShareeLib/ViewModel/Map/TestFilterCollection.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Map/TestMapPageFilter.cs b/TestShareeLib/ViewModel/Map/TestMapPageFilter.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/Map/TestMapPageFilter.cs
rename to TestShareeLib/ViewModel/Map/TestMapPageFilter.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs b/TestShareeLib/ViewModel/Map/TestMapPageViewModel.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs
rename to TestShareeLib/ViewModel/Map/TestMapPageViewModel.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Settings/TestFilterCollectionMutable.cs b/TestShareeLib/ViewModel/Settings/TestFilterCollectionMutable.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/ViewModel/Settings/TestFilterCollectionMutable.cs
rename to TestShareeLib/ViewModel/Settings/TestFilterCollectionMutable.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/Settings/TestGroupFilterSettings.cs b/TestShareeLib/ViewModel/Settings/TestGroupFilterSettings.cs
similarity index 88%
rename from TestTINKLib/Fixtures/ObjectTests/Settings/TestGroupFilterSettings.cs
rename to TestShareeLib/ViewModel/Settings/TestGroupFilterSettings.cs
index bb61f2d..cea08db 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Settings/TestGroupFilterSettings.cs
+++ b/TestShareeLib/ViewModel/Settings/TestGroupFilterSettings.cs
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using TINK.Model;
 using TINK.Model.Connector;
 using TINK.ViewModel.Settings;
 
-namespace TestTINKLib.Fixtures.ObjectTests.Settings
+namespace TestTINKLib.Fixtures.ObjectTests.SettingsNS
 {
 	[TestFixture]
 	public class TestGroupFilterSettings
@@ -21,4 +21,4 @@ namespace TestTINKLib.Fixtures.ObjectTests.Settings
 			Assert.AreEqual($"HOM_{FilterHelper.CARGOBIKE}", l_oResult.ToList()[0]);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/TestTINKLib/Fixtures/ObjectTests/Settings/TestPollingParameters.cs b/TestShareeLib/ViewModel/Settings/TestPollingParameters.cs
similarity index 95%
rename from TestTINKLib/Fixtures/ObjectTests/Settings/TestPollingParameters.cs
rename to TestShareeLib/ViewModel/Settings/TestPollingParameters.cs
index 3bc6266..c7c18ee 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Settings/TestPollingParameters.cs
+++ b/TestShareeLib/ViewModel/Settings/TestPollingParameters.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using NUnit.Framework;
 using TINK.Settings;
 
-namespace TestTINKLib.Fixtures.ObjectTests.Settings
+namespace TestTINKLib.Fixtures.ObjectTests.SettingsNS
 {
 	[TestFixture]
 	public class TestPollingParameters
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationInUseStateInfoProvider.cs b/TestShareeLib/ViewModel/TestBikeAtStationInUseStateInfoProvider.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationInUseStateInfoProvider.cs
rename to TestShareeLib/ViewModel/TestBikeAtStationInUseStateInfoProvider.cs
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikeInUseStateInfoProvider.cs b/TestShareeLib/ViewModel/TestMyBikeInUseStateInfoProvider.cs
similarity index 100%
rename from TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikeInUseStateInfoProvider.cs
rename to TestShareeLib/ViewModel/TestMyBikeInUseStateInfoProvider.cs
diff --git a/TestShareeLib/ViewModel/TestViewModelHelper.cs b/TestShareeLib/ViewModel/TestViewModelHelper.cs
index 7271793..9eba0b2 100644
--- a/TestShareeLib/ViewModel/TestViewModelHelper.cs
+++ b/TestShareeLib/ViewModel/TestViewModelHelper.cs
@@ -1,7 +1,8 @@
-using System;
+using System;
 using NSubstitute;
 using NUnit.Framework;
 using TINK.Model.Bikes.BikeInfoNS.BC;
+using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.ViewModel;
 
 namespace TestShareeLib.ViewModel
@@ -124,5 +125,76 @@ namespace TestShareeLib.ViewModel
 				new AggregateException(new Exception("Oh yes"), new Exception("Oh no")).GetErrorMessage(),
 				Is.EqualTo("One or more errors occurred.\r\nOh yes\r\nOh no"));
 		}
+
+		[Test]
+		public void TestGetDisplayName_DefinedTypes()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			bike.WheelType.Returns(WheelType.Two);
+			bike.TypeOfBike.Returns(TypeOfBike.City);
+			bike.Description.Returns("MeinStadtrad");
+			bike.Id.Returns("22");
+			Assert.AreEqual(
+				"MeinStadtrad",
+				bike.GetDisplayName());
+
+			Assert.AreEqual(
+				"22",
+				bike.GetDisplayId());
+
+			bike = Substitute.For<IBikeInfoMutable>();
+			bike.WheelType.Returns(WheelType.Two);
+			bike.TypeOfBike.Returns(TypeOfBike.City);
+			bike.Id.Returns("22");
+			bike.IsDemo.Returns(true);
+			bike.Description.Returns("MeinStadtrad");
+			Assert.AreEqual(
+				"MeinStadtrad",
+				bike.GetDisplayName());
+			Assert.AreEqual(
+				"22",
+				bike.GetDisplayId());
+
+			bike = Substitute.For<IBikeInfoMutable>();
+			bike.WheelType.Returns(WheelType.Trike);
+			bike.TypeOfBike.Returns(TypeOfBike.Cargo);
+			bike.Description.Returns("MeinCargoDreiradl");
+			bike.Id.Returns("22");
+			Assert.AreEqual(
+				"MeinCargoDreiradl",
+				bike.GetDisplayName());
+			Assert.AreEqual(
+				"22",
+				bike.GetDisplayId());
+
+			bike = Substitute.For<IBikeInfoMutable>();
+			bike.WheelType.Returns(WheelType.Two);
+			bike.TypeOfBike.Returns(TypeOfBike.Cargo);
+			bike.Description.Returns("MeinCargoALololong");
+			bike.Id.Returns("22");
+			Assert.AreEqual(
+				"MeinCargoALololong",
+				bike.GetDisplayName());
+			Assert.AreEqual(
+				"22",
+				bike.GetDisplayId());
+		}
+
+		[Test]
+		public void TestGetDisplayName_UndefinedTypes()
+		{
+			var bike = Substitute.For<IBikeInfoMutable>();
+			bike.WheelType.Returns(WheelType.Mono);
+			bike.TypeOfBike.Returns(TypeOfBike.Cargo);
+			bike.Description.Returns("SuperCargo");
+			bike.Id.Returns("22");
+			Assert.AreEqual(
+				"SuperCargo",
+				bike.GetDisplayName());
+
+			Assert.AreEqual(
+				"22",
+				bike.GetDisplayId());
+		}
 	}
 }
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestBikeInfo.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestBikeInfo.cs
deleted file mode 100644
index 4f40e11..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestBikeInfo.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using NUnit.Framework;
-using System;
-using TINK.Model.Bike.BluetoothLock;
-using TINK.Model.State;
-
-namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
-{
-    [TestFixture]
-    public class TestBikeInfo
-    {
-        /// <summary>
-        /// Moved to TestShareeLib (.Net Core)
-        /// </summary>
-        [Test]
-        public void TestCtorCopyNull()
-        {
-            Assert.Throws<System.ArgumentException>(
-                () => new BikeInfo(null, null),
-                "Verify that no unspecific reference not set to... exception is thrown");
-
-            Assert.Throws<System.ArgumentException>(
-                () => new BikeInfo(new TINK.Model.Bike.BC.BikeInfo(12,1), null),
-                "Verify that no unspecific reference not set to... exception is thrown");
-        }
-
-        [Test]
-        public void TestCtorAvailable()
-        {
-            Assert.AreEqual (12,new BikeInfo(12, 13).Id);
-            Assert.AreEqual(13, new BikeInfo(12, 13).CurrentStation);
-            Assert.AreEqual(InUseStateEnum.Disposable, new BikeInfo(12, 13).State.Value);
-        }
-
-        [Test]
-        public void TestCtorRequested()
-        {
-            Assert.AreEqual(12, new BikeInfo(12, 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", 13, dateTimeProvider: () => new DateTime(2019, 1, 1)).Id);
-            Assert.AreEqual(112, new BikeInfo(12, 112, new Guid(), null, null, null, new DateTime(2020,1,1), "a@b", 13, dateTimeProvider: () => new DateTime(2019, 1, 1)).LockInfo.Id);
-            Assert.AreEqual(InUseStateEnum.Reserved, new BikeInfo(12, 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", 13, dateTimeProvider: () => new DateTime(2019, 1, 1)).State.Value);
-        }
-
-        [Test]
-        public void TestCtorBooked()
-        {
-            Assert.AreEqual(12, new BikeInfo(12, 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", 13).Id);
-            Assert.AreEqual(112, new BikeInfo(12, 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", 13).LockInfo.Id);
-            Assert.AreEqual(InUseStateEnum.Booked, new BikeInfo(12, 112, new Guid(), null, null, null, new DateTime(2020, 1, 1), "a@b", 13).State.Value);
-        }
-    }
-}
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestLockInfo.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestLockInfo.cs
deleted file mode 100644
index 5e83381..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestLockInfo.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-using NUnit.Framework;
-using System;
-using TINK.Model.Bike.BluetoothLock;
-namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
-{
-    [TestFixture]
-    public class TestLockInfo
-    {
-        /// <summary>
-        /// Moved to TestShareeLib (.Net Core)
-        /// </summary>
-        [Test]
-        public void TestCtor()
-        {
-            Assert.AreEqual(
-                LockingState.Unknown,
-                new LockInfo.Builder { Id = 123 }.Build().State);
-
-            Assert.AreEqual(
-                123,
-                new LockInfo.Builder { Id = 123 }.Build().Id);
-        }
-
-        [Test]
-        public void TestEquals()
-        {
-            Assert.IsTrue(new LockInfo.Builder {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed}.Build() == new LockInfo.Builder {
-                    Id = 2,
-                    Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                    Seed = new byte[] { 1, 2 },
-                    UserKey = new byte[] { 7, 2 },
-                    AdminKey = new byte[] { 2, 1 },
-                    State = LockingState.Closed
-                }.Build());
-        }
-
-        [Test]
-        public void TestEqualsFalse()
-        {
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 3,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build());
-
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("1000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build());
-
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 5, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build());
-
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 9, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build());
-
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 11, 1 },
-                State = LockingState.Closed
-            }.Build());
-
-            Assert.IsFalse(new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Closed
-            }.Build() == new LockInfo.Builder
-            {
-                Id = 2,
-                Guid = new Guid("0000f00d-1212-efde-1523-785fef13d123"),
-                Seed = new byte[] { 1, 2 },
-                UserKey = new byte[] { 7, 2 },
-                AdminKey = new byte[] { 2, 1 },
-                State = LockingState.Open
-            }.Build());
-        }
-    }
-}
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestLockInfoHelper.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestLockInfoHelper.cs
deleted file mode 100644
index 8956633..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestLockInfoHelper.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using TINK.Model.Bike.BluetoothLock;
-using TINK.Services.BluetoothLock.Tdo;
-
-namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
-{
-    /// <summary>
-    /// Moved to TestShareeLib (.Net Core)
-    /// </summary>
-    [TestFixture]
-    public class TestLockInfoHelper
-    {
-        [Test]
-        public void TestUpdateById_State()
-        {
-            var locksInfo = new List<LockInfo> { 
-                new LockInfo.Builder { Id = 12, Seed = new byte[] { 3, 5 }, UserKey = new byte[] {2, 1 }, State = LockingState.Unknown }.Build(),
-                new LockInfo.Builder { Id = 14, Seed = new byte[] { 3, 1 }, UserKey = new byte[] {2, 7 }, State = LockingState.Open }.Build(),
-                new LockInfo.Builder { Id = 3, Seed = new byte[] { 1, 5 }, UserKey = new byte[] {2, 9 }, State = LockingState.Closed }.Build(),
-            };
-
-            var locksInfoTdo = new List<LockInfoTdo> {
-                new LockInfoTdo.Builder { Id =14, State = LockitLockingState.Closed}.Build()
-                };
-
-            var resultList = locksInfo.UpdateById(locksInfoTdo);
-
-            var result = resultList.FirstOrDefault(x => x.Id == 14);
-            Assert.NotNull(result, "Target element was removed.");
-            Assert.AreEqual(LockingState.Closed, result.State);
-        }
-
-        [Test]
-        public void TestUpdateById_Guid()
-        {
-            var locksInfo = new List<LockInfo> {
-                new LockInfo.Builder { Id = 12, Seed = new byte[] { 3, 5 }, UserKey = new byte[] {2, 1 }, State = LockingState.Unknown }.Build(),
-                new LockInfo.Builder { Id = 14, Seed = new byte[] { 3, 1 }, UserKey = new byte[] {2, 7 }, State = LockingState.Open }.Build(),
-                new LockInfo.Builder { Id = 3, Seed = new byte[] { 1, 5 }, UserKey = new byte[] {2, 9 }, State = LockingState.Closed }.Build(),
-            };
-
-            var locksInfoTdo = new List<LockInfoTdo> {
-                new LockInfoTdo.Builder { Id =14, Guid = new System.Guid("00000000-0000-0000-0000-e57e6b9aee16"), State = LockitLockingState.Open}.Build()
-                };
-
-            var resultList = locksInfo.UpdateById(locksInfoTdo);
-
-            var result = resultList.FirstOrDefault(x => x.Id == 14);
-            Assert.NotNull(result, "Target element was removed.");
-            Assert.AreEqual(new Guid("00000000-0000-0000-0000-e57e6b9aee16"), result.Guid);
-        }
-    }
-}
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestLockInfoMutable.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestLockInfoMutable.cs
deleted file mode 100644
index 2b15d30..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/BluetoothLock/TestLockInfoMutable.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TINK.Model.Bike.BluetoothLock;
-
-namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
-{
-    /// <summary>
-    /// Moved to TestShareeLib (.Net Core)
-    /// </summary>
-    [TestFixture]
-    public class TestLockInfoMutable
-    {
-        [Test]
-        public void TestCtor()
-        {
-            var lockInfo = new LockInfoMutable(1, new Guid(), new byte[] { 1, 2, 3 }, new byte[] { 1, 23 }, new byte[] { 1, 12 }, LockingState.Closed);
-
-            Assert.AreEqual(1, lockInfo.Id);
-            Assert.AreEqual(new Guid(), lockInfo.Guid);
-            Assert.IsTrue((new byte[] { 1, 2, 3 }).SequenceEqual(lockInfo.UserKey));
-            Assert.IsTrue((new byte[] { 1, 23 }).SequenceEqual(lockInfo.AdminKey));
-            Assert.IsTrue((new byte[] { 1, 12 }).SequenceEqual(lockInfo.Seed));
-            Assert.AreEqual(LockingState.Closed, lockInfo.State);
-        }
-
-        [Test]
-        public void TestSetGuid()
-        {
-            var lockInfo = new LockInfoMutable(1, new Guid(), new byte[] { 1, 2, 3 }, new byte[] { 1, 23 }, new byte[] { 1, 12 }, LockingState.Closed);
-
-            lockInfo.Guid = new Guid("00000000-0000-0000-0000-e57e6b9aee16");
-            Assert.AreEqual(new Guid("00000000-0000-0000-0000-e57e6b9aee16"), lockInfo.Guid);
-        }
-    }
-}
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBike.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/TestBike.cs
deleted file mode 100644
index 715e962..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBike.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using NUnit.Framework;
-
-namespace TestTINKLib.Fixtures.ObjectTests.Bike
-{
-    using TINK.Model.Bike;
-
-    /// <summary>
-    /// Moved to TestShareeLib (.Net Core)
-    /// </summary>
-    [TestFixture]
-    public class TestBike
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            var l_oBike = new Bike(43);
-            Assert.AreEqual(43, l_oBike.Id);
-            Assert.AreEqual(null, l_oBike.TypeOfBike);
-            Assert.AreEqual(null, l_oBike.WheelType);
-
-            l_oBike = new Bike(43, WheelType.Mono, TypeOfBike.Cargo);
-
-            Assert.AreEqual(43, l_oBike.Id);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBike.TypeOfBike);
-            Assert.AreEqual(WheelType.Mono, l_oBike.WheelType);
-        }
-
-        [Test]
-        public void TestCompare()
-        {
-            var l_oBike1 = new Bike(43);
-            Assert.AreEqual(43, l_oBike1.Id);
-            Assert.AreEqual(null, l_oBike1.TypeOfBike);
-            Assert.AreEqual(null, l_oBike1.WheelType);
-
-            var l_oBike2 = new Bike(42, WheelType.Two, TypeOfBike.Allround);
-            Assert.IsFalse(l_oBike1 == l_oBike2);
-
-            l_oBike2 = new Bike(43, WheelType.Mono, TypeOfBike.Allround);
-            Assert.IsFalse(l_oBike1 == l_oBike2);
-
-            l_oBike2 = new Bike(43, WheelType.Two, TypeOfBike.Cargo);
-            Assert.IsFalse(l_oBike1 == l_oBike2);
-
-            l_oBike2 = new Bike(43, null, null);
-            Assert.IsTrue(l_oBike1 == l_oBike2);
-        }
-    }
-}
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeCollection.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeCollection.cs
deleted file mode 100644
index 95a8f78..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeCollection.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using NUnit.Framework;
-using System;
-using TINK.Model.Bike;
-
-
-namespace TestTINKLib
-{
-
-    /// <summary>
-    /// Moved to TestShareeLib (.Net Core)
-    /// </summary>
-    [TestFixture]
-    public class TestBikeCollection
-    {
-        /// <summary> Tests the member.</summary>
-        [Test]
-        public void TestConstruct()
-        {
-            var l_oColl = new BikeCollection();
-
-            Assert.AreEqual(0, l_oColl.Count);
-            Assert.IsNull(l_oColl.GetById(1));
-        }
-    }
-}
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeCollectionFilter.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeCollectionFilter.cs
deleted file mode 100644
index f8d90f7..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeCollectionFilter.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using NUnit.Framework;
-using System.Collections.Generic;
-using TINK.Model;
-using TINK.Model.Bike;
-
-namespace TestTINKLib.Fixtures.ObjectTests.Bike
-{
-    /// <summary>
-    /// Moved to TestShareeLib (.Net Core)
-    /// </summary>
-    [TestFixture]
-    public class TestBikeCollectionFilter
-    {
-        [Test]
-        public void TestGetAtStation()
-        {
-            var coll = new BikeCollection(
-                new Dictionary<int, TINK.Model.Bike.BC.BikeInfo>
-                {
-                    {3, new TINK.Model.Bike.BC.BikeInfo(7, 3 /* Stadion id */) },
-                    {7, new TINK.Model.Bike.BC.BikeInfo(8, 12 /* Stadion id */) },
-                    {12, new TINK.Model.Bike.BC.BikeInfo(33, 12 /* Stadion id */) }
-                });
-
-            Assert.AreEqual(
-                0,
-                BikeCollectionFilter.GetAtStation(null, 12).Count);
-
-            Assert.AreEqual(
-                0,
-                coll.GetAtStation(null).Count);
-
-            Assert.AreEqual(
-                0,
-                coll.GetAtStation(22).Count);
-
-            Assert.AreEqual(
-                1,
-                coll.GetAtStation(3).Count);
-
-            Assert.AreEqual(
-                2,
-                coll.GetAtStation(12).Count);
-        }
-
-        [Test]
-        public void TestGetLockIt()
-        {
-            var coll = new BikeCollection(
-                new Dictionary<int, TINK.Model.Bike.BC.BikeInfo>
-                {
-                    {7, new TINK.Model.Bike.BC.BikeInfo(8, 12 /* Stadion id */) },
-                    {12, new TINK.Model.Bike.BC.BikeInfo(33, 12 /* Stadion id */) }
-                });
-
-
-            Assert.AreEqual(
-                0,
-                coll.GetLockIt().Count);
-
-            coll = new BikeCollection(
-                new Dictionary<int, TINK.Model.Bike.BC.BikeInfo>
-                {
-                    {7, new TINK.Model.Bike.BC.BikeInfo(8, 12 /* Stadion id */) },
-                    {11, new TINK.Model.Bike.BluetoothLock.BikeInfo(33, 12 /* Stadion id */) },
-                    {12, new TINK.Model.Bike.BC.BikeInfo(33, 12 /* Stadion id */) }
-                });
-
-            Assert.AreEqual(
-                0,
-                BikeCollectionFilter.GetLockIt(null).Count);
-
-            Assert.AreEqual(
-                1,
-                coll.GetLockIt().Count);
-        }
-    }
-}
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeCollectionMutable.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeCollectionMutable.cs
deleted file mode 100644
index a67b6ea..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeCollectionMutable.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using TINK.Model.Bike;
-using TINK.Model.State;
-
-using BikeInfo = TINK.Model.Bike.BC.BikeInfo;
-using BikeInfoMutable = TINK.Model.Bike.BC.BikeInfoMutable;
-
-namespace TestTINKLib
-{
-
-    /// <summary>
-    /// Moved to TestShareeLib (.Net Core)
-    /// </summary>
-    [TestFixture]
-    public class TestBikeCollectionMutable
-    {
-        /// <summary> Tests the member.</summary>
-        [Test]
-        public void TestAdd()
-        {
-            var l_oColl = new BikeCollectionMutable();
-
-            l_oColl.Add(new BikeInfoMutable(57, false, new List<string> { "TINK" },  WheelType.Two, TypeOfBike.Allround));
-
-            Assert.Throws<Exception>(() => l_oColl.Add(new BikeInfoMutable(57, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Cargo)));
-        }
-
-        [Test]
-        public void TestUpdate_Null()
-        {
-            var l_oBikeRequested = new BikeInfoMutable(20, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround);
-            l_oBikeRequested.State.Load(new StateInfo(() => DateTime.Now, DateTime.Now, "john@long", "1234"));
-
-            var l_oBikeColl = new BikeCollectionMutable
-            {
-                new BikeInfoMutable(63, false, new List<string> { "TINK" },  WheelType.Two, TypeOfBike.Allround),
-                new BikeInfoMutable(57, false, new List<string> { "TINK" },  WheelType.Trike, TypeOfBike.Cargo),
-                l_oBikeRequested,
-            };
-
-            // Verify initial state
-            Assert.NotNull(l_oBikeColl.GetById("63"));
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBikeColl.GetById("57").State.Value);
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oBikeColl.GetById("20").State.Value);
-            Assert.Null(l_oBikeColl.GetById("33"));
-
-            l_oBikeColl.Update(null);
-
-            // Verify modified state
-            Assert.Null(l_oBikeColl.GetById("63"));
-            Assert.Null(l_oBikeColl.GetById("57"));
-            Assert.Null(l_oBikeColl.GetById("20"));
-            Assert.Null(l_oBikeColl.GetById("33"));
-        }
-
-        [Test]
-        public void TestUpdate()
-        {
-            var l_oBikeRequested = new BikeInfoMutable(20, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround);
-            l_oBikeRequested.State.Load(new StateInfo(() => DateTime.Now, DateTime.Now, "john@long", "1234"));
-
-            var l_oBikeColl = new BikeCollectionMutable
-            {
-                new BikeInfoMutable(63, false, new List<string> { "TINK" },  WheelType.Two, TypeOfBike.Allround),
-                new BikeInfoMutable(57, false, new List<string> { "TINK" },  WheelType.Trike, TypeOfBike.Cargo),
-                l_oBikeRequested,
-            };
-
-            // Verify initial state
-            Assert.NotNull(l_oBikeColl.GetById("63")); // Will be removed
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBikeColl.GetById("57").State.Value); // Will be requested
-            Assert.AreEqual(InUseStateEnum.Reserved, l_oBikeColl.GetById("20").State.Value); // Will be booked
-            Assert.Null(l_oBikeColl.GetById("33")); // 
-
-            var l_oBikeResponse = new List<BikeInfo>
-            {
-                new BikeInfo("57", false, new [] { "TINK" }, WheelType.Trike, TypeOfBike.Allround, "Test description", 7, DateTime.Now, "john@long,", "1234"),
-                new BikeInfo("20", false, new [] {"TINK" }, WheelType.Trike, TypeOfBike.Allround, "Test description", 7, DateTime.Now, "john@long,", "1234"),
-                new BikeInfo("33", 7, false, new [] {"TINK" }, WheelType.Trike, TypeOfBike.Allround),
-            };
-
-            l_oBikeColl.Update(l_oBikeResponse);
-
-            // Verify modified state
-            Assert.Null(l_oBikeColl.GetById("63"));
-            Assert.AreEqual(InUseStateEnum.Booked, l_oBikeColl.GetById("57").State.Value);
-            Assert.AreEqual(InUseStateEnum.Booked, l_oBikeColl.GetById("20").State.Value);
-            Assert.NotNull(l_oBikeColl.GetById("33"));
-        }
-    }
-}
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeMutable.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeMutable.cs
deleted file mode 100644
index 2337035..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikeMutable.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-using System;
-using System.Collections.Generic;
-using NUnit.Framework;
-using TINK.Model.Bike;
-using TINK.Model.State;
-
-using BikeInfoMutable = TINK.Model.Bike.BC.BikeInfoMutable;
-
-namespace TestTINKLib
-{
-
-    /// <summary>
-    /// Moved to TestShareeLib (.Net Core)
-    /// </summary>
-    [TestFixture]
-    class TestBikeMutable
-    {
-        [Test]
-        public void TestConstruct()
-        {
-            var l_oBike = new BikeInfoMutable(
-                                42,
-                                false,
-                                new List<string> { "TINK" },
-                                WheelType.Two,
-                                TypeOfBike.Cargo);
-
-            Assert.AreEqual(42, l_oBike.Id);
-            Assert.IsFalse(l_oBike.IsDemo);
-            Assert.AreEqual(WheelType.Two, l_oBike.WheelType);
-            Assert.AreEqual(TypeOfBike.Cargo, l_oBike.TypeOfBike);
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBike.State.Value);
-            Assert.IsNull(l_oBike.CurrentStation);
-
-            l_oBike = new BikeInfoMutable(
-                                17,
-                                true, 
-                                new List<string> { "TINK" },
-                                WheelType.Mono,
-                                TypeOfBike.Allround, 
-                                "Test description",
-                                1);
-
-            Assert.AreEqual(17, l_oBike.Id);
-            Assert.IsTrue(l_oBike.IsDemo);
-            Assert.AreEqual(WheelType.Mono, l_oBike.WheelType);
-            Assert.AreEqual(TypeOfBike.Allround, l_oBike.TypeOfBike);
-            Assert.AreEqual(InUseStateEnum.Disposable, l_oBike.State.Value);
-            Assert.AreEqual(1, l_oBike.CurrentStation);
-        }
-
-        [Test]
-        public void TestToString()
-        {
-            var l_oBike = new BikeInfoMutable(3, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, p_oDateTimeProvider: () => new DateTime(1970, 1, 1));
-
-            Assert.AreEqual(
-                "Id=3, wheel(s)=Two, type=Cargo, demo=False, state=Disposable, location=On the road.",
-                l_oBike.ToString());
-
-            l_oBike = new BikeInfoMutable(3, true, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround, "Test description", 5, p_oDateTimeProvider: () => new DateTime(1970, 1, 1));
-            Assert.AreEqual(
-                "Id=3, wheel(s)=Trike, type=Allround, demo=True, state=Disposable, location=Station 5.",
-                l_oBike.ToString());
-        }
-    }
-}
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikesAvailableResponse.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikesAvailableResponse.cs
deleted file mode 100644
index 1f52744..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/TestBikesAvailableResponse.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using Newtonsoft.Json;
-using NUnit.Framework;
-using TINK.Repository.Response;
-
-namespace TestTINKLib.Fixtures.ObjectTests.Bike
-{
-    /// <summary>
-    /// Moved to TestShareeLib (.Net Core)
-    /// </summary>
-    [TestFixture]
-    public class TestBikesAvailableResponse
-    {
-        [Test]
-        public void TestDeserializeStationEmpty()
-        {
-            // Response for bike 231 is a real world answer.
-            var l_oBikes = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
-                {
-                    ""apiserver"" : ""https://app.tink-konstanz.de"",
-                            ""response"" : ""bikes_available"",
-                          ""bikes"" : {
-                             ""231"" : {
-                                        ""bike"" : ""231"",
-                                ""description"" : ""Stadtrad"",
-                                ""system"" : ""BC"",
-                                ""bike_group"" : [ ""Konrad"" ],
-                                ""station"" : """",
-                                ""state"" : ""available"",
-                                ""gps"" : { ""latitude"": ""9.1594501"", ""longitude"": ""47.6749928"" }
-                             }
-                        },
-                  ""copri_version"" : ""4.1.0.0"",
-                  ""authcookie"" : """",
-                  ""response_state"" : ""OK""
-               }
-            ");
-
-            Assert.IsNull(l_oBikes.bikes[231].station);
-        }
-
-        [Test]
-        public void TestDeserializeStationInfoMissing()
-        {
-            // Response for bike 231 might not be real world answer.
-            var l_oBikes = JsonConvert.DeserializeObject<BikesAvailableResponse>(@"
-                {
-                    ""apiserver"" : ""https://app.tink-konstanz.de"",
-                            ""response"" : ""bikes_available"",
-                          ""bikes"" : {
-                             ""231"" : {
-                                        ""bike"" : ""231"",
-                                ""description"" : ""Stadtrad"",
-                                ""system"" : ""BC"",
-                                ""bike_group"" : [ ""Konrad"" ],
-                                ""state"" : ""available"",
-                                ""gps"" : { ""latitude"": ""9.1594501"", ""longitude"": ""47.6749928"" }
-                             }
-                        },
-                  ""copri_version"" : ""4.1.0.0"",
-                  ""authcookie"" : """",
-                  ""response_state"" : ""OK""
-               }
-            ");
-
-            Assert.IsNull(l_oBikes.bikes[231].station);
-
-        }
-    }
-}
diff --git a/TestTINKLib/Fixtures/ObjectTests/Bike/TestStateBookedInfoSerializeJSON.cs b/TestTINKLib/Fixtures/ObjectTests/Bike/TestStateBookedInfoSerializeJSON.cs
deleted file mode 100644
index 65a8bbd..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/Bike/TestStateBookedInfoSerializeJSON.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using Newtonsoft.Json;
-using NUnit.Framework;
-using System;
-using TINK.Model.State;
-
-
-namespace TestTINKLib.Fixtures.Bike
-{
-    /// <summary>
-    /// Moved to TestShareeLib (.Net Core)
-    /// </summary>
-    [TestFixture]
-    public class TestStateBookedInfoSerializeJSON
-    {
-        [Test]
-        public void TestSerializeJSON()
-        {
-            // Create object to test.
-            var l_oInfoSource = new StateOccupiedInfo(
-                new DateTime(2017, 09, 20, 23, 05, 0),
-                "Heinz@mueller",
-                "17 xxb");
-
-            // Serialize object and verify.
-            var l_oDetected = JsonConvert.SerializeObject(l_oInfoSource);
-            const string EXPECTED = @"
-                {
-                    ""From"":""2017 - 09 - 20T23: 05:00"",
-                    ""MailAddress"":""Heinz@mueller"",
-                    ""Code"":""17 xxb""
-                }";
-            Assert.AreEqual(
-				TestHelper.PrepareXmlForStringCompare(EXPECTED.Replace("\n", string.Empty).Replace("\r", string.Empty)),
-				TestHelper.PrepareXmlForStringCompare(l_oDetected.Replace("\n", string.Empty).Replace("\r", string.Empty)));
-
-            // Deserialize object and verify.
-            var l_oInfoTarget = JsonConvert.DeserializeObject<StateOccupiedInfo>(l_oDetected);
-            Assert.AreEqual(InUseStateEnum.Booked, l_oInfoTarget.Value);
-            Assert.AreEqual("Heinz@mueller", l_oInfoTarget.MailAddress);
-            Assert.AreEqual("17 xxb", l_oInfoTarget.Code);
-            Assert.AreEqual(new DateTime(2017, 9, 20, 23, 5, 0), l_oInfoTarget.From);
-        }
-    }
-}
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationViewModel.cs
index 9307ca2..9efc88a 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationViewModel.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestBikeAtStationViewModel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using Rhino.Mocks;
 using TestFramework.Model.User.Account;
 using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS;
@@ -78,7 +77,7 @@ namespace UITest.Fixtures.ViewModel
 				l_oBike,
 				l_oUser,
 				new MyBikeInUseStateInfoProvider(),
-				MockRepository.GenerateStub<IBikesViewModel>(),
+				NSubstitute.Substitute.For<IBikesViewModel>(),
 				url => { });
 
 			Assert.AreEqual("2", l_oViewModel.Name);
@@ -105,7 +104,7 @@ namespace UITest.Fixtures.ViewModel
 					bike,
 					user,
 					new BikeAtStationInUseStateInfoProvider(),
-					MockRepository.GenerateStub<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IBikesViewModel>(),
 					url => { }));
 
 			Assert.AreEqual("Still 15 min. reserved.", l_oViewModel.StateText);
@@ -128,7 +127,7 @@ namespace UITest.Fixtures.ViewModel
 					bike,
 					user,
 					new BikeAtStationInUseStateInfoProvider(),
-					MockRepository.GenerateStub<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IBikesViewModel>(),
 					url => { }));
 
 			Assert.AreEqual("Code 4asdfA, still 7 min. reserved.", l_oViewModel.StateText);
@@ -151,7 +150,7 @@ namespace UITest.Fixtures.ViewModel
 					bike,
 					user,
 					new BikeAtStationInUseStateInfoProvider(),
-					MockRepository.GenerateStub<IBikesViewModel>(),
+					NSubstitute.Substitute.For<IBikesViewModel>(),
 					url => { }));
 
 			Assert.AreEqual(
@@ -188,7 +187,7 @@ namespace UITest.Fixtures.ViewModel
 					l_oStoreMock.Load().Result,
 					"123456789"), // Device id
 				new BikeAtStationInUseStateInfoProvider(),
-				MockRepository.GenerateStub<IBikesViewModel>(),
+				NSubstitute.Substitute.For<IBikesViewModel>(),
 				url => { });
 
 			Assert.AreEqual("Test description", l_oViewModel.Name);
@@ -227,7 +226,7 @@ namespace UITest.Fixtures.ViewModel
 					l_oStoreMock.Load().Result,
 					"123456789"),
 				new BikeAtStationInUseStateInfoProvider(),
-				MockRepository.GenerateStub<IBikesViewModel>(),
+				NSubstitute.Substitute.For<IBikesViewModel>(),
 				url => { });
 
 			Assert.AreEqual("Test description", l_oViewModel.Name);
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestViewModelHelper.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestViewModelHelper.cs
deleted file mode 100644
index 376ab2b..0000000
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestViewModelHelper.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using NUnit.Framework;
-using Rhino.Mocks;
-using TINK.Model.Bikes.BikeInfoNS.BC;
-using TINK.Model.Bikes.BikeInfoNS.BikeNS;
-using TINK.ViewModel;
-
-namespace UITest.Fixtures.ObjectTests.ViewModel
-{
-
-	[TestFixture]
-	public class TestViewModelHelper
-	{
-		[Test]
-		public void TestGetDisplayName_DefinedTypes()
-		{
-			var l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
-			l_oBike.Stub(x => x.WheelType).Return(WheelType.Two);
-			l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.City);
-			l_oBike.Stub(x => x.Description).Return("MeinStadtrad");
-			l_oBike.Stub(x => x.Id).Return("22");
-			Assert.AreEqual(
-				"MeinStadtrad",
-				l_oBike.GetDisplayName());
-
-			Assert.AreEqual(
-				"22",
-				l_oBike.GetDisplayId());
-
-			l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
-			l_oBike.Stub(x => x.WheelType).Return(WheelType.Two);
-			l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.City);
-			l_oBike.Stub(x => x.Id).Return("22");
-			l_oBike.Stub(x => x.IsDemo).Return(true);
-			l_oBike.Stub(x => x.Description).Return("MeinStadtrad");
-			Assert.AreEqual(
-				"MeinStadtrad",
-				l_oBike.GetDisplayName());
-			Assert.AreEqual(
-				"22",
-				l_oBike.GetDisplayId());
-
-			l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
-			l_oBike.Stub(x => x.WheelType).Return(WheelType.Trike);
-			l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
-			l_oBike.Stub(x => x.Description).Return("MeinCargoDreiradl");
-			l_oBike.Stub(x => x.Id).Return("22");
-			Assert.AreEqual(
-				"MeinCargoDreiradl",
-				l_oBike.GetDisplayName());
-			Assert.AreEqual(
-				"22",
-				l_oBike.GetDisplayId());
-
-			l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
-			l_oBike.Stub(x => x.WheelType).Return(WheelType.Two);
-			l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
-			l_oBike.Stub(x => x.Description).Return("MeinCargoALololong");
-			l_oBike.Stub(x => x.Id).Return("22");
-			Assert.AreEqual(
-				"MeinCargoALololong",
-				l_oBike.GetDisplayName());
-			Assert.AreEqual(
-				"22",
-				l_oBike.GetDisplayId());
-		}
-
-		[Test]
-		public void TestGetDisplayName_UndefinedTypes()
-		{
-			var l_oBike = MockRepository.GenerateStub<IBikeInfoMutable>();
-			l_oBike.Stub(x => x.WheelType).Return(WheelType.Mono);
-			l_oBike.Stub(x => x.TypeOfBike).Return(TypeOfBike.Cargo);
-			l_oBike.Stub(x => x.Description).Return("SuperCargo");
-			l_oBike.Stub(x => x.Id).Return("22");
-			Assert.AreEqual(
-				"SuperCargo",
-				l_oBike.GetDisplayName());
-
-			Assert.AreEqual(
-				"22",
-				l_oBike.GetDisplayId());
-		}
-	}
-}
diff --git a/TestTINKLib/TestTINKLib.csproj b/TestTINKLib/TestTINKLib.csproj
index 52ffeb1..003169e 100644
--- a/TestTINKLib/TestTINKLib.csproj
+++ b/TestTINKLib/TestTINKLib.csproj
@@ -40,84 +40,33 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Fixtures\ObjectTests\Services\BluetoothLock\Tdo\TestLockInfoAuthTdo.cs" />
-    <Compile Include="Fixtures\ObjectTests\Services\TestLocksServicesContainerMutable.cs" />
     <Compile Include="Fixtures\ObjectTests\Services\TestServicesContainerMutable.cs" />
-    <Compile Include="Fixtures\ObjectTests\Settings\BluetoothLock\TestLockIt.cs" />
     <Compile Include="Fixtures\ObjectTests\ViewModel\Account\TestAccountPageViewModel.cs" />
-    <None Include="Fixtures\ObjectTests\Bike\BluetoothLock\TestLockInfo.cs" />
-    <None Include="Fixtures\ObjectTests\Bike\BluetoothLock\TestLockInfoHelper.cs" />
-    <None Include="Fixtures\ObjectTests\Bike\BluetoothLock\TestLockInfoMutable.cs" />
-    <None Include="Fixtures\ObjectTests\Bike\TestBike.cs" />
-    <None Include="Fixtures\ObjectTests\Bike\TestBikeCollection.cs" />
-    <None Include="Fixtures\ObjectTests\Bike\TestBikeCollectionFilter.cs" />
-    <None Include="Fixtures\ObjectTests\Bike\TestBikesAvailableResponse.cs" />
     <Compile Include="Fixtures\ObjectTests\Connector\CopriCallsHttpReference.cs" />
-    <Compile Include="Fixtures\ObjectTests\Connector\Exception\TestAuthcookieNotDefinedException.cs" />
-    <Compile Include="Fixtures\ObjectTests\Connector\Filter\TestIntersectFilter.cs" />
-    <Compile Include="Fixtures\ObjectTests\Connector\Filter\TestNullFilter.cs" />
     <Compile Include="Fixtures\ObjectTests\Connector\Query\TestCachedQuery.cs" />
     <Compile Include="Fixtures\ObjectTests\Connector\Query\TestCachedQueryLoggedIn.cs" />
     <Compile Include="Fixtures\ObjectTests\Connector\TestConnectorCache.cs" />
     <Compile Include="Fixtures\ObjectTests\Connector\TestCopriCallsHttps.cs" />
     <Compile Include="Fixtures\ObjectTests\Connector\TestCopriCallsStatic.cs" />
-    <Compile Include="Fixtures\ObjectTests\Connector\Response\TestResponseHelper.cs" />
     <Compile Include="Fixtures\ObjectTests\Connector\TestCommandLoggedIn.cs" />
     <Compile Include="Fixtures\ObjectTests\Connector\TestConnector.cs" />
-    <Compile Include="Fixtures\ObjectTests\Connector\TestCopriServerUriList.cs" />
     <Compile Include="Fixtures\ObjectTests\Connector\TestFilter.cs" />
     <Compile Include="Fixtures\ObjectTests\Connector\Query\TestQuery.cs" />
     <Compile Include="Fixtures\ObjectTests\Connector\Query\TestQueryLoggedIn.cs" />
-    <Compile Include="Fixtures\ObjectTests\Logging\TestLoggingDirectoryManager.cs" />
-    <Compile Include="Fixtures\ObjectTests\Map\TestMapPageFilter.cs" />
-    <Compile Include="Fixtures\ObjectTests\Services\BluetoothLock\Crypto\TestCryptoHelper.cs" />
     <Compile Include="Fixtures\ObjectTests\Services\BluetoothLock\TestLockItBaseService.cs" />
-    <Compile Include="Fixtures\ObjectTests\Services\BluetoothLock\TestLockServiceSimulation.cs" />
-    <Compile Include="Fixtures\ObjectTests\Settings\TestGroupFilterSettings.cs" />
-    <Compile Include="Fixtures\ObjectTests\Settings\TestPollingParameters.cs" />
-    <Compile Include="Fixtures\ObjectTests\Settings\TestSettings.cs" />
-    <Compile Include="Fixtures\ObjectTests\Station\TestNullStation.cs" />
-    <Compile Include="Fixtures\ObjectTests\TestFilterCollection.cs" />
-    <Compile Include="Fixtures\ObjectTests\TestFilterCollectionStore.cs" />
-    <Compile Include="Fixtures\ObjectTests\User\Account\TestAccount.cs" />
     <Compile Include="Fixtures\ObjectTests\User\Account\TestAccountExtensions.cs" />
     <None Include="Fixtures\ObjectTests\User\Account\TestStore.cs" />
-    <Compile Include="Fixtures\ObjectTests\ViewModel\Bikes\Bike\BluetoothLock\TestRequestHandlerFactory.cs" />
-    <Compile Include="Fixtures\ObjectTests\ViewModel\Info\TestInfoViewModel.cs" />
     <Compile Include="Fixtures\ObjectTests\ViewModel\Map\TestMapPageFilter.cs" />
-    <Compile Include="Fixtures\ObjectTests\ViewModel\Map\TestMapPageViewModel.cs" />
-    <Compile Include="Fixtures\ObjectTests\ViewModel\Settings\TestFilterCollectionMutable.cs" />
-    <Compile Include="Fixtures\ObjectTests\ViewModel\TestBikeAtStationInUseStateInfoProvider.cs" />
     <Compile Include="Fixtures\ObjectTests\ViewModel\TestBikeAtStationViewModel.cs" />
     <Compile Include="Fixtures\ObjectTests\ViewModel\TestBikeViewModel.cs" />
-    <Compile Include="Fixtures\ObjectTests\ViewModel\TestBikeViewModelFactory.cs" />
-    <Compile Include="Fixtures\ObjectTests\ViewModel\TestMyBikeInUseStateInfoProvider.cs" />
     <Compile Include="Fixtures\ObjectTests\ViewModel\TestMyBikePageViewModel.cs" />
     <Compile Include="Fixtures\ObjectTests\ViewModel\TestMyBikesPageViewModel.cs" />
-    <Compile Include="Fixtures\ObjectTests\ViewModel\TestViewModelHelper.cs" />
     <Compile Include="Fixtures\UseCases\ConnectedOffline\TestTinkApp.cs" />
     <Compile Include="Fixtures\UseCases\TestHelper.cs" />
     <None Include="Fixtures\ObjectTests\Bike\TestBikeSerializeJSON.cs" />
-    <None Include="Fixtures\ObjectTests\Bike\TestBikeCollectionSerializeJSON.cs" />
-    <None Include="Fixtures\ObjectTests\Bike\TestStateBookedInfoSerializeJSON.cs" />
-    <Compile Include="Fixtures\ObjectTests\Connector\TestCopriCallsMemory.cs.cs" />
-    <Compile Include="Fixtures\ObjectTests\Connector\Response\TestBikesAvailableResponse.cs" />
-    <Compile Include="Fixtures\ObjectTests\Connector\Response\TestBikesOccupiedResponse.cs" />
-    <Compile Include="Fixtures\ObjectTests\Connector\Response\TestBookingResponse.cs" />
-    <Compile Include="Fixtures\ObjectTests\Connector\Response\TestResponseBase.cs" />
-    <Compile Include="Fixtures\ObjectTests\Connector\Response\TestStationsAllResponse.cs" />
-    <Compile Include="Fixtures\ObjectTests\State\TestStateBookedInfo.cs" />
-    <Compile Include="Fixtures\ObjectTests\State\TestStateDisposableInfo.cs" />
     <Compile Include="Fixtures\ObjectTests\State\TestStateInfoMutable.cs" />
-    <Compile Include="Fixtures\ObjectTests\State\TestStateInfoSerializeJSON.cs" />
     <Compile Include="Fixtures\ObjectTests\State\TestStateRequestedInfo.cs" />
-    <None Include="Fixtures\ObjectTests\Bike\TestBikeMutable.cs" />
-    <None Include="Fixtures\ObjectTests\Bike\TestBikeCollectionMutable.cs" />
-    <Compile Include="Fixtures\ObjectTests\State\TestStateRequestedInfoSerializeJSON.cs" />
-    <Compile Include="Fixtures\ObjectTests\Station\TestStation.cs" />
     <Compile Include="Fixtures\UseCases\SelectStation\TestTinkApp.cs" />
-    <Compile Include="Fixtures\ObjectTests\User\Account\TestValidator.cs" />
-    <Compile Include="Fixtures\ObjectTests\User\TestUser.cs" />
     <Compile Include="Mocks\Bike\BikeCollectionMock.cs" />
     <Compile Include="Mocks\Connector\CopriCallsCacheMemory.cs" />
     <Compile Include="Mocks\DateTimeMocker.cs" />
@@ -185,7 +134,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Fixtures\ObjectTests\Connector\Exception\" />
+    <Folder Include="Fixtures\ObjectTests\Connector\Filter\" />
+    <Folder Include="Fixtures\ObjectTests\Connector\Response\" />
     <Folder Include="Fixtures\ObjectTests\Connector\Updater\" />
+    <Folder Include="Fixtures\ObjectTests\Services\BluetoothLock\Crypto\" />
+    <Folder Include="Fixtures\ObjectTests\Services\BluetoothLock\Tdo\" />
+    <Folder Include="Fixtures\ObjectTests\Settings\BluetoothLock\" />
     <Folder Include="Fixtures\UseCases\Startup\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />