diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3e36ca1..2548ff6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -57,13 +57,14 @@
             android:configChanges="keyboardHidden|orientation" >
         </activity>
 
-        <uses-library android:name="com.google.android.maps" />
-
         <activity
-            android:name=".restaurant.TRCardManagerRestaurantMapsActivity"
-            android:label="@string/title_activity_trcard_manager_restaurant_maps" >
+            android:name=".restaurant.TRCardManagerRestaurantMapsActivity">
         </activity>
         
+        <uses-library android:name="com.google.android.maps" />
+
+        
+        
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/res/drawable-ldpi/android_maps.png b/res/drawable-ldpi/android_maps.png
index e3dcbf6..eba8b65 100644
Binary files a/res/drawable-ldpi/android_maps.png and b/res/drawable-ldpi/android_maps.png differ
diff --git a/res/drawable-xhdpi/android_maps.png b/res/drawable-xhdpi/android_maps.png
new file mode 100644
index 0000000..37cb116
Binary files /dev/null and b/res/drawable-xhdpi/android_maps.png differ
diff --git a/res/drawable/select_restaurant_border_selected.xml b/res/drawable/select_restaurant_border_selected.xml
new file mode 100644
index 0000000..eeb3952
--- /dev/null
+++ b/res/drawable/select_restaurant_border_selected.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <stroke android:width="1sp" android:color="#041F50" />
+    
+    <solid android:color="#041A00"/>
+    
+    <padding android:left="10dip" android:top="14dip" 
+            android:right="10dip" android:bottom="14dip" /> 
+    <corners android:radius="4dip"/>
+    
+   
+</shape>
\ No newline at end of file
diff --git a/res/layout/restaurant_data.xml b/res/layout/restaurant_data.xml
index 9c35d61..824a9e6 100644
--- a/res/layout/restaurant_data.xml
+++ b/res/layout/restaurant_data.xml
@@ -4,7 +4,8 @@
     android:layout_height="wrap_content"
     android:padding="0sp" 
     android:layout_margin="0sp"
-    android:background="#FFFFFF">
+    android:background="@android:color/white"
+    > 
 
     <RelativeLayout
         android:id="@+id/restaurant_data_info_layout"
@@ -21,7 +22,7 @@
             android:paddingBottom="2sp"
             android:paddingLeft="2sp"
             android:paddingRight="2sp"
-            android:paddingTop="2sp"
+            android:paddingTop="6sp"
             android:text=""
             android:textColor="#2A4678"
             android:textStyle="bold" />
@@ -69,9 +70,9 @@
             android:layout_alignParentTop="true"
             android:paddingBottom="2sp"
             android:paddingLeft="2sp"
-            android:paddingRight="4sp"
-            android:paddingTop="0sp"
-            android:text="X"
+            android:paddingRight="8sp"
+            android:paddingTop="4sp"
+            android:background="@android:drawable/btn_dialog"
             android:textColor="#2A4678"
             android:textStyle="bold"
             android:clickable="true"/>
@@ -84,7 +85,7 @@
         android:layout_below="@id/restaurant_data_info_layout"
         android:gravity="center">
         
-        <TextView
+        <!-- TextView
 	        android:id="@+id/restaurant_data_maps"
 	        android:layout_width="wrap_content"
 	        android:layout_height="wrap_content"
@@ -95,7 +96,18 @@
 	        android:onClick="openMap"
 	        android:textColor="#2A4678"
 	        android:textStyle="bold"
-	        android:typeface="sans" />
+	        android:typeface="sans" /-->
+	    <ImageButton
+	        android:id="@+id/restaurant_data_maps"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:paddingTop="4sp"
+	        android:layout_marginTop="4sp"
+	        android:background="@null"
+	        android:src="@drawable/android_maps"
+	        android:contentDescription="@string/restaurant_data_maps_text"
+            android:gravity="center_vertical|center_horizontal"
+	        android:onClick="openMap"/>
         
          <ImageButton
             android:id="@+id/restaurant_data_waze_image"
diff --git a/res/layout/restaurant_data_list_view.xml b/res/layout/restaurant_data_list_view.xml
new file mode 100644
index 0000000..161bef4
--- /dev/null
+++ b/res/layout/restaurant_data_list_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="0sp" 
+    android:layout_margin="0sp"
+    >
+       <TextView
+            android:id="@+id/restaurant_data_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:paddingBottom="2sp"
+            android:paddingLeft="2sp"
+            android:paddingRight="2sp"
+            android:paddingTop="6sp"
+            android:text=""
+            android:textColor="#2A4678"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/restaurant_data_direction"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/restaurant_data_name"
+            android:paddingBottom="2sp"
+            android:paddingLeft="2sp"
+            android:paddingRight="2sp"
+            android:paddingTop="2sp"
+            android:text=""
+            android:textColor="#2A4678" />
+        
+        <TextView
+            android:id="@+id/restaurant_more_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@id/restaurant_data_direction"
+            android:paddingBottom="2sp"
+            android:paddingLeft="2sp"
+            android:paddingRight="2sp"
+            android:paddingTop="2sp"
+            android:text="@string/restaurant_data_view_more_info"
+            android:textColor="#2A4678"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            android:clickable="true" />
+ 
+    
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/restaurants.xml b/res/layout/restaurants.xml
index 815842d..16b8c69 100644
--- a/res/layout/restaurants.xml
+++ b/res/layout/restaurants.xml
@@ -61,7 +61,8 @@
 		        android:layout_marginLeft="40dip"
 		        android:layout_marginRight="40dip"
 		        android:clickable="true"
-		        android:onClick="findInLocation">
+		        android:onClick="findInLocation"
+		        >
 				<TextView android:background="@android:drawable/ic_menu_mylocation"
 		            android:layout_width="wrap_content"
 		            android:layout_height="wrap_content"
@@ -103,7 +104,7 @@
 		    android:background="@drawable/login_text_border"
 		    android:layout_margin="6dip"/ -->
 
-		 <LinearLayout 
+		 <LinearLayout android:id="@+id/restaurant_search_direction_click_layout"
 		    android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/restaurants_search_direction_text"
diff --git a/res/layout/restaurants_list.xml b/res/layout/restaurants_list.xml
index 2ce08b1..03a706c 100644
--- a/res/layout/restaurants_list.xml
+++ b/res/layout/restaurants_list.xml
@@ -43,5 +43,22 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/restaurants_search_minimized_layout">
     </ListView>
+    
+    <TextView android:id="@+id/restaurants_list_maps_textView"
+       android:layout_width="match_parent"
+       android:layout_height="wrap_content"
+       android:layout_alignParentBottom="true"
+       android:text="@string/restaurants_list_layout_click_map_view"
+       android:textSize="20sp"
+       android:paddingTop="5sp"
+       android:paddingBottom="5sp"
+       android:gravity="center"
+       android:textColor="#2A4678"
+       android:textStyle="bold" 
+       android:background="@android:color/white"
+       android:alpha="0.7"
+       android:clickable="true"
+       android:onClick="changeToMapsView"
+       />   
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/restaurants_maps_layout.xml b/res/layout/restaurants_maps_layout.xml
index ae55834..6883ed2 100644
--- a/res/layout/restaurants_maps_layout.xml
+++ b/res/layout/restaurants_maps_layout.xml
@@ -1,8 +1,11 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
+    android:layout_height="match_parent" 
+    android:background="@android:color/white">
+	
+   
+    
    <com.google.android.maps.MapView 
         android:id="@+id/mapView"
         android:layout_width="fill_parent"
