diff --git a/modules/geolocation_googlemaps/geolocation_googlemaps.css b/modules/geolocation_googlemaps/geolocation_googlemaps.css
index cce0558..5cfd90e 100644
--- a/modules/geolocation_googlemaps/geolocation_googlemaps.css
+++ b/modules/geolocation_googlemaps/geolocation_googlemaps.css
@@ -6,6 +6,8 @@
 #map {
   border:1px solid #CCC;
   -moz-border-radius: 4px 4px 4px 4px;
+  width: 100%;
+  height: 400px;
 }
 
 #geocoder {
@@ -42,4 +44,4 @@
 
 #use-client-location:hover {
   text-decoration:underline;
-}
\ No newline at end of file
+}
diff --git a/modules/geolocation_googlemaps/geolocation_googlemaps.module b/modules/geolocation_googlemaps/geolocation_googlemaps.module
index 0b04fbe..8a1759e 100644
--- a/modules/geolocation_googlemaps/geolocation_googlemaps.module
+++ b/modules/geolocation_googlemaps/geolocation_googlemaps.module
@@ -130,7 +130,7 @@ function geolocation_googlemaps_field_formatter_view($entity_type, $entity, $fie
             'attributes' => array('class' => 'geolocation-googlemaps-static'),
             );
         $map_img = theme('image', $variables);
-        $element[$delta]['#markup'] = '<div>' . $map_img . '</div>';
+        $element[$delta]['#markup'] = '<div><a href="#" onclick="window.open(\'http://maps.google.com/maps?q=' . $item['lat'] . ',' . $item['lng'] . '&z=' . $settings['map_zoomlevel'] . '\');">' . $map_img . '</a></div>';
       }
       break;
 
@@ -195,7 +195,7 @@ function geolocation_googlemaps_field_widget_form(&$form, &$form_state, $field,
       $element['googlemap'] = array(
         '#type' => 'markup',
         '#markup' => '
-          <div id="map" style="width:100%;height:400px;"></div>
+          <div id="map"></div>
         ',
         /*
         // Hide debug output, cleanup later.