diff --git a/main/MyFriendsAround.WP7/App.xaml.cs b/main/MyFriendsAround.WP7/App.xaml.cs
index 5421dd2..4920e7c 100644
--- a/main/MyFriendsAround.WP7/App.xaml.cs
+++ b/main/MyFriendsAround.WP7/App.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Device.Location;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -16,6 +17,7 @@ using System.Windows.Shapes;
 using Microsoft.Phone;
 using Microsoft.Phone.Controls;
 using Microsoft.Phone.Shell;
+using MyFriendsAround.WP7.Model;
 using MyFriendsAround.WP7.ViewModel;
 using MyFriendsAround.WP7.Utils;
 using GalaSoft.MvvmLight.Threading;
@@ -102,6 +104,8 @@ namespace MyFriendsAround.WP7
             if (mainModel != null)
             {
                 mainModel.IsBusy = false;
+                mainModel.GpsLocation = Location.Unknown;
+                mainModel.GpsStatus = GeoPositionStatus.NoData;
                 Container.Instance.RegisterInstance<MainViewModel>(mainModel, Constants.VM_MAIN);
             }
             else
diff --git a/main/MyFriendsAround.WP7/Views/MainPage.xaml b/main/MyFriendsAround.WP7/Views/MainPage.xaml
index 4f7dc38..8ee0254 100644
--- a/main/MyFriendsAround.WP7/Views/MainPage.xaml
+++ b/main/MyFriendsAround.WP7/Views/MainPage.xaml
@@ -211,11 +211,6 @@
                            Source="{Binding SelectedFriend, Path=SelectedFriend.PinImageUrl, Converter={StaticResource imageCacheConverter}}"
                            Margin="1"
                            Stretch="Fill">
-                        <i:Interaction.Triggers>
-                            <i:EventTrigger EventName="MouseLeftButtonDown">
-                                <cmd:EventToCommand Command="{Binding ShowSelectFriendCommand}" />
-                            </i:EventTrigger>
-                        </i:Interaction.Triggers>
                     </Image>
                     <Border Background="{StaticResource PhoneAccentBrush}"
                             Width="80"
@@ -234,6 +229,15 @@
                                    Text="{Binding SelectedFriend, Path=SelectedFriend.PinUserName}"
                                    Opacity="1" />
                     </Border>
+                    <Rectangle Fill="Transparent"
+                               HorizontalAlignment="Stretch"
+                               VerticalAlignment="Stretch">
+                        <i:Interaction.Triggers>
+                            <i:EventTrigger EventName="MouseLeftButtonDown">
+                                <cmd:EventToCommand Command="{Binding ShowSelectFriendCommand}" />
+                            </i:EventTrigger>
+                        </i:Interaction.Triggers>
+                    </Rectangle>
                 </Grid>
 
                 <toolkit:PerformanceProgressBar HorizontalAlignment="Left"