diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 8ee415b..fbcfa07 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -16,13 +16,20 @@ module SearchHelper
   end
 
   def display_results
-    partial =
+    data =
       if params[:display] == 'map'
-        'google_maps'
+        {
+          :partial => 'google_maps',
+          :toggle => link_to(_('Display in list'), params.merge(:display => 'list'))
+        }
       else
-        'display_results'
+        {
+          :partial => 'display_results',
+          :toggle => link_to(_('Display in map'), params.merge(:display => 'map'))
+        }
       end
-    render :partial => partial
+
+    data[:toggle] + (render :partial => data[:partial])
   end
 
 end
diff --git a/app/views/search/_display_results.rhtml b/app/views/search/_display_results.rhtml
index c75dbd8..a9f8ea6 100644
--- a/app/views/search/_display_results.rhtml
+++ b/app/views/search/_display_results.rhtml
@@ -1,7 +1,3 @@
-<div style='float: left;'>
-  <%= link_to _('Display in map'), :display => 'map' %>
-</div>
-
 <div id="search-results" class="<%= 'only-one-result-box' if @results.size == 1 %>">
 
 <%
diff --git a/app/views/search/_google_maps.rhtml b/app/views/search/_google_maps.rhtml
index 5ed2686..438f9de 100644
--- a/app/views/search/_google_maps.rhtml
+++ b/app/views/search/_google_maps.rhtml
@@ -1,7 +1,3 @@
-<div style='float: left;'>
-  <%= link_to _('Display in list'), :display => 'list' %>
-</div>
-
 <%= content_tag('script', '', :src => GoogleMaps.api_url, :type => 'text/javascript') %>
 
 
@@ -10,14 +6,30 @@
 </div>
 
 <script type='text/javascript'>
-if (GBrowserIsCompatible()) {
-  var map = new GMap2(document.getElementById("map"));
-  map.setCenter(new GLatLng(-15.0, -50.1419), 4);
 
-  point = new GLatLng(-15, -40);
-  marker = new GMarker(point);
+function putMarker(lat, lng, title) {
+  var point = new GLatLng(lat, lng);
+  var options = { 'title' : title };
+  var marker = new GMarker(point, options);
   map.addOverlay(marker);
-  GEvent.addListener(marker, 'click', function() { marker.openInfoWindow("teste") });
+  GEvent.addListener(marker, 'click', function() {
+    map.openInfoWindowHtml(point, title);
+  });
+}
 
+if (GBrowserIsCompatible()) {
+  var map = new GMap2(document.getElementById("map"));
+  map.setCenter(new GLatLng(-15.0, -50.1419), 4);
+<%
+  @results.each do |name,results|
+    results.each do |item|
+      if item.lat && item.lng
+      %>
+  putMarker(<%= item.lat.to_json %>, <%= item.lng.to_json %>, <%= item.name.to_json %>);
+      <%
+      end
+    end
+  end
+%>
 }
 </script>
--
libgit2 0.21.2