diff --git a/IOIOTruck/res/layout/nav_activity.xml b/IOIOTruck/res/layout/nav_activity.xml
index 81635a5..74b667b 100644
--- a/IOIOTruck/res/layout/nav_activity.xml
+++ b/IOIOTruck/res/layout/nav_activity.xml
@@ -43,11 +43,19 @@
             android:textColor="#FF0000" />
 
         <ImageButton
-            android:id="@+id/mark_my_lcoation_button"
+            android:id="@+id/map_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_alignParentRight="true"
+            android:src="@drawable/map_action_bar" />
+
+        <ImageButton
+            android:id="@+id/mark_my_lcoation_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/map_button"
+            android:layout_alignParentRight="true"
             android:src="@drawable/mark_my_location_action_bar" />
 
         <ImageButton
diff --git a/IOIOTruck/src/com/TwentyCodes/android/IOIOTruck/NavigationActivity.java b/IOIOTruck/src/com/TwentyCodes/android/IOIOTruck/NavigationActivity.java
index a2d8549..f93e211 100644
--- a/IOIOTruck/src/com/TwentyCodes/android/IOIOTruck/NavigationActivity.java
+++ b/IOIOTruck/src/com/TwentyCodes/android/IOIOTruck/NavigationActivity.java
@@ -155,6 +155,10 @@ public class NavigationActivity extends FragmentActivity implements CompassListe
 			case R.id.go_button:
 				updateGoButton();
 				break;
+
+			case R.id.map_button:
+				mMap.changeMapMode();
+				break;
 				
 			case R.id.mark_my_lcoation_button:
 				GeoPoint point = mMap.getUserLocation();
@@ -173,6 +177,7 @@ public class NavigationActivity extends FragmentActivity implements CompassListe
 				} else
 					
 				break;
+				
 		}
 	}
 
@@ -261,6 +266,7 @@ public class NavigationActivity extends FragmentActivity implements CompassListe
 		mGoButton.setOnClickListener(this);
 		findViewById(R.id.mark_my_lcoation_button).setOnClickListener(this);
 		findViewById(R.id.my_location_button).setOnClickListener(this);
+		findViewById(R.id.map_button).setOnClickListener(this);
 	}
 	
 	/**