diff --git a/route_planner.admin.inc b/route_planner.admin.inc
index 05f7732..1262c8a 100644
--- a/route_planner.admin.inc
+++ b/route_planner.admin.inc
@@ -14,7 +14,7 @@
 function route_planner_settings_form() {
   $form['route_planner'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Route Planner Settings'),
+    '#title' => t('Route planner settings'),
   );
 
   $form['route_planner']['route_planner_address'] = array(
@@ -25,7 +25,7 @@ function route_planner_settings_form() {
   );
   $form['route_planner']['map'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Map Settings'),
+    '#title' => t('Map settings'),
   );
   $form['route_planner']['map']['route_planner_map_height'] = array(
     '#type' => 'textfield',
@@ -43,7 +43,7 @@ function route_planner_settings_form() {
   );
   $form['route_planner']['map']['route_planner_map_zoom'] = array(
     '#type' => 'textfield',
-    '#title' => t('Map Zoom'),
+    '#title' => t('Zoom level'),
     '#description' => t('A value between 1 and 100 (a normal value is around 10).'),
     '#size' => 10,
     '#default_value' => variable_get('route_planner_map_zoom', 10),
diff --git a/route_planner.install b/route_planner.install
index ec6a16a..5bba07e 100644
--- a/route_planner.install
+++ b/route_planner.install
@@ -8,7 +8,10 @@
  * Implements hook_enable().
  */
 function route_planner_enable() {
-  drupal_set_message(t('To use the Route Planner Module, go to the config page <a href="@url">administer route planner</a>.', array('@url' => url('admin/config/content/routeplanner'))));
+  drupal_set_message(t('To use the Route planner, !addurl and !configureurl the blocks', array(
+    '!addurl' => l(t('add'), 'admin/structure/block'),
+    '!configureurl' => l(t('configure'), 'admin/structure/block/manage/route_planner/route_target/configure'),
+  )));
 }
 
 /**
diff --git a/route_planner.module b/route_planner.module
index fbc85c1..50c82dd 100644
--- a/route_planner.module
+++ b/route_planner.module
@@ -1,7 +1,8 @@
 <?php
 /**
  * @file
- * The Route Planner module create blocks to show a route from any address to a fixed point.
+ * The Route Planner module create blocks to show a route from any address
+ * to a fixed point.
  */
 
 /**
@@ -13,8 +14,8 @@ function route_planner_menu() {
 
   // Module settings.
   $items['admin/config/content/routeplanner'] = array(
-    'title' => 'Route Planner Settings',
-    'description' => 'Route Planner Settings',
+    'title' => 'Route planner settings',
+    'description' => 'Route planner settings',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('route_planner_settings_form'),
     'access arguments' => array('access administration pages'),
@@ -43,6 +44,34 @@ function route_planner_block_info() {
 }
 
 /**
+ * Implements hook_block_configure().
+ */
+function route_planner_block_configure($delta = '') {
+  module_load_include('inc', 'route_planner', 'route_planner.admin');
+  switch ($delta) {
+    case 'route_target':
+    case 'map':
+      return route_planner_settings_form();
+      break;
+  }
+}
+
+/**
+ * Implements hook_block_save().
+ */
+function route_planner_block_save($delta = '', $edit = array()) {
+  switch ($delta) {
+    case 'route_target':
+    case 'map':
+      variable_set('route_planner_address', $edit['route_planner_address']);
+      variable_set('route_planner_map_height', $edit['route_planner_map_height']);
+      variable_set('route_planner_map_width', $edit['route_planner_map_width']);
+      variable_set('route_planner_map_zoom', intval($edit['route_planner_map_zoom']));
+      break;
+  }
+}
+
+/**
  * Implements hook_block_view().
  */
 function route_planner_block_view($delta) {
@@ -57,7 +86,7 @@ function route_planner_block_view($delta) {
   return $block;
 }
 /**
- * The form to enter the address
+ * The form to enter the address.
  */
 function route_planner_address_form($form, &$form_state) {
 
@@ -67,40 +96,38 @@ function route_planner_address_form($form, &$form_state) {
     '#default_value' => '',
     '#size' => 20,
   );
+
   $form['distance'] = array(
     '#type' => 'textfield',
     '#title' => t('Distance'),
     '#default_value' => '0.00',
     '#size' => 20,
-    '#attributes' => array('readonly' => 'readonly')
+    '#disabled' => TRUE,
   );
-  // Set distance readonly
-  $form['distance']['#disabled'] = TRUE;
 
   $form['time'] = array(
     '#type' => 'textfield',
     '#title' => t('Driving time'),
     '#default_value' => '0.00',
     '#size' => 20,
+    '#disabled' => TRUE,
   );
-  // Set time readonly
-  $form['time']['#disabled'] = TRUE;
 
   $form['button'] = array(
     '#type' => 'button',
-    '#value' => t('Calculate Route'),
+    '#value' => t('Calculate route'),
+    '#attributes' => array('onClick' => 'return Drupal.myRoutePlanner.calcRoute();'),
   );
-  $form['button']['#attributes'] = array('onClick' => 'return Drupal.myRoutePlanner.calcRoute();');
 
   return $form;
 }
 
 function route_planner_get_address_form() {
-  // Add google maps api
+  // Add google maps api.
   drupal_add_js('http://maps.googleapis.com/maps/api/js?sensor=false', 'external');
-  // Add some custom Java Script to display the map
+  // Add some custom javascript to display the map.
   drupal_add_js(drupal_get_path('module', 'route_planner') . '/route_planner.js');
-  // Set variables from Route Planner settings page
+  // Set variables from Route Planner settings page.
   drupal_add_js(array(
     'routePlanner' => array(
       'zoomlevel'  => variable_get('route_planner_map_zoom', 10),
@@ -108,16 +135,26 @@ function route_planner_get_address_form() {
     ),
   ), 'setting');
 
-  // Get the address form
+  // Get the address form.
   $output = drupal_get_form('route_planner_address_form');
-
   return $output;
 }
 
 function route_planner_map_display() {
+  // Add google maps api.
+  drupal_add_js('http://maps.googleapis.com/maps/api/js?sensor=false', 'external');
+  // Add some custom javascript to display the map.
+  drupal_add_js(drupal_get_path('module', 'route_planner') . '/route_planner.js');
+  // Set variables from Route Planner settings page.
+  drupal_add_js(array(
+    'routePlanner' => array(
+      'zoomlevel'  => variable_get('route_planner_map_zoom', 10),
+      'end'        => variable_get('route_planner_address', 'Hamburg, Germany'),
+    ),
+  ), 'setting');
 
+  // output the map.
   $output = '<div id="map_canvas" style="height:' . filter_xss(variable_get('route_planner_map_height', '300px')) . '; width:' . filter_xss(variable_get('route_planner_map_width', '100%')) . ';"></div>';
-
   return $output;
 }