diff --git a/fblikebutton.admin.inc b/fblikebutton.admin.inc
index 104a93f..812345c 100644
--- a/fblikebutton.admin.inc
+++ b/fblikebutton.admin.inc
@@ -7,71 +7,91 @@
  */
 
 /**
- * Settings for nodes.
+ * Settings for the dynamic FB button node or block.
  */
-function fblikebutton_admin_settings() {
+function fblikebutton_dynamic_settings() {
   $fblikebutton_node_options = node_type_get_names();
-  $form['fblikebutton_node_types'] = array(
+  $form['fblikebutton_dynamic_description'] = array(
+    '#markup' => '<p>'. t('Configure the dynamic Like button. This Like button will like the URL you\'r visiting. You can set the content types on which the button displays, choose to display it in the content block or it\'s own block and set the appearance.') . '</p>',
+  );
+  $form['fblikebutton_dynamic_visibility'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Visibility settings'),
+    '#collapsible' => false,
+  );
+  $form['fblikebutton_dynamic_visibility']['fblikebutton_node_types'] = array(
     '#type' => 'checkboxes',
     '#title' => t('Display the Like button on these content types:'),
     '#options' => $fblikebutton_node_options,
     '#default_value' => variable_get('fblikebutton_node_types', array('article')),
     '#description' => t('Each of these content types will have the "like" button automatically added to them.'),
   );
-  $form['fblikebutton_showonteasers'] = array(
+  $form['fblikebutton_dynamic_visibility']['fblikebutton_node_block'] = array(
+    '#type' => 'radios',
+    '#title' => t('Show the Like button in the node content block or in it\'s own block?'),
+    '#options' => array(t('Content block'), t('Own block')),
+    '#default_value' => variable_get('fblikebutton_node_block', 0),
+    '#description' => t('If <em>Content block</em> is selected, the button will appear in the same block as the node content. If <em>Own block</em> is selected the Like button gets it\'s own block, which you can position at the ' . l(t('block page'), 'admin/structure/block') . '.'),
+  );
+  $form['fblikebutton_dynamic_visibility']['fblikebutton_showonteasers'] = array(
     '#type' => 'radios',
     '#title' => t('Display on teasers?'),
     '#options' => array(t('No'), t('Yes')),
     '#default_value' => variable_get('fblikebutton_showonteasers', 0),
     '#description' => t('If <em>Yes</em> is selected, the button will appear even when the node being viewed is a teaser. Otherwise it will only appear when the full node is being viewed.'),
   );
-  $form['fblikebutton_iframe_width'] = array(
+  $form['fblikebutton_dynamic_appearance'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Appearance settings'),
+    '#collapsible' => false,
+  );
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_iframe_width'] = array(
     '#type' => 'textfield',
     '#title' => t('Width of the iframe (px)'),
     '#default_value' => variable_get('fblikebutton_iframe_width', '450'),
     '#description' => t('Width of the iframe, in pixels. Default is 450. <em>Note: lower values may crop the output.</em>'),
   );
-  $form['fblikebutton_iframe_height'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_iframe_height'] = array(
     '#type' => 'textfield',
     '#title' => t('Height of the iframe (px)'),
     '#default_value' => variable_get('fblikebutton_iframe_height', '80'),
     '#description' => t('Height of the iframe, in pixels. Default is 80. <em>Note: lower values may crop the output.</em>'),
   );
-  $form['fblikebutton_iframe_css'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_iframe_css'] = array(
     '#type' => 'textfield',
     '#title' => t('Extra css styling needed'),
     '#default_value' => variable_get('fblikebutton_iframe_css', ''),
     '#description' => t('Extra css attributes needed to make the iframe behave for your specific requirements. Will not necessarily overwrite existing styling. To alter the dimensions of the iframe, use the height and width fields found above.<br/>Example: <em>float: right; padding: 5px;</em>'),
   );
-  $form['fblikebutton_layout'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_layout'] = array(
     '#type' => 'select',
     '#title' => t('Layout style'),
     '#options' => array('standard' => t('Standard'), 'box_count' => t('Box Count'), 'button_count' => t('Button Count')),
     '#default_value' => variable_get('fblikebutton_layout', 'standard'),
     '#description' => t('Determines the size and amount of social context next to the button.'),
   );
-  $form['fblikebutton_show_faces'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_show_faces'] = array(
     '#type' => 'select',
     '#title' => t('Show faces in the box?'),
     '#options' => array('show' => t('Show faces'), 'hide' => t('Do not show faces')),
     '#default_value' => variable_get('fblikebutton_show_faces', 'show'),
     '#description' => t('Show profile pictures below the button. Only works if <em>Layout style</em> (found above) is set to <em>Standard</em> (otherwise, value is ignored).'),
   );
-  $form['fblikebutton_action'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_action'] = array(
     '#type' => 'select',
     '#title' => t('Verb to display'),
     '#options' => array('like' => t('Like'), 'recommend' => t('Recommend')),
     '#default_value' => variable_get('fblikebutton_action', 'like'),
     '#description' => t('The verbiage to display inside the button itself.'),
   );
-/**  $form['fblikebutton_displaysend'] = array(
+/**  $form['fblikebutton_dynamic_appearance']['fblikebutton_displaysend'] = array(
     '#type' => 'select',
     '#title' => t('Display <em>send</em> option?'),
     '#options' => array('true' => t('Display'), 'false' => t('Do not display')),
     '#default_value' => variable_get('fblikebutton_displaysend', 'false'),
     '#description' => t('Optionally display the <em>Send</em> button next to the <em>Like/Recommend</em> box.<br/><strong>Note: this feature is currently unavailable from Facebook.</strong> Although setting the value to <em>Display</em> will not hurt anything, the output will not be affected either way.'),
   ); */
-  $form['fblikebutton_font'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_font'] = array(
     '#type' => 'select',
     '#title' => t('Font'),
     '#options' => array('arial' => 'Arial',
@@ -83,60 +103,68 @@ function fblikebutton_admin_settings() {
     '#default_value' => variable_get('fblikebutton_font', 'arial'),
     '#description' => t('The font with which to display the text of the button.'),
   );
-  $form['fblikebutton_color_scheme'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_color_scheme'] = array(
     '#type' => 'select',
     '#title' => t('Color scheme'),
     '#options' => array('light' => t('Light'), 'dark' => t('Dark')),
     '#default_value' => variable_get('fblikebutton_color_scheme', 'light'),
     '#description' => t('The color scheme of the box environtment.'),
   );
-  $form['fblikebutton_weight'] = array(
+  $form['fblikebutton_dynamic_appearance']['fblikebutton_weight'] = array(
     '#type' => 'select',
     '#title' => t('Weight'),
     '#options' => array('-50' => '-50', '-49' => '-49', '-48' => '-48', '-47' => '-47', '-46' => '-46', '-45' => '-45', '-44' => '-44', '-43' => '-43', '-42' => '-42', '-41' => '-41', '-40' => '-40', '-39' => '-39', '-38' => '-38', '-37' => '-37', '-36' => '-36', '-35' => '-35', '-34' => '-34', '-33' => '-33', '-32' => '-32', '-31' => '-31', '-30' => '-30', '-29' => '-29', '-28' => '-28', '-27' => '-27', '-26' => '-26', '-25' => '-25', '-24' => '-24', '-23' => '-23', '-22' => '-22', '-21' => '-21', '-20' => '-20', '-19' => '-19', '-18' => '-18', '-17' => '-17', '-16' => '-16', '-15' => '-15', '-14' => '-14', '-13' => '-13', '-12' => '-12', '-11' => '-11', '-10' => '-10', '-9' => '-9', '-8' => '-8', '-7' => '-7', '-6' => '-6', '-5' => '-5', '-4' => '-4', '-3' => '-3', '-2' => '-2', '-1' => '-1', '0' => '0', '1' => '1', '2' => '2', '3' => '3', '4' => '4', '5' => '5', '6' => '6', '7' => '7', '8' => '8', '9' => '9', '10' => '10', '11' => '11', '12' => '12', '13' => '13', '14' => '14', '15' => '15', '16' => '16', '17' => '17', '18' => '18', '19' => '19', '20' => '20', '21' => '21', '22' => '22', '23' => '23', '24' => '24', '25' => '25', '26' => '26', '27' => '27', '28' => '28', '29' => '29', '30' => '30', '31' => '31', '32' => '32', '33' => '33', '34' => '34', '35' => '35', '36' => '36', '37' => '37', '38' => '38', '39' => '39', '40' => '40', '41' => '41', '42' => '42', '43' => '43', '44' => '44', '45' => '45', '46' => '46', '47' => '47', '48' => '48', '49' => '49', '50' => '50'),    
     '#default_value' => variable_get('fblikebutton_weight', '50'),
-    '#description' => t('The weight determines where on a node the like button will appear. The larger the weight, the lower it will appear on the node. For example, if you want the button to appear more toward the top of the node, choose <em>-40</em> as opposed to <em>-39, -38, 0, 1,</em> or <em>50,</em> etc.'),
+    '#description' => t('The weight determines where, at the content block, the like button will appear. The larger the weight, the lower it will appear on the node. For example, if you want the button to appear more toward the top of the node, choose <em>-40</em> as opposed to <em>-39, -38, 0, 1,</em> or <em>50,</em> etc. To position the Like button in its own block, go to the ' . l(t('block page'), 'admin/structure/block') . '.'),
     );
   return system_settings_form($form);
 }
 
 /**
- * Settings for the block.
+ * Settings for the static FB Like button block.
  */
-function fblikebutton_block_settings() {
+function fblikebutton_static_settings() {
   global $base_url;
-  $form['fblikebutton_block_url'] = array(
+  $form['fblikebutton_static_block_description'] = array(
+          '#markup' => '<p>'. t('Set the static URL to like with the button. This Like button will like the given URL, no matter on which page it is displayed. To position this block go the ' . l(t('block page'), 'admin/structure/block') . '.</p>'),
+  );
+  $form['fblikebutton_static_block_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Button settings'),
+    '#collapsible' => false,
+  );
+  $form['fblikebutton_static_block_settings']['fblikebutton_block_url'] = array(
     '#type' => 'textfield',
     '#default_value' => variable_get('fblikebutton_block_url', $base_url),
-    '#description' => t('URL of your homepage to like')
+    '#description' => t('URL of the page to like (could be your homepage or a facebook page e.g.)')
   );
-  $form['fblikebutton_block'] = array(
+  $form['fblikebutton_static_block_appearance'] = array(
     '#type' => 'fieldset',
-    '#title' => 'Block configuration',
+    '#title' => t('Button appearance'),
     '#collapsible' => false,
   );
-  $form['fblikebutton_block']['fblikebutton_bl_layout'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_layout'] = array(
     '#type' => 'select',
     '#title' => t('Layout style'),
     '#options' => array('standard' => t('Standard'), 'box_count' => t('Box Count'), 'button_count' => t('Button Count')),
     '#default_value' => variable_get('fblikebutton_bl_layout', 'standard'),
     '#description' => t('Determines the size and amount of social context next to the button'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_show_faces'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_show_faces'] = array(
     '#type' => 'select',
     '#title' => t('Display faces in the box'),
     '#options' => array('show' => t('Show faces'), 'hide' => t('Do not show faces')),
     '#default_value' => variable_get('fblikebutton_bl_show_faces', 'show'),
     '#description' => t('Show profile pictures below the button. Only works with Standard layout'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_action'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_action'] = array(
     '#type' => 'select',
     '#title' => t('Verb to display'),
     '#options' => array('like' => t('Like'), 'recommend' => t('Recommend')),
     '#default_value' => variable_get('fblikebutton_bl_action', 'like'),
     '#description' => t('The verb to display in the button.'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_font'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_font'] = array(
     '#type' => 'select',
     '#title' => t('Font'),
     '#options' => array('arial' => 'Arial',
@@ -148,26 +176,26 @@ function fblikebutton_block_settings() {
     '#default_value' => variable_get('fblikebutton_bl_font', 'arial'),
     '#description' => t('The font to display in the button'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_color_scheme'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_color_scheme'] = array(
     '#type' => 'select',
     '#title' => t('Color scheme'),
     '#options' => array('light' => t('Light'), 'dark' => t('Dark')),
     '#default_value' => variable_get('fblikebutton_bl_color_scheme', 'light'),
     '#description' => t('The color scheme of box environtment'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_iframe_width'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_iframe_width'] = array(
     '#type' => 'textfield',
     '#title' => t('Width of the iframe (px)'),
     '#default_value' => variable_get('fblikebutton_bl_iframe_width', '450'),
     '#description' => t('Width of the iframe, in pixels. Default is 450. <em>Note: lower values may crop the output.</em>'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_iframe_height'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_iframe_height'] = array(
     '#type' => 'textfield',
     '#title' => t('Height of the iframe (px)'),
     '#default_value' => variable_get('fblikebutton_bl_iframe_height', '80'),
     '#description' => t('Height of the iframe, in pixels. Default is 80. <em>Note: lower values may crop the output.</em>'),
   );
-  $form['fblikebutton_block']['fblikebutton_bl_iframe_css'] = array(
+  $form['fblikebutton_static_block_appearance']['fblikebutton_bl_iframe_css'] = array(
     '#type' => 'textfield',
     '#title' => t('Extra css styling needed'),
     '#default_value' => variable_get('fblikebutton_bl_iframe_css', ''),
diff --git a/fblikebutton.install b/fblikebutton.install
index f11c08b..221b0e1 100644
--- a/fblikebutton.install
+++ b/fblikebutton.install
@@ -12,7 +12,8 @@ function fblikebutton_install() {
  * Implementation of hook_uninstall().
  */
 function fblikebutton_uninstall() {
-  variable_del('fblikebutton_node_types');
+  variable_del('fblikebutton_node_block');
+  variable_del('fblikebutton_bl_iframe_css');
   variable_del('fblikebutton_show_faces');
   variable_del('fblikebutton_layout');
   variable_del('fblikebutton_color_scheme');
diff --git a/fblikebutton.module b/fblikebutton.module
index 984f54f..b023803 100644
--- a/fblikebutton.module
+++ b/fblikebutton.module
@@ -22,21 +22,21 @@ function fblikebutton_menu() {
     'file' => 'system.admin.inc',
     'file path' => drupal_get_path('module', 'system'),
   );
-  $items['admin/config/fblikebutton/general'] = array(
-    'title' => 'General settings',
-    'description' => 'Configure the settings for the Like button as it appears on individual nodes.',
+  $items['admin/config/fblikebutton/dynamic'] = array(
+    'title' => 'Dynamic Like button settings',
+    'description' => 'Configure the settings for the Like button as it appears on individual nodes (liking that node).',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('fblikebutton_admin_settings'),
+    'page arguments' => array('fblikebutton_dynamic_settings'),
     'access arguments' => array('administer fblikebutton'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'fblikebutton.admin.inc',
     'weight' => 0,
   );
-  $items['admin/config/fblikebutton/block'] = array(
-    'title' => 'Block settings',
-    'description' => 'Configure the settings for the Like button as it appears in the block.',
+  $items['admin/config/fblikebutton/static'] = array(
+    'title' => 'Static Like button settings',
+    'description' => 'Configure the settings for the static Like button as it appears in the block (liking a given url).',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('fblikebutton_block_settings'),
+    'page arguments' => array('fblikebutton_static_settings'),
     'access arguments' => array('administer fblikebutton block'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'fblikebutton.admin.inc',
@@ -51,6 +51,7 @@ function fblikebutton_menu() {
 function fblikebutton_node_view($node, $view_mode) {
   global $user, $base_url;
   $types = variable_get('fblikebutton_node_types', array());
+  $dynamicblock = variable_get('fblikebutton_node_block', 0);
   $showonteasers = variable_get('fblikebutton_showonteasers', 0);
   $full = ($view_mode == 'full') ? TRUE : FALSE;
   $show = ( ! empty($types[$node->type]) && user_access('access fblikebutton'));
@@ -74,20 +75,33 @@ function fblikebutton_node_view($node, $view_mode) {
       if ($view_mode == 'teaser') {
         $node->content['fblikebutton_field'] = NULL;
       }
-      if ($view_mode == 'full') {
+      if ($view_mode == 'full' && $dynamicblock == 0) {
         $node->content['fblikebutton_field'] = array(
           '#markup' => _fblikebutton_field($webpage_to_like, $conf),
           '#weight' => $likebutton_weight,
         );
       }
+      elseif ($view_mode == 'full') {
+        $node->content['fblikebutton_field'] = NULL;
+      }
+
     }
     elseif ($showonteasers == 1) {
-      if ($view_mode == 'teaser' || $view_mode == 'full') {
+      if ($view_mode == 'teaser') {
         $node->content['fblikebutton_field'] = array(
          '#markup' => _fblikebutton_field($webpage_to_like, $conf),
         '#weight' => $likebutton_weight,
         );
       }
+      if ($view_mode == 'full' && $dynamicblock == 0) {
+        $node->content['fblikebutton_field'] = array(
+          '#markup' => _fblikebutton_field($webpage_to_like, $conf),
+          '#weight' => $likebutton_weight,
+        );
+      }
+      elseif ($view_mode == 'full') {
+        $node->content['fblikebutton_field'] = NULL;
+      }
     }
   }
 }
@@ -116,120 +130,82 @@ function fblikebutton_permission() {
  * Implementation of hook_block_info()
  */
 function fblikebutton_block_info() {
-  $blocks['fblikebutton_block'] = array(
-    'info' => t('FB Like button'),
+  $dynamicblock = variable_get('fblikebutton_node_block', 0);
+  $blocks['fblikebutton_static_block'] = array(
+    'info' => t('Static FB Like button'),
   );
+  if($dynamicblock == 1){
+    $blocks['fblikebutton_dynamic_block'] = array(
+      'info' => t('Dynamic FB Like button'),
+    );
+  }
   return $blocks;
 }
 
-/**
- * Implementation of hook_block_configure()
- */
 function fblikebutton_block_configure($delta = '') {
   global $base_url;
   $form = array();
-  if ($delta == 'fblikebutton_block') {
-    $form['fblikebutton_block_url'] = array(
-      '#title' => t('Homepage URL'),
-      '#type' => 'textfield',
-      '#default_value' => variable_get('fblikebutton_block_url', $base_url),
-      '#description' => t('URL of your homepage to like'),
-    );
-    $form['block'] = array(
+  if ($delta == 'fblikebutton_static_block') {
+    $form['fblikebutton_static_block'] = array(
       '#type' => 'fieldset',
+      '#title' => t('Static FB Like button block'),
       '#collapsible' => false,
-      '#collapsed' => false,
-      '#title' => t('Options'),
-      '#description' => '',
-    );
-    $form['block']['fblikebutton_bl_layout'] = array(
-      '#type' => 'select',
-      '#title' => t('Layout style'),
-      '#options' => array('standard' => t('Standard'), 'box_count' => t('Box Count'), 'button_count' => t('Button Count')),
-      '#default_value' => variable_get('fblikebutton_bl_layout', 'standard'),
-      '#description' => t('Determines the size and amount of social context next to the button'),
-    );
-    $form['block']['fblikebutton_bl_show_faces'] = array(
-      '#type' => 'select',
-      '#title' => t('Display faces in the box'),
-      '#options' => array('show' => t('Show faces'), 'hide' => t('Do not show faces')),
-      '#default_value' => variable_get('fblikebutton_bl_show_faces', 'show'),
-      '#description' => t('Show profile pictures below the button. Only work on Standard layout'),
+    );
+    $form['fblikebutton_static_block']['fblikebutton_static_config'] = array(
+      '#markup' => '<p>'. t('To configure the URL and the appearance of the button go to the ' . l(t('static Like button settings'), 'admin/config/fblikebutton/static') . '. Make sure you set the right permissions on the ' . l(t('permissions page'), 'admin/people/permissions') . '.</p>'),
     );
-    $form['block']['fblikebutton_bl_action'] = array(
-      '#type' => 'select',
-      '#title' => t('Verb to display'),
-      '#options' => array('like' => t('Like'), 'recommend' => t('Recommend')),
-      '#default_value' => variable_get('fblikebutton_bl_action', 'like'),
-      '#description' => t('The verb to display in the button.'),
-    );
-    $form['block']['fblikebutton_bl_font'] = array(
-    '#type' => 'select',
-    '#title' => t('Font'),
-    '#options' => array('arial' => 'Arial',
-                'lucida+grande' => 'Lucida Grande',
-                'segoe+ui' => 'Segoe UI',
-                'tahoma' => 'Tahoma',
-                'trebuchet+ms' => 'Trebuchet MS',
-                'verdana' => 'Verdana'),
-    '#default_value' => variable_get('fblikebutton_bl_font', 'arial'),
-    '#description' => t('The font to display in the button'),
-    );
-    $form['block']['fblikebutton_bl_color_scheme'] = array(
-    '#type' => 'select',
-    '#title' => t('Color scheme'),
-    '#options' => array('light' => t('Light'), 'dark' => t('Dark')),
-    '#default_value' => variable_get('fblikebutton_bl_color_scheme', 'light'),
-    '#description' => t('The color scheme of box environtment'),
+  }
+  if ($delta == 'fblikebutton_dynamic_block') {
+    $form['fblikebutton_dynamic_block'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Dynamic FB Like button block'),
+      '#collapsible' => false,
+    );
+    $form['fblikebutton_dynamic_block']['fblikebutton_dynamic_config'] = array(
+      '#markup' => '<p>'. t('To configure the visibility and the appearance of the button go to the ' . l(t('dynamic Like button settings'), 'admin/config/fblikebutton/dynamic') . '. You can enhance the visibility settings by using the settings on this page. Make sure you set the right permissions on the ' . l(t('permissions page'), 'admin/people/permissions') . '.</p>'),
     );
-  $form['block']['fblikebutton_bl_iframe_width'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Width of the iframe (px)'),
-    '#default_value' => variable_get('fblikebutton_bl_iframe_width', '450'),
-    '#description' => t('Width of the iframe, in pixels. Default is 450. <em>Note: lower values may crop the output.</em>'),
-  );
-  $form['block']['fblikebutton_bl_iframe_height'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Height of the iframe (px)'),
-    '#default_value' => variable_get('fblikebutton_bl_iframe_height', '80'),
-    '#description' => t('Height of the iframe, in pixels. Default is 80. <em>Note: lower values may crop the output.</em>'),
-  );
-  $form['block']['fblikebutton_bl_iframe_css'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Extra css styling needed'),
-    '#default_value' => variable_get('fblikebutton_bl_iframe_css', ''),
-    '#description' => t('Extra css attributes needed to make the iframe behave for your specific requirements. Will not necessarily overwrite existing styling. To alter the dimensions of the iframe, use the height and width fields found above.<br/>Example: <em>float: right; padding: 5px;</em>'),
-  );
   }
   return $form;
 }
 
-/**
- * Implementation of hook_block_save()
- */
-function fblikebutton_block_save($delta = '', $edit = array()) {
-  if ($delta == 'fblikebutton_block') {
-    variable_set('fblikebutton_bl_layout', $edit['fblikebutton_bl_layout']);
-    variable_set('fblikebutton_bl_layout', $edit['fblikebutton_bl_layout']);
-    variable_set('fblikebutton_bl_show_faces', $edit['fblikebutton_bl_show_faces']);
-    variable_set('fblikebutton_bl_action', $edit['fblikebutton_bl_action']);
-    variable_set('fblikebutton_bl_font', $edit['fblikebutton_bl_font']);
-    variable_set('fblikebutton_bl_color_scheme', $edit['fblikebutton_bl_color_scheme']);
-    variable_set('fblikebutton_bl_iframe_width', $edit['fblikebutton_bl_iframe_width']);
-    variable_set('fblikebutton_bl_iframe_height', $edit['fblikebutton_bl_iframe_height']);
-    variable_set('fblikebutton_bl_iframe_css', $edit['fblikebutton_bl_iframe_css']);
-  }
-}
 
 /**
  * Implementation of hook_block_view()
  */
 function fblikebutton_block_view($delta = '') {
   global $base_url;
+  $node = node_load(arg(1));
+  $types = variable_get('fblikebutton_node_types', array());
+  if($node){
+    $show = ( ! empty($types[$node->type]) && user_access('access fblikebutton'));
+  }
+  else {
+    $show = NULL;
+  }
+  $dynamicblock = variable_get('fblikebutton_node_block', 0);
   $block = array();
   switch ($delta) {
-    case 'fblikebutton_block':
-    default:
+    case 'fblikebutton_dynamic_block':
+      if($show && $dynamicblock == 1){
+        $node = node_load(arg(1));
+        $likebase = $base_url . '/';
+        $likepath = drupal_get_path_alias($node->uri['path']);
+        $webpage_to_like = $likebase . $likepath;
+        $conf = array(
+          'layout' => variable_get('fblikebutton_layout', 'standard'),
+          'action' => variable_get('fblikebutton_action', 'like'),
+          'color_scheme' => variable_get('fblikebutton_color_scheme', 'light'),
+          'show_faces' => variable_get('fblikebutton_show_faces', 'true'),
+          'font' => variable_get('fblikebutton_font', 'arial'),
+          'height' => variable_get('fblikebutton_iframe_height', '80'),
+          'width' => variable_get('fblikebutton_iframe_width', '450'),
+          'send' => variable_get('fblikebutton_send', 'true'),
+          'other_css' => variable_get('fblikebutton_iframe_css', ''),
+        );
+        $block['content'] = _fblikebutton_field($webpage_to_like, $conf);
+      }
+      break;
+    case 'fblikebutton_static_block':
       $addr = variable_get('fblikebutton_block_url', $base_url);
       $conf = array(
         'layout' => variable_get('fblikebutton_bl_layout', "standard"),
@@ -242,6 +218,7 @@ function fblikebutton_block_view($delta = '') {
         'other_css' => variable_get('fblikebutton_bl_iframe_css', ''),
       );
       $block['content'] = _fblikebutton_field($addr, $conf);
+      break;
   }
   return $block;
 }