@@ -11,5 +14,20 @@
         android:clickable="true"
         android:apiKey="0KsFBXYtS_dmjBaMvvVbzcz-Rqvwp5ThdOdguUQ"
         />
-
+   
+    <TextView android:id="@+id/restaurants_maps_change_list_textView"
+       android:layout_width="match_parent"
+       android:layout_height="wrap_content"
+       android:text="@string/restaurants_maps_layout_clik_list_view"
+       android:textSize="20sp"
+       android:paddingTop="5sp"
+       android:paddingBottom="5sp"
+       android:gravity="center"
+       android:textColor="#2A4678"
+       android:textStyle="bold" 
+       android:background="@android:color/white"
+       android:alpha="0.7"
+       android:clickable="true"
+       android:onClick="changeToListView"
+       />    
 </RelativeLayout>
diff --git a/res/menu/activity_trcard_manager_restaurant_maps.xml b/res/menu/activity_trcard_manager_restaurant_maps.xml
deleted file mode 100644
index cfc10fd..0000000
--- a/res/menu/activity_trcard_manager_restaurant_maps.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_settings"
-        android:title="@string/menu_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never" />
-</menu>
diff --git a/res/values-es/resources.xml b/res/values-es/resources.xml
index 99a6051..0d1efd1 100644
--- a/res/values-es/resources.xml
+++ b/res/values-es/resources.xml
@@ -2,5 +2,5 @@
 <resources>
     <string name="unidId">a14fe7418ac35e6</string>
     <!-- string name="dev_device">393568DA65D500EC</string -->
-    <string name="dev_device">353918050624655</string>
+    <string name="dev_device">003bb6b6e00c957f</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3b09717..e503754 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -129,6 +129,7 @@
       <string name="restaurants_search_direction">Calle, CP, Ciudad,&#8230;</string>
       <string name="restaurants_search_restaurant">Nombre de Restaurante</string>
       <string name="restaurants_search_text_button">Buscar</string>
+      <string name="restaurants_search_text_empty">Debes introducir una dirección</string>
       <string name="restaurants_no_gps_title">GPS</string>
       <string name="restaurants_no_gps_message">El GPS parece estar deshabilitado, ¿deseas habilitarlo?</string>
       <string name="restaurants_no_gps_yes">Si</string>
@@ -149,9 +150,17 @@
       <string name="restaurant_data_no_restaurants">No se han encontrado restaurantes</string>
       <string name="restaurant_data_info">i</string>
       <string name="restaurant_data_waze_text">¿Quieres que te lleve con <b>Waze</b>?</string>
+      <string name="restaurant_data_maps_text">Quieres llegar con <b>Google Maps</b>?</string>
+      <string name="restaurant_data_view_more_info">Ver más información</string>
 
       
       <!-- more restaurant layout -->
       <string name="more_restaurant_text">Ver más restaurantes</string>
       
+      <!-- restaurant list view -->
+    <string name="restaurants_list_layout_click_map_view">Toca para ver en Mapa</string>
+    
+      <!-- restaurant maps view -->
+    <string name="restaurants_maps_layout_clik_list_view">Toca para ver en modo lista</string>
+    
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0c1a69f..9cf9e3f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -125,6 +125,7 @@
     <string name="restaurants_search_direction">Street,CP,City,&#8230;</string>
     <string name="restaurants_search_restaurant">Restaurant Name</string>
     <string name="restaurants_search_text_button">Search</string>
+    <string name="restaurants_search_text_empty">You must type a direction</string>
     <string name="restaurants_no_gps_title">GPS</string>
     <string name="restaurants_no_gps_message">Your GPS seems to be disabled, do you want to enable it?</string>
     <string name="restaurants_no_gps_yes">Yes</string>
@@ -145,11 +146,16 @@
     <string name="restaurant_data_no_restaurants">No restaurants found</string>
     <string name="restaurant_data_info">i</string>
     <string name="restaurant_data_waze_text">Do you want go with <b>Waze</b>?</string>
+    <string name="restaurant_data_maps_text">Do you want go with <b>Google Maps</b>?</string>
+    <string name="restaurant_data_view_more_info">View More Info</string>
 
     <!-- more restaurant layout -->
     <string name="more_restaurant_text">Show more restaurants</string>
-    <string name="hello_world">Hello world!</string>
-    <string name="menu_settings">Settings</string>
-    <string name="title_activity_trcard_manager_restaurant_maps">TRCardManagerRestaurantMaps</string>
+    
+    <!-- restaurant list view -->
+    <string name="restaurants_list_layout_click_map_view">Touch to view in map</string>
+    
+    <!-- maps view -->
+    <string name="restaurants_maps_layout_clik_list_view">Touch to view in list mode</string>
 
 </resources>
\ No newline at end of file
diff --git a/src/com/trcardmanager/about/TRCardManagerAboutActivity.java b/src/com/trcardmanager/about/TRCardManagerAboutActivity.java
index 0383da5..c964e07 100644
--- a/src/com/trcardmanager/about/TRCardManagerAboutActivity.java
+++ b/src/com/trcardmanager/about/TRCardManagerAboutActivity.java
@@ -5,15 +5,18 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.trcardmanager.R;
 import com.trcardmanager.application.TRCardManagerApplication;
+import com.trcardmanager.listener.TouchElementsListener;
 
 /**
  * 
@@ -34,6 +37,8 @@ protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.about_layout);
 		loadAppVersion();
 		TRCardManagerApplication.setActualActivity(this);
+		Button b = (Button)findViewById(R.id.about_button_opinon);
+		b.setOnTouchListener(new TouchElementsListener<Button>(Color.BLUE));
 	}
 	
 	
diff --git a/src/com/trcardmanager/action/RestaurantInfoAction.java b/src/com/trcardmanager/action/RestaurantInfoAction.java
index 1fa9fe8..122871e 100644
--- a/src/com/trcardmanager/action/RestaurantInfoAction.java
+++ b/src/com/trcardmanager/action/RestaurantInfoAction.java
@@ -5,9 +5,8 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnCancelListener;
-import android.content.DialogInterface.OnDismissListener;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -26,6 +25,7 @@
 import com.trcardmanager.application.TRCardManagerApplication;
 import com.trcardmanager.dao.RestaurantDao;
 import com.trcardmanager.http.TRCardManagerHttpAction;
+import com.trcardmanager.listener.TouchElementsListener;
 
 /**
  * 
@@ -46,7 +46,7 @@ public class RestaurantInfoAction extends AsyncTask<Void, Void, Void> {
     private LayoutInflater inflater;
     private AlertDialog dialog = null; 
     private boolean error = Boolean.FALSE;
-    boolean showInfo = Boolean.TRUE;
+    private ProgressDialog progressDialog;
     
 	public RestaurantInfoAction(RestaurantDao restaurant, int position){
 		this.restaurant = restaurant;
@@ -59,30 +59,20 @@ public RestaurantInfoAction(RestaurantDao restaurant, int position){
 	
 	@Override
 	protected void onPreExecute() {
-			if(dialog!=null && dialog.isShowing()){
-				dialog.hide();
-			}
-			dialog = new AlertDialog.Builder(activity).create();
-			dialog.setInverseBackgroundForced(true);
-			dialog.setMessage("Loading....");
-	        dialog.show();
-			dialog.setOnCancelListener(new OnCancelListener() {
-				public void onCancel(DialogInterface dialog) {
-					cancelShowDialog();
-				}
-			});
-			dialog.setOnDismissListener(new OnDismissListener() {
-				public void onDismiss(DialogInterface dialog) {
-					cancelShowDialog();
-				}
-			});
+		if(!restaurant.isCompleteDataLoaded()){
+			progressDialog = ProgressDialog.show(activity, restaurant.getRetaurantName(),
+					"Recuperando información");
+			progressDialog.setInverseBackgroundForced(true);
+		}
 	}
 	
 	@Override
 	protected Void doInBackground(Void... params) {
 		TRCardManagerHttpAction httpAction = new TRCardManagerHttpAction();
         try {
-			httpAction.completeResaturantInfo(restaurant);
+        	if(!restaurant.isCompleteDataLoaded()){
+        		httpAction.completeResaturantInfo(restaurant);
+        	}
         } catch (IOException e) {
         	error = Boolean.TRUE;
 			Log.e(TAG, "Error loading restaurant info",e);
@@ -93,24 +83,25 @@ protected Void doInBackground(Void... params) {
 	
 	@Override
 	protected void onPostExecute(Void result) {
-		
-		if(!error && showInfo){
-			dialog.hide();
+		if(progressDialog!=null){
+			progressDialog.cancel();
+		}
+		if(!error){
 			dialog = new AlertDialog.Builder(activity).create();
 			dialog.setInverseBackgroundForced(true);
 	        View view = createAndFillDataMovementLayout(restaurant,position);
-			dialog.setView(view);
+	        dialog.setView(view);
 			dialog.show();
+			dialog.setOnDismissListener(new DialogInterface.OnDismissListener(){ 				
+				public void onDismiss(DialogInterface dialog) {
+					dialog.cancel();
+				}			
+			});
 		}else if(error){
 			Toast.makeText(activity, "Error", Toast.LENGTH_LONG).show();
 		}
 	}
-	
-	private void cancelShowDialog(){
-		dialog.hide();
-		showInfo = Boolean.FALSE;
-		cancel(true);
-	}
+
 	
 	 private RelativeLayout createAndFillDataMovementLayout(RestaurantDao restaurant, int position){
 			RelativeLayout relativeMovementLayout = (RelativeLayout)inflater.inflate(
@@ -124,20 +115,28 @@ private RelativeLayout createAndFillDataMovementLayout(RestaurantDao restaurant,
 			((TextView)relativeMovementInfoLayout.findViewById(R.id.restaurant_data_type)).setText(foodType);
 			((TextView)relativeMovementInfoLayout.findViewById(R.id.restaurant_data_phone)).setText(restaurant.getPhoneNumber());
 			
-			relativeMovementLayout.setId(position);
-			if(wazeInstalled){
-				RelativeLayout buttonsLayout = (RelativeLayout)relativeMovementLayout.findViewById(R.id.restaurant_data_apps_layout);
+			RelativeLayout buttonsLayout = (RelativeLayout)relativeMovementLayout.findViewById(R.id.restaurant_data_apps_layout);
+			buttonsLayout.setId(position);
+			
+			if(wazeInstalled){	
 				ImageButton wazeButton = (ImageButton)buttonsLayout.findViewById(R.id.restaurant_data_waze_image);
 				wazeButton.setVisibility(View.VISIBLE);
+				wazeButton.setOnTouchListener(new TouchElementsListener<ImageButton>());
 			}
 			
 			TextView restaurantDataClose = (TextView)relativeMovementInfoLayout.findViewById(R.id.restaurant_data_close);
 			restaurantDataClose.setOnClickListener(new OnClickListener() {
 				public void onClick(View v) {
 					dialog.hide();
+					dialog.cancel();
 				}
 			});
 			
+			ImageButton iButtonMaps = (ImageButton)buttonsLayout.findViewById(R.id.restaurant_data_maps);
+	        iButtonMaps.setOnTouchListener(new TouchElementsListener<ImageButton>());
+	        
+	        restaurant.setCompleteDataLoaded(Boolean.TRUE);
+	        
 			return relativeMovementLayout;
 		}
 	    
diff --git a/src/com/trcardmanager/action/SearchRestaurantsAction.java b/src/com/trcardmanager/action/SearchRestaurantsAction.java
index f947471..940c3c0 100644
--- a/src/com/trcardmanager/action/SearchRestaurantsAction.java
+++ b/src/com/trcardmanager/action/SearchRestaurantsAction.java
@@ -8,15 +8,16 @@
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.util.Log;
+import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.maps.GeoPoint;
 import com.google.android.maps.MapView;
 import com.google.android.maps.Overlay;
-import com.google.android.maps.OverlayItem;
 import com.trcardmanager.R;
 import com.trcardmanager.adapter.RestaurantListViewAdapter;
 import com.trcardmanager.application.TRCardManagerApplication;
@@ -24,6 +25,7 @@
 import com.trcardmanager.dao.LocationDao;
 import com.trcardmanager.dao.RestaurantDao;
 import com.trcardmanager.dao.RestaurantSearchDao;
+import com.trcardmanager.dao.RestaurantSearchDao.SearchViewType;
 import com.trcardmanager.http.TRCardManagerHttpAction;
 import com.trcardmanager.location.TRCardManagerLocationAction;
 import com.trcardmanager.restaurant.RestaurantItemOverlay;
@@ -69,22 +71,35 @@ public SearchRestaurantsAction() {
 	public SearchRestaurantsAction(RestaurantSearchDao restaurantSearchDao,TRCardManagerLocationAction locationAction,
 			SearchType searchMode,ArrayAdapter<RestaurantDao> adapter) {
 		this();
-		this.restaurantSearchDao = restaurantSearchDao;
+		prepareRestaurantSearch(restaurantSearchDao);
 		this.locationAction = locationAction;
 		this.searchMode = searchMode;
 		this.adapter = adapter;
 	}
 	
+	private void prepareRestaurantSearch(RestaurantSearchDao restaurantSearchDao){
+		RestaurantSearchDao appRestaurantSearch = TRCardManagerApplication.getRestaurantSearchDao();
+		if(appRestaurantSearch != null && appRestaurantSearch.isSearchDone() ){
+			this.restaurantSearchDao = appRestaurantSearch;
+		}else{
+			this.restaurantSearchDao = restaurantSearchDao;
+		}
+	}
+	
 	@Override
 	protected void onPreExecute() {
-//		if(searchMode == SearchType.LOCATION_SEARCH){
-//			RelativeLayout searchedLayout = (RelativeLayout)activity.findViewById(R.id.restaurants_search_minimized_layout);
-//			searchedLayout.setVisibility(View.GONE);
-//		}
+		if(restaurantSearchDao.getSearchViewType() == SearchViewType.LIST_VIEW){
+			if(searchMode == SearchType.LOCATION_SEARCH){
+				RelativeLayout searchedLayout = (RelativeLayout)activity.findViewById(R.id.restaurants_search_minimized_layout);
+				searchedLayout.setVisibility(View.GONE);
+			}
+		}
 		
-		String message = loadStartLoadMessage();
-		loadingDialog = ProgressDialog.show(activity, activity.getText(R.string.restaurants_dialog_search_title), 
-				message);
+		if(!restaurantSearchDao.isSearchDone()){	
+			String message = loadStartLoadMessage();
+			loadingDialog = ProgressDialog.show(activity, activity.getText(R.string.restaurants_dialog_search_title), 
+					message);
+		}
 	}
 
 
@@ -95,8 +110,10 @@ protected void onProgressUpdate(Integer... progress) {
 		String message;
 		switch(progress[0]){
 			case CANCEL_PROCESS:
-				loadingDialog.cancel();
-				loadingDialog.dismiss();
+				if(loadingDialog!=null){
+					loadingDialog.cancel();
+					loadingDialog.dismiss();
+				}
 				break;
 			case SEARCH_RESTAURANTS:
 				if(searchMode == SearchType.DIRECTION_SEARCH){
@@ -121,8 +138,10 @@ protected void onProgressUpdate(Integer... progress) {
 	@Override
 	protected Void doInBackground(Void... arg0) {
 		try {
-			searchLocation();
-			searchRestaurantList();
+			if(!restaurantSearchDao.isSearchDone()){
+				searchLocation();
+				searchRestaurantList();
+			}
 		} catch (IOException e) {
 			Log.e(TAG, e.getMessage(),e);
 			error = Boolean.TRUE;
@@ -133,64 +152,62 @@ protected Void doInBackground(Void... arg0) {
 		return null;
 	}
 
-//	
-//	@Override
-//	protected void onPostExecute(Void result) {
-//		publishProgress(CANCEL_PROCESS);
-//		if(!error){
-//			showDirectionOfSearch();
-//			cleanRestaurantsView();
-//			createAdapterAndSetAndListView();
-//		}else{
-//			if(restaurantSearchDao.getRestaurantList() == null || restaurantSearchDao.getRestaurantList().isEmpty()){
-//				((TRCardManagerRestaurantsListActivity)activity).onBackPressed();
-//			}
-//			((TRCardManagerRestaurantsListActivity)activity).showErrorRestaurantLoading();
-//		}
-//	}
-
-
 	
 	@Override
 	protected void onPostExecute(Void result) {
 		publishProgress(CANCEL_PROCESS);
 		if(!error){
-			MapView mapView = (MapView) activity.findViewById(R.id.mapView);
-			
-			LocationDao myLocation = restaurantSearchDao.getDirectionDao().getLocation();
-			GeoPoint point = new GeoPoint((int)(myLocation.getLatitude() * 1E6), (int)(myLocation.getLongitude() * 1E6));
-	        //this will show you the map at the exact location you want (if you not set this you will see the map somewhere in America)
-	         mapView.getController().setCenter(point);
-	         
-	         List<RestaurantDao> restaurants = restaurantSearchDao.getRestaurantList();
-	         List<Overlay> mapOverlays = mapView.getOverlays();
-	         Drawable drawable = activity.getResources().getDrawable(R.drawable.map_marker);//ic_notification_overlay.9
-	         for(RestaurantDao r : restaurants){
-	              
-	             RestaurantItemOverlay itemizedoverlay = new RestaurantItemOverlay(drawable, activity);
-	      
-	             GeoPoint restaurantPoint = new GeoPoint(
-	            		 (int)(r.getLocation().getLatitude()*1E6),
-	            		 (int)(r.getLocation().getLongitude()*1E6));
-	             RestaurantOverlayItemDao overlayitem = new RestaurantOverlayItemDao(restaurantPoint, r.getRetaurantName(),
-	            		 r.getStreet()+", "+r.getLocality()+", "+r.getArea(), r);
-	             itemizedoverlay.addOverlay(overlayitem);
-	             mapOverlays.add(itemizedoverlay);
-	         }
-	         
-	         
+			 if(restaurantSearchDao.getSearchViewType() == SearchViewType.MAP_VIEW){
+				 printMapView();
+			 }else{
+				 showDirectionOfSearch();
+					cleanRestaurantsView();
+					createAdapterAndSetAndListView();
+			 }
+	         TRCardManagerApplication.setRestaurantSearchDao(restaurantSearchDao);
 		}else{
 			if(restaurantSearchDao.getRestaurantList() == null || restaurantSearchDao.getRestaurantList().isEmpty()){
-				//TODO change to mapactivity
-				//((TRCardManagerRestaurantsListActivity)activity).onBackPressed();
-				((TRCardManagerRestaurantMapsActivity)activity).onBackPressed();
+				if(restaurantSearchDao.getSearchViewType() == SearchViewType.MAP_VIEW){
+					((TRCardManagerRestaurantMapsActivity)activity).onBackPressed();
+				}else{
+					((TRCardManagerRestaurantsListActivity)activity).onBackPressed();
+				}
 			}
-			//((TRCardManagerRestaurantsListActivity)activity).showErrorRestaurantLoading();
 			Toast.makeText(activity, R.string.restaurants_search_error, Toast.LENGTH_LONG).show();
 		}
 	}
 
 	
+	private void printMapView(){
+		MapView mapView = (MapView) activity.findViewById(R.id.mapView);
+
+		LocationDao myLocation = restaurantSearchDao.getDirectionDao().getLocation();
+		GeoPoint point = new GeoPoint((int)(myLocation.getLatitude() * 1E6), (int)(myLocation.getLongitude() * 1E6));
+        //this will show you the map at the exact location you want (if you not set this you will see the map somewhere in America)
+         mapView.getController().setCenter(point);
+         
+         //sets the zoom to see the location closer
+         mapView.getController().setZoom(18);
+         //this will let you to zoom in or out using the controllers
+         mapView.setBuiltInZoomControls(true);
+         
+         List<RestaurantDao> restaurants = restaurantSearchDao.getRestaurantList();
+         List<Overlay> mapOverlays = mapView.getOverlays();
+         Drawable drawable = activity.getResources().getDrawable(R.drawable.map_marker);
+         for(RestaurantDao r : restaurants){
+              
+             RestaurantItemOverlay itemizedoverlay = new RestaurantItemOverlay(drawable, activity);
+      
+             GeoPoint restaurantPoint = new GeoPoint(
+            		 (int)(r.getLocation().getLatitude()*1E6),
+            		 (int)(r.getLocation().getLongitude()*1E6));
+             RestaurantOverlayItemDao overlayitem = new RestaurantOverlayItemDao(restaurantPoint, r.getRetaurantName(),
+            		 r.getStreet()+", "+r.getLocality()+", "+r.getArea(), r);
+             itemizedoverlay.addOverlay(overlayitem);
+             mapOverlays.add(itemizedoverlay);
+         }
+	}
+	
 	private void cleanRestaurantsView() {
 		restaurantsListView = (ListView)activity.findViewById(R.id.restaurants_list_view);
 		restaurantsListView.removeAllViewsInLayout();
@@ -239,6 +256,7 @@ private void searchLocation() throws IOException{
 	private void searchRestaurantList() throws IOException {
 		TRCardManagerHttpAction httpAction = new TRCardManagerHttpAction();
 		List<RestaurantDao> restaurants = httpAction.getRestaurants(restaurantSearchDao);
+		//TODO remove?
 		addFoundRestaurantsToList(restaurants);
 	}
 
@@ -260,8 +278,7 @@ private void addFoundRestaurantsToList(List<RestaurantDao> restaurants){
 	
 	private void createAdapterAndSetAndListView() {
 		if(adapter == null){
-			adapter = new RestaurantListViewAdapter(activity,
-				R.id.restaurants_list_view, restaurantSearchDao);
+			adapter = new RestaurantListViewAdapter(activity,R.id.restaurants_list_view, restaurantSearchDao);
 			restaurantsListView.setAdapter(adapter);
 			restaurantsListView.refreshDrawableState();
 		}else{
diff --git a/src/com/trcardmanager/adapter/RestaurantListViewAdapter.java b/src/com/trcardmanager/adapter/RestaurantListViewAdapter.java
index 8f9993f..210ff98 100644
--- a/src/com/trcardmanager/adapter/RestaurantListViewAdapter.java
+++ b/src/com/trcardmanager/adapter/RestaurantListViewAdapter.java
@@ -12,15 +12,16 @@
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.trcardmanager.R;
+import com.trcardmanager.action.RestaurantInfoAction;
 import com.trcardmanager.dao.RestaurantDao;
 import com.trcardmanager.dao.RestaurantSearchDao;
 
@@ -106,40 +107,21 @@ private View getRestaurantView(int position, RestaurantDao restaurant){
 	}
 	
 	
-	private RelativeLayout createAndFillDataMovementLayout(RestaurantDao restaurant, int position){
+	private RelativeLayout createAndFillDataMovementLayout(final RestaurantDao restaurant, final int position){
 		RelativeLayout relativeMovementLayout = (RelativeLayout)inflater.inflate(
-				R.layout.restaurant_data, null,false);
+				R.layout.restaurant_data_list_view, null,false);
 		
-		RelativeLayout relativeMovementInfoLayout = (RelativeLayout)relativeMovementLayout.findViewById(R.id.restaurant_data_info_layout);  
-		
-		((TextView)relativeMovementInfoLayout.findViewById(R.id.restaurant_data_name)).setText(restaurant.getRetaurantName());
-		((TextView)relativeMovementInfoLayout.findViewById(R.id.restaurant_data_direction)).setText(restaurant.getRestaurantDisplayDirection());
-		String foodType = getFoodType(restaurant);
-		((TextView)relativeMovementInfoLayout.findViewById(R.id.restaurant_data_type)).setText(foodType);
-		
-		relativeMovementLayout.setId(position);
-//		if(wazeInstalled){
-//			RelativeLayout wazeLayout = (RelativeLayout)relativeMovementLayout.findViewById(R.id.restaurant_data_waze_layout);
-//			wazeLayout.setVisibility(View.VISIBLE);
-//		}
+		((TextView)relativeMovementLayout.findViewById(R.id.restaurant_data_name)).setText(restaurant.getRetaurantName());
+		((TextView)relativeMovementLayout.findViewById(R.id.restaurant_data_direction)).setText(restaurant.getRestaurantDisplayDirection());
 		
+		((TextView)relativeMovementLayout.findViewById(R.id.restaurant_more_info))
+				.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				new RestaurantInfoAction(restaurant,position).execute();
+			}
+		});
 		return relativeMovementLayout;
 	}
-
-	private String getFoodType(RestaurantDao restaurant) {
-		String foodTypeTitle = getContext().getResources().getText(R.string.restaurant_data_text_type).toString();
-		String foodType = restaurant.getFoodType();
-		if(foodTypeWithoutTitleWithValue(foodTypeTitle, foodType) ){
-				foodType = foodTypeTitle+" "+foodType;
-		}
-		return foodType;
-	}
-
-	private boolean foodTypeWithoutTitleWithValue(String foodTypeTitle, String foodType) {
-		return foodType != null && !"".equals(foodType) && 
-				(!foodType.toLowerCase().contains(foodTypeTitle.toLowerCase()));
-	}
-	
 	
 	private ListView.LayoutParams getDefaultLinearLayoutParams(){
 		return new ListView.LayoutParams(LinearLayout.LayoutParams.FILL_PARENT, 
diff --git a/src/com/trcardmanager/application/TRCardManagerApplication.java b/src/com/trcardmanager/application/TRCardManagerApplication.java
index 4bab571..7eb15d4 100644
--- a/src/com/trcardmanager/application/TRCardManagerApplication.java
+++ b/src/com/trcardmanager/application/TRCardManagerApplication.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.app.Application;
 
+import com.trcardmanager.dao.RestaurantSearchDao;
 import com.trcardmanager.dao.UserDao;
 
 /**
@@ -21,11 +22,15 @@ public class TRCardManagerApplication extends Application {
 	public static int SESSION_CLOSED = 108;
 	public static int GPS_ACTIVATED = 109;
 	public static int SEARCH_RESTAURANTS_FINISHED = 110;
+	public static int SEARCH_RESTAURANTS_MAP_TO_LIST = 111;
+	public static int SEARCH_RESTAURANTS_MAP_TO_LIST_BACK_RESULT = -111;
+	public static int SEARCH_RESTAURANTS_LIST_TO_MAP = 112;
+	public static int SEARCH_RESTAURANTS_LIST_TO_MAP_BACK_RESULT = -112;
 	
 	private static UserDao user;
 	private static Activity actualActivity;
 	private static boolean loadingInfo = Boolean.FALSE;
-	
+	private static RestaurantSearchDao restaurantSearchDao;
 	
 	public static void setUser(UserDao user) {
 		TRCardManagerApplication.user = user;
@@ -48,4 +53,15 @@ public static boolean isLoadingInfo() {
 		return loadingInfo;
 	}
 	
+	public static void setRestaurantSearchDao(
+			RestaurantSearchDao restaurantSearchDao) {
+		TRCardManagerApplication.restaurantSearchDao = restaurantSearchDao;
+	}
+	public static RestaurantSearchDao getRestaurantSearchDao() {
+		if(restaurantSearchDao == null){
+			TRCardManagerApplication.restaurantSearchDao = new RestaurantSearchDao();
+		}
+		return restaurantSearchDao;
+	}
+	
 }
diff --git a/src/com/trcardmanager/dao/RestaurantDao.java b/src/com/trcardmanager/dao/RestaurantDao.java
index 54f3e4d..628cdfe 100644
--- a/src/com/trcardmanager/dao/RestaurantDao.java
+++ b/src/com/trcardmanager/dao/RestaurantDao.java
@@ -8,12 +8,14 @@
  *
  */
 public class RestaurantDao extends DirectionDao {
-
+	
 	private String phoneNumber = "";
 	private String foodType = "";
 	private String retaurantName = "";
 	private String restaurantLink = "";
 	
+	private boolean completeDataLoaded = Boolean.FALSE;
+	
 	public String getPhoneNumber() {
 		return phoneNumber;
 	}
@@ -40,6 +42,13 @@ public String getRestaurantLink() {
 		return restaurantLink;
 	}
 	
+	public void setCompleteDataLoaded(boolean completeDataLoaded) {
+		this.completeDataLoaded = completeDataLoaded;
+	}
+	public boolean isCompleteDataLoaded() {
+		return completeDataLoaded;
+	}
+	
 	public String getRestaurantDisplayDirection(){
 		String displayDirection = new StringBuffer()
 			.append(getStreet())
diff --git a/src/com/trcardmanager/dao/RestaurantSearchDao.java b/src/com/trcardmanager/dao/RestaurantSearchDao.java
index cc48c59..2a10c14 100644
--- a/src/com/trcardmanager/dao/RestaurantSearchDao.java
+++ b/src/com/trcardmanager/dao/RestaurantSearchDao.java
@@ -1,5 +1,6 @@
 package com.trcardmanager.dao;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -10,12 +11,20 @@
  */
 public class RestaurantSearchDao {
 	
+	public enum SearchViewType{
+		MAP_VIEW,
+		LIST_VIEW
+	}
+	
 	private DirectionDao directionDao;
 	private String addressSearch = "";
 	private String affiliate = "";
 	private List<RestaurantDao> restaurantList;
 	private int numberOfPages;
 	private int currentPage = 1;
+	private SearchViewType searchViewType = SearchViewType.MAP_VIEW;
+	private boolean searchDone = Boolean.FALSE;
+	
 	
 	public DirectionDao getDirectionDao() {
 		return directionDao;
@@ -42,6 +51,9 @@ public void setAffiliate(String affiliate) {
 	}
 	
 	public List<RestaurantDao> getRestaurantList() {
+		if(restaurantList==null){
+			restaurantList = new ArrayList<RestaurantDao>();
+		}
 		return restaurantList;
 	}
 	public void setRestaurantList(List<RestaurantDao> restaurantList) {
@@ -62,6 +74,20 @@ public void setCurrentPage(int currentPage) {
 		this.currentPage = currentPage;
 	}
 	
+	public void setSearchViewType(SearchViewType searchViewType) {
+		this.searchViewType = searchViewType;
+	}
+	public SearchViewType getSearchViewType() {
+		return searchViewType;
+	}
+	
+	public void setSearchDone(boolean searchDone) {
+		this.searchDone = searchDone;
+	}
+	public boolean isSearchDone() {
+		return searchDone;
+	}
+	
 	private String directionDaoToString(){
 		String addressSearch = "";
 		if(directionDao!=null){
diff --git a/src/com/trcardmanager/http/TRCardManagerHttpAction.java b/src/com/trcardmanager/http/TRCardManagerHttpAction.java
index be5eafc..b1cc8bb 100644
--- a/src/com/trcardmanager/http/TRCardManagerHttpAction.java
+++ b/src/com/trcardmanager/http/TRCardManagerHttpAction.java
@@ -10,7 +10,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -645,16 +644,16 @@ public List<RestaurantDao> getRestaurants(RestaurantSearchDao restaurantSeachDao
 					LocationDao location = new LocationDao(longitude, latitude);
 					restaurant.setLocation(location);
 					
-					StringTokenizer strk = new StringTokenizer(result.getString("description"),"\\<br/\\>");
+					StringTokenizer strk = new StringTokenizer(htmlDecoded(result.getString("description")),"\\<br/\\>");
 					try{
 						String name = strk.nextToken();
-						restaurant.setRetaurantName(htmlDecoded(name));
+						restaurant.setRetaurantName(name);
 						String street = strk.nextToken();
-						restaurant.setStreet(htmlDecoded(street));
+						restaurant.setStreet(street);
 						String city = strk.nextToken();
-						restaurant.setLocality(htmlDecoded(city));
+						restaurant.setLocality(city);
 						String area = strk.nextToken();
-						restaurant.setArea(htmlDecoded(area));
+						restaurant.setArea(area);
 						String tlf = strk.nextToken();
 						restaurant.setPhoneNumber(tlf);
 					}catch(Exception e){
@@ -674,6 +673,8 @@ public List<RestaurantDao> getRestaurants(RestaurantSearchDao restaurantSeachDao
 				
 			}
 			restaurantSeachDao.setCurrentPage(restaurantSeachDao.getCurrentPage()+1);
+			restaurantSeachDao.getRestaurantList().addAll(restaurants);
+			restaurantSeachDao.setSearchDone(Boolean.TRUE);
     	}while(doOneMoreTime);
     	return restaurants;
     }
diff --git a/src/com/trcardmanager/login/TRCardManagerLoginActivity.java b/src/com/trcardmanager/login/TRCardManagerLoginActivity.java
index 003078b..54be2ea 100644
--- a/src/com/trcardmanager/login/TRCardManagerLoginActivity.java
+++ b/src/com/trcardmanager/login/TRCardManagerLoginActivity.java
@@ -7,6 +7,7 @@
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -17,6 +18,7 @@
 import com.trcardmanager.application.TRCardManagerApplication;
 import com.trcardmanager.dao.UserDao;
 import com.trcardmanager.db.TRCardManagerDbHelper;
+import com.trcardmanager.listener.TouchElementsListener;
 
 /**
  * Activity to login
@@ -36,6 +38,10 @@ protected void onCreate(Bundle savedInstanceState) {
 		
 		setContentView(R.layout.login);    
 		TRCardManagerApplication.setActualActivity(this);
+		
+		Button loginButton = (Button)findViewById(R.id.btn_login_enter);
+		loginButton.setOnTouchListener(new TouchElementsListener<Button>());
+		
 		findRemeberedUser();
 		prepareLoginView();
 	}
diff --git a/src/com/trcardmanager/restaurant/RestaurantItemOverlay.java b/src/com/trcardmanager/restaurant/RestaurantItemOverlay.java
index 427074b..6216f31 100644
--- a/src/com/trcardmanager/restaurant/RestaurantItemOverlay.java
+++ b/src/com/trcardmanager/restaurant/RestaurantItemOverlay.java
@@ -4,7 +4,6 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.os.AsyncTask.Status;
 
 import com.google.android.maps.ItemizedOverlay;
 import com.google.android.maps.OverlayItem;
@@ -40,17 +39,13 @@ public int size() {
     }
  
     
-    private RestaurantInfoAction rInfoAction = null;
     @Override
     protected boolean onTap(int i) {
         //when you tap on the marker this will show the informations provided by you when you create in the 
         //main class the OverlayItem
     	RestaurantOverlayItemDao item = mOverlays.get(i);
         RestaurantDao restaurant = item.getRestaurantDao();
-        if(rInfoAction == null || rInfoAction.getStatus() == Status.FINISHED){
-        	rInfoAction = new RestaurantInfoAction(restaurant,i);
-        	rInfoAction.execute();
-        }
+        new RestaurantInfoAction(restaurant,i).execute();
         
         return true;
     }
diff --git a/src/com/trcardmanager/restaurant/TRCardManagerRestaurantMapsActivity.java b/src/com/trcardmanager/restaurant/TRCardManagerRestaurantMapsActivity.java
index 78d1061..f87e71e 100644
--- a/src/com/trcardmanager/restaurant/TRCardManagerRestaurantMapsActivity.java
+++ b/src/com/trcardmanager/restaurant/TRCardManagerRestaurantMapsActivity.java
@@ -1,19 +1,21 @@
 package com.trcardmanager.restaurant;
 
-import java.util.List;
-
+import android.content.Intent;
 import android.content.res.Configuration;
-import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
 
-import com.google.android.maps.GeoPoint;
 import com.google.android.maps.MapActivity;
-import com.google.android.maps.MapView;
 import com.trcardmanager.R;
 import com.trcardmanager.action.SearchRestaurantsAction;
 import com.trcardmanager.action.SearchRestaurantsAction.SearchType;
 import com.trcardmanager.application.TRCardManagerApplication;
+import com.trcardmanager.dao.LocationDao;
+import com.trcardmanager.dao.RestaurantDao;
 import com.trcardmanager.dao.RestaurantSearchDao;
+import com.trcardmanager.dao.RestaurantSearchDao.SearchViewType;
 import com.trcardmanager.location.TRCardManagerLocationAction;
 
 /**
@@ -22,8 +24,11 @@
  *
  */
 public class TRCardManagerRestaurantMapsActivity extends MapActivity {
-
-	private MapView mapView;
+	
+	private final static String URI_TO_OPEN_MAPS = "http://maps.google.com/maps?z=%d&q=%s";
+	private final static int ZOOM_LEVEL = 18; 
+	private static final String URL_WAZE_APP = "waze://?ll=%s,%s&navigate=yes";
+	
 	private RestaurantSearchDao restaurantSearchDao;
 	private SearchType searchType;
 	private TRCardManagerLocationAction locationAction;
@@ -31,33 +36,21 @@ public class TRCardManagerRestaurantMapsActivity extends MapActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setTitle(R.string.restaurants_title);
-        TRCardManagerApplication.setActualActivity(this);
-        setContentView(R.layout.activity_trcard_manager_restaurant_maps);
+        this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         
+        TRCardManagerApplication.setActualActivity(this);
+        setContentView(R.layout.restaurants_maps_layout);
         
-        if(restaurantSearchDao == null ){
-	        locationAction = new TRCardManagerLocationAction();
-	        restaurantSearchDao = new RestaurantSearchDao();
-	        
-	        getIntentParameters();
-	        
-	        mapView = (MapView) findViewById(R.id.mapView);
-	        
-	        //sets the zoom to see the location closer
-	        mapView.getController().setZoom(18);
-	 
-	        //this will let you to zoom in or out using the controllers
-	        mapView.setBuiltInZoomControls(true);
-
-	        launchSearchRestaurantAction();
-        }
-
+	    locationAction = new TRCardManagerLocationAction();
+	    restaurantSearchDao = new RestaurantSearchDao();
+	    
+	    getIntentParameters();
+	    
+	    launchSearchRestaurantAction();
     }
 
 	@Override
 	protected boolean isRouteDisplayed() {
-		// TODO Auto-generated method stub
 		return false;
 	}
     
@@ -67,6 +60,50 @@ public void onConfigurationChanged(Configuration newConfig) {
 		super.onConfigurationChanged(newConfig);
 	}
 	
+	
+	@Override
+	public void onBackPressed() {
+		setResult(TRCardManagerApplication.SEARCH_RESTAURANTS_MAP_TO_LIST_BACK_RESULT);
+		super.onBackPressed();
+	}
+	
+	/**
+	 * 
+	 * @param v
+	 */
+	public void openMap(View v){
+		int restaurantPosition = ((View)v.getParent()).getId();
+		RestaurantDao restaurantDao = restaurantSearchDao.getRestaurantList().get(restaurantPosition);
+		String uri = String.format(URI_TO_OPEN_MAPS,
+				ZOOM_LEVEL,restaurantDao.getRestaurantDisplayDirection());
+		startActivity(new Intent(android.content.Intent.ACTION_VIEW, Uri.parse(uri)));
+	}
+	
+	
+	/**
+	 * 
+	 * @param v
+	 */
+	public void openWaze(View v){
+		int restaurantPosition = ((View)v.getParent()).getId();
+		RestaurantDao restaurantDao = restaurantSearchDao.getRestaurantList().get(restaurantPosition);
+		LocationDao location = restaurantDao.getLocation();
+		
+		String urlwaze = String.format(URL_WAZE_APP,location.getLatitude(),location.getLongitude());
+		Intent intent = new Intent( Intent.ACTION_VIEW, Uri.parse( urlwaze ) );
+		startActivity(intent);
+	}
+	
+	/**
+	 * 
+	 * @param v
+	 */
+	public void changeToListView(View v){
+		TRCardManagerApplication.getRestaurantSearchDao().setSearchViewType(SearchViewType.LIST_VIEW);
+		setResult(TRCardManagerApplication.SEARCH_RESTAURANTS_MAP_TO_LIST);
+		finish();
+	}
+	
 	private void launchSearchRestaurantAction() {
 		new SearchRestaurantsAction(restaurantSearchDao,locationAction,searchType,null).execute();
 	}
@@ -76,6 +113,6 @@ private void getIntentParameters() {
         restaurantSearchDao.setAddressSearch(bundle.getString("directiontoSearch"));
         searchType = SearchType.valueOf(bundle.getString("searchType"));
 	}
-    
-    
+
+	
 }
diff --git a/src/com/trcardmanager/restaurant/TRCardManagerRestaurantsActivity.java b/src/com/trcardmanager/restaurant/TRCardManagerRestaurantsActivity.java
index 8ab7f22..51e1f22 100644
--- a/src/com/trcardmanager/restaurant/TRCardManagerRestaurantsActivity.java
+++ b/src/com/trcardmanager/restaurant/TRCardManagerRestaurantsActivity.java
@@ -15,10 +15,13 @@
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.Toast;
 
 import com.trcardmanager.R;
 import com.trcardmanager.action.SearchRestaurantsAction.SearchType;
 import com.trcardmanager.application.TRCardManagerApplication;
+import com.trcardmanager.dao.RestaurantSearchDao.SearchViewType;
+import com.trcardmanager.listener.TouchElementsListener;
 import com.trcardmanager.location.TRCardManagerLocationAction;
 
 /**
@@ -40,6 +43,15 @@ protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.restaurants);
 		setTitle(R.string.restaurants_title);
 		TRCardManagerApplication.setActualActivity(this);
+		
+		final LinearLayout lSearch = (LinearLayout)findViewById(R.id.restaurant_search_layout);
+		lSearch.setOnTouchListener(new TouchElementsListener<LinearLayout>());
+		
+		final LinearLayout lLocation = (LinearLayout)findViewById(R.id.restaurant_location_layout);
+		lLocation.setOnTouchListener(new TouchElementsListener<LinearLayout>());
+			
+		final LinearLayout lSearchText = (LinearLayout)findViewById(R.id.restaurant_search_direction_click_layout);
+		lSearchText.setOnTouchListener(new TouchElementsListener<LinearLayout>());
 	}
 	
 	@Override
@@ -53,6 +65,12 @@ protected void onResume() {
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		if (requestCode == TRCardManagerApplication.GPS_ACTIVATED){
 			findRestaurants();
+		}else if(requestCode == TRCardManagerApplication.SEARCH_RESTAURANTS_MAP_TO_LIST && 
+				resultCode != TRCardManagerApplication.SEARCH_RESTAURANTS_MAP_TO_LIST_BACK_RESULT){
+			findRestaurants();
+		}else if(requestCode == TRCardManagerApplication.SEARCH_RESTAURANTS_LIST_TO_MAP &&
+				resultCode != TRCardManagerApplication.SEARCH_RESTAURANTS_LIST_TO_MAP_BACK_RESULT){
+			findRestaurants();
 		}
 	}
 	
@@ -93,6 +111,7 @@ public void showSearch(View v){
 	 * @throws ExecutionException
 	 */
 	public void findInLocation(View v){
+		
 		searchType = SearchType.LOCATION_SEARCH;
 		checkGPSLocationAndStartSearch();
 	}
@@ -105,10 +124,15 @@ public void findInLocation(View v){
 	 */
 	public void search(View v){
 		directiontoSearch = ((EditText)findViewById(R.id.restaurants_search_direction_text)).getText().toString();
-		searchType = SearchType.DIRECTION_SEARCH;
-		findRestaurants();
-		InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
-		imm.hideSoftInputFromWindow(((EditText)findViewById(R.id.restaurants_search_direction_text)).getWindowToken(), 0);	
+		if(directiontoSearch.toString()==null || "".equals(directiontoSearch.toString())){
+			Toast.makeText(this, getText(R.string.restaurants_search_text_empty), Toast.LENGTH_LONG).show();
+		}else{
+			searchType = SearchType.DIRECTION_SEARCH;
+			TRCardManagerApplication.setRestaurantSearchDao(null);
+			findRestaurants();
+			InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+			imm.hideSoftInputFromWindow(((EditText)findViewById(R.id.restaurants_search_direction_text)).getWindowToken(), 0);
+		}
 	}
 
 
@@ -140,16 +164,32 @@ public void run() {
 		}
 	}
 
-
 	private void findRestaurants(){
+		if(TRCardManagerApplication.getRestaurantSearchDao().getSearchViewType() == 
+			SearchViewType.MAP_VIEW){
+			findRestaurantsInMap();
+		}else{
+			findRestarurantsInList();
+		}
+	}
+
+	
+	private void findRestarurantsInList(){
 		Intent restaturants = new Intent(this,TRCardManagerRestaurantsListActivity.class);
+				
+		restaturants.putExtra("directiontoSearch", directiontoSearch);
+		restaturants.putExtra("searchType", searchType.name());
 		
-		restaturants = new Intent(this,TRCardManagerRestaurantMapsActivity.class);
+		startActivityForResult(restaturants, TRCardManagerApplication.SEARCH_RESTAURANTS_LIST_TO_MAP);
+	}
+	
+	private void findRestaurantsInMap(){
+		Intent restaturants = new Intent(this,TRCardManagerRestaurantMapsActivity.class);
 		
 		restaturants.putExtra("directiontoSearch", directiontoSearch);
 		restaturants.putExtra("searchType", searchType.name());
 		
-		startActivity(restaturants);
+		startActivityForResult(restaturants,TRCardManagerApplication.SEARCH_RESTAURANTS_MAP_TO_LIST);
 	}
 	
 	
diff --git a/src/com/trcardmanager/restaurant/TRCardManagerRestaurantsListActivity.java b/src/com/trcardmanager/restaurant/TRCardManagerRestaurantsListActivity.java
index 8e1932e..8db0cf3 100644
--- a/src/com/trcardmanager/restaurant/TRCardManagerRestaurantsListActivity.java
+++ b/src/com/trcardmanager/restaurant/TRCardManagerRestaurantsListActivity.java
@@ -16,6 +16,7 @@
 import com.trcardmanager.dao.LocationDao;
 import com.trcardmanager.dao.RestaurantDao;
 import com.trcardmanager.dao.RestaurantSearchDao;
+import com.trcardmanager.dao.RestaurantSearchDao.SearchViewType;
 import com.trcardmanager.location.TRCardManagerLocationAction;
 
 /**
@@ -54,6 +55,12 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
 
+	@Override
+	public void onBackPressed() {
+		setResult(TRCardManagerApplication.SEARCH_RESTAURANTS_LIST_TO_MAP_BACK_RESULT);
+		super.onBackPressed();
+	}
+	
 	private void getIntentParameters() {
 		Bundle bundle = getIntent().getExtras();
         restaurantSearchDao.setAddressSearch(bundle.getString("directiontoSearch"));
@@ -61,6 +68,17 @@ private void getIntentParameters() {
 	}
 
     
+	/**
+	 * 
+	 * @param v
+	 */
+	public void changeToMapsView(View v){
+		TRCardManagerApplication.getRestaurantSearchDao().setSearchViewType(SearchViewType.MAP_VIEW);
+		setResult(TRCardManagerApplication.SEARCH_RESTAURANTS_LIST_TO_MAP);
+		finish();
+	}
+	
+	
     /**
 	 * 
 	 * @param v
diff --git a/src/com/trcardmanager/updatecard/TRCardManagerUpdateCardActivity.java b/src/com/trcardmanager/updatecard/TRCardManagerUpdateCardActivity.java
index a20327c..8073e79 100644
--- a/src/com/trcardmanager/updatecard/TRCardManagerUpdateCardActivity.java
+++ b/src/com/trcardmanager/updatecard/TRCardManagerUpdateCardActivity.java
@@ -11,6 +11,7 @@
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -20,6 +21,7 @@
 import com.trcardmanager.application.TRCardManagerApplication;
 import com.trcardmanager.dao.CardDao;
 import com.trcardmanager.dao.UserDao;
+import com.trcardmanager.listener.TouchElementsListener;
 
 /**
  * 
@@ -37,6 +39,8 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setTitle(R.string.update_card_title);
 		setContentView(R.layout.update_card_layout);
+		Button buttonUpdate = (Button)findViewById(R.id.update_card_btn_update);
+		buttonUpdate.setOnTouchListener(new TouchElementsListener<Button>());
 		userDao = TRCardManagerApplication.getUser();
 		fillOtherCardList();
 		TRCardManagerApplication.setActualActivity(this);
diff --git a/src/com/trcardmanager/updatepassword/TRCardManagerUpdatePasswordActivity.java b/src/com/trcardmanager/updatepassword/TRCardManagerUpdatePasswordActivity.java
index 6e7f6e3..4c2481f 100644
--- a/src/com/trcardmanager/updatepassword/TRCardManagerUpdatePasswordActivity.java
+++ b/src/com/trcardmanager/updatepassword/TRCardManagerUpdatePasswordActivity.java
@@ -6,12 +6,14 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
 import com.trcardmanager.R;
 import com.trcardmanager.action.UpdatePasswordAction;
 import com.trcardmanager.application.TRCardManagerApplication;
+import com.trcardmanager.listener.TouchElementsListener;
 
 /**
  * 
@@ -26,6 +28,8 @@ protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setTitle(R.string.update_password_title);
 		setContentView(R.layout.update_password_layout);
+		Button buttonUpdate = (Button)findViewById(R.id.update_password_btn_update);
+		buttonUpdate.setOnTouchListener(new TouchElementsListener<Button>());
 		TRCardManagerApplication.setActualActivity(this);
 	}
 	
diff --git a/src/com/trcardmanager/views/TRCardManagerListView.java b/src/com/trcardmanager/views/TRCardManagerListView.java
index 05b5cb4..40c74cb 100644
--- a/src/com/trcardmanager/views/TRCardManagerListView.java
+++ b/src/com/trcardmanager/views/TRCardManagerListView.java
@@ -11,7 +11,6 @@
 import android.widget.AbsListView;
 import android.widget.AbsListView.OnScrollListener;
 import android.widget.ImageView;
-import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.RelativeLayout;