diff --git a/locationmap.module b/locationmap.module
index 412764a..b9a3ea7 100644
--- a/locationmap.module
+++ b/locationmap.module
@@ -338,13 +338,32 @@ function locationmap_block_info() {
  */
 function locationmap_block_configure($delta) {
   $form = array();
-  $form['info']['locationmap_text_top'] = array(
+  switch ($delta) {
+    case 'image':
+      $form['info']['locationmap_text_top'] = array(
         '#type' => 'text_format',
         '#title' => t('Additional text to show above the image'),
         '#default_value' => variable_get('locationmap_block_text_top'),
         '#format' => isset($edit['format']) ? $edit['format'] : NULL,
-        '#parents' => array('info', 'format')
       );
+      $form['info']['locationmap_block_width'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Map Width'),
+        '#default_value' => variable_get('locationmap_block_width', '120'),
+        '#field_suffix' => 'px',
+        '#description' => NULL,
+        '#size' => 10,
+      );
+      $form['info']['locationmap_block_height'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Map Height'),
+        '#default_value' => variable_get('locationmap_block_height', '80'),
+        '#field_suffix' => 'px',
+        '#description' => NULL,
+        '#size' => 10,
+      );
+      break;
+  }
   return $form;
 }
 
@@ -352,7 +371,13 @@ function locationmap_block_configure($delta) {
  * Implements hook_block_save().
  */
 function locationmap_block_save($delta, $edit) {
-  variable_set('locationmap_block_text_top', $edit['locationmap_text_top']);
+  switch ($delta) {
+    case 'image':
+      variable_set('locationmap_block_height', (int)$edit['locationmap_block_height']);
+      variable_set('locationmap_block_width', (int)$edit['locationmap_block_width']);
+      variable_set('locationmap_block_text_top', $edit['locationmap_text_top']['value']);
+    break;
+  }
 }
 
 /**
@@ -362,9 +387,9 @@ function locationmap_block_view($delta) {
   switch ($delta) {
     case 'image':
       $texttop = variable_get('locationmap_block_text_top');
-      $texttop = ($texttop == TRUE) ? '<div id="locationmap-block-text-top">' . variable_get('locationmap_block_top_text') . '</div>' : '';
+      $blocktop = ($texttop) ? '<div id="locationmap-block-text-top">' . $texttop . '</div>' : '';
       $block = locationmap_block_image();
-      $block['content'] = $texttop . $block['content'];
+      $block['content'] = $blocktop . $block['content'];
       break;
   }
   return $block;
@@ -399,7 +424,7 @@ function locationmap_block_image() {
  * @ingroup themeable
  */
 function theme_locationmap_block_image_link() {
-  return(l('<img src="' . locationmap_static_image_url(160, 120) . '" alt="Location map" />', 'locationmap', array('html' => TRUE)));
+  return(l('<img src="' . locationmap_static_image_url(variable_get('locationmap_block_width', 120), variable_get('locationmap_block_height', 80)) . '" alt="Location map" />', 'locationmap', array('html' => TRUE)));
 }
 
 /**