diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index fbcfa07..b82f26e 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -16,20 +16,27 @@ module SearchHelper
   end
 
   def display_results
+
+    unless GoogleMaps.enabled?
+      return render(:partial => 'display_results')
+    end
+
     data =
       if params[:display] == 'map'
         {
           :partial => 'google_maps',
-          :toggle => link_to(_('Display in list'), params.merge(:display => 'list'))
+          :toggle => button(:search, _('Display in list'), params.merge(:display => 'list'), :class => "map-toggle-button" ),
+          :class => 'map' ,
         }
       else
         {
           :partial => 'display_results',
-          :toggle => link_to(_('Display in map'), params.merge(:display => 'map'))
+          :toggle => button(:search, _('Display in map'), params.merge(:display => 'map'), :class => "map-toggle-button" ),
+          :class => 'list' ,
         }
       end
 
-    data[:toggle] + (render :partial => data[:partial])
+    content_tag('div', data[:toggle] + (render :partial => data[:partial]), :class => "map-or-list-search-results #{data[:class]}")
   end
 
 end
diff --git a/app/models/google_maps.rb b/app/models/google_maps.rb
index 60e2a0a..e1f875b 100644
--- a/app/models/google_maps.rb
+++ b/app/models/google_maps.rb
@@ -4,25 +4,31 @@ class GoogleMaps
 
   class << self
 
+    def erase_config
+      @config = nil
+    end
+
     def config_file
       File.join(RAILS_ROOT, 'config', 'web2.0.yml')
     end
 
+    def config
+      if @config.nil?
+        if File.exists?(config_file)
+          yaml = YAML.load_file(config_file)
+          @config = yaml['googlemaps']
+        end
+      end
+
+      @config ||= {}
+    end
+
     def enabled?
-      File.exists?(config_file)
+      !config['key'].nil?
     end
 
     def key
-      if enabled?
-        config = YAML.load_file(config_file)
-        if config.has_key?(:googlemaps)
-          config[:googlemaps][:key]
-        else
-          nil
-        end
-      else
-        nil
-      end
+      config['key']
     end
 
     def api_url
diff --git a/app/views/search/_google_maps.rhtml b/app/views/search/_google_maps.rhtml
index 98d4708..776846b 100644
--- a/app/views/search/_google_maps.rhtml
+++ b/app/views/search/_google_maps.rhtml
@@ -1,8 +1,8 @@
 <%= content_tag('script', '', :src => GoogleMaps.api_url, :type => 'text/javascript') %>
 
 
-<div style='text-align: center; margin: 2em;'>
-  <div id="map" style="margin: auto; width: 100%; height: 500px"></div>
+<div style='text-align: center;'>
+  <div id="map"></div>
 </div>
 
 <script type='text/javascript'>
diff --git a/public/stylesheets/search.css b/public/stylesheets/search.css
index 0d44717..ed6f190 100644
--- a/public/stylesheets/search.css
+++ b/public/stylesheets/search.css
@@ -76,3 +76,11 @@
   margin-bottom: -20px;
 }
 
+.map-or-list-search-results {
+  margin-left: 2em;
+  margin-right: 2em;
+}
+
+#map {
+  height: 500px;
+}
diff --git a/test/unit/google_maps_test.rb b/test/unit/google_maps_test.rb
index 3c68dbf..f08424f 100644
--- a/test/unit/google_maps_test.rb
+++ b/test/unit/google_maps_test.rb
@@ -4,15 +4,31 @@ class GoogleMapsTest < Test::Unit::TestCase
 
   CONFIG_FILE = File.join(RAILS_ROOT, 'config', 'web2.0.yml')
 
+  def setup
+    # force loading of config at every test
+    GoogleMaps.erase_config
+  end
+
   should 'retrieve key from "web2.0" config file' do
-    YAML.expects(:load_file).with(CONFIG_FILE).returns({:googlemaps => { :key => 'MYKEY' }})
+    YAML.expects(:load_file).with(CONFIG_FILE).returns({'googlemaps' => { 'key' => 'MYKEY' }})
     assert_equal 'MYKEY', GoogleMaps.key
   end
 
+  should 'enable when key is defined' do
+    YAML.expects(:load_file).with(CONFIG_FILE).returns({'googlemaps' => { 'key' => 'MYKEY' }})
+    assert GoogleMaps.enabled?
+  end
+
   should 'disable if config file not present' do
     File.expects(:exists?).with(CONFIG_FILE).returns(false)
     assert !GoogleMaps.enabled?
   end
+
+  should 'disable if key not defined' do
+    File.expects(:exists?).with(CONFIG_FILE).returns(true)
+    YAML.expects(:load_file).with(CONFIG_FILE).returns({})
+    assert !GoogleMaps.enabled?
+  end
   
   should 'not crash if config not informed' do
     File.expects(:exists?).with(CONFIG_FILE).returns(true)
--
libgit2 0.21.2