diff --git a/fblikebutton.admin.inc b/fblikebutton.admin.inc
index e015693..b0049cc 100644
--- a/fblikebutton.admin.inc
+++ b/fblikebutton.admin.inc
@@ -40,6 +40,12 @@ function fblikebutton_dynamic_settings() {
     '#default_value' => variable_get('fblikebutton_teaser_display', 0),
     '#description' => t('If you want to show the like button on teasers you can select the display area.'),
   );
+  $form['fblikebutton_dynamic_visibility']['fblikebutton_content_type_display_field'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Add this as a configurable field'),
+    '#description' => t('If this checkbox is checked, the facebook like button will available in the coontent manage display'),
+    '#default_value' => variable_get('fblikebutton_content_type_display_field', 0)
+  );
   $form['fblikebutton_dynamic_appearance'] = array(
     '#type' => 'fieldset',
     '#title' => t('Appearance settings'),
@@ -119,13 +125,37 @@ function fblikebutton_dynamic_settings() {
     '#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') . '.'),
     );
   $form['fblikebutton_dynamic_appearance']['fblikebutton_language'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Language'),
-    '#default_value' => variable_get('fblikebutton_language', 'en_US'),
-    '#description' => t('Specific language to use. Default is English. Examples:<br />French (France): <em>fr_FR</em><br />French (Canada): <em>fr_CA</em><br />More information can be found at http://developers.facebook.com/docs/internationalization/ and a full XML list can be found at http://www.facebook.com/translations/FacebookLocales.xml'),
+    '#type' => 'fieldset',
+    '#title' => t('Language settings'),
+    '#collapsible' => FALSE,
+    '#tree' => FALSE,
   );
+  $languages = language_list('enabled');
+  foreach ($languages[1] as $lang => $oLang) {
+    $form['fblikebutton_dynamic_appearance']['fblikebutton_language']['fblikebutton_language_' . $lang] = array(
+      '#type' => 'textfield',
+      '#title' => t('Language code for @language', array('@language' => $oLang->name)),
+      '#default_value' => variable_get('fblikebutton_language_' . $lang, 'en_US'),
+      '#description' => t('Specific language to use. Default is English. Examples:<br/>French (France): <em>fr_FR</em><br/>French (Canada): <em>fr_CA</em>'),
+    );
+  }
+
   $form['#validate'] = array('fblikebutton_config_form_validate');
-  return system_settings_form($form);
+
+  $form = system_settings_form($form);
+
+  // add an extra submit handler for the configurable field option
+  $form['#submit'][] = 'fblikebutton_dynamic_settings_submit';
+
+  return $form;
+}
+
+/**
+ * Extra submit handler for other thing than saving the settings
+ */
+function fblikebutton_dynamic_settings_submit(){
+  // the content display field will only be visable when the caches are cleared.
+  entity_info_cache_clear();
 }
 
 /**
diff --git a/fblikebutton.module b/fblikebutton.module
index 837b1dd..46dcae3 100644
--- a/fblikebutton.module
+++ b/fblikebutton.module
@@ -50,12 +50,13 @@ function fblikebutton_menu() {
  * Implements of hook_node_view().
  */
 function fblikebutton_node_view($node, $view_mode) {
-  global $user, $base_url;
+  global $user, $base_urln, $language;
   $types = variable_get('fblikebutton_node_types', array());
   $fullnodedisplay = variable_get('fblikebutton_full_node_display', 0);
   $teaserdisplay = variable_get('fblikebutton_teaser_display', 0);
   $full = ($view_mode == 'full') ? TRUE : FALSE;
   $show = ( ! empty($types[$node->type]) && user_access('access fblikebutton'));
+  $show_always = variable_get('fblikebutton_content_type_display_field', 0); // always show the fblike when the display field setting is used
   // Thanks to corbacho for supplying the code for the $webpage_to_like variable...
   // (It was apparently throwing errors/notices the way I had it set up.)
   $webpage_to_like = url("node/$node->nid", array('absolute' => TRUE));
@@ -70,12 +71,12 @@ function fblikebutton_node_view($node, $view_mode) {
     'width' => variable_get('fblikebutton_iframe_width', '450'),
     'send' => variable_get('fblikebutton_send', 'true'),
     'other_css' => variable_get('fblikebutton_iframe_css', ''),
-    'language' => variable_get('fblikebutton_language', 'en_US'),
+    'language' => variable_get('fblikebutton_language_' . $language->language, 'en_US'),
   );
   if ($show) {
 
   // Content area
-    if (($view_mode == 'teaser' && $teaserdisplay == 1) || ($view_mode == 'full' && $fullnodedisplay == 0)) {
+    if (($view_mode == 'teaser' && $teaserdisplay == 1) || ($view_mode == 'full' && $fullnodedisplay == 0) || $show_always) {
       $node->content['fblikebutton_field'] = array(
         '#markup' => _fblikebutton_field($webpage_to_like, $conf),
         '#weight' => $likebutton_weight,
@@ -230,3 +231,25 @@ function _fblikebutton_field($webpage_to_like, $conf) {
   $output = '<iframe src="//www.facebook.com/plugins/like.php?' . $src . '" scrolling="no" frameborder="0" style="border: none; overflow: hidden; width: ' . $width . 'px; height: ' . $height . 'px;' . $other_css . '" allowTransparency="true"></iframe>';
   return $output;
 }
+
+/**
+ * Implements hook_field_extra_fields().
+ */
+function fblikebutton_field_extra_fields() {
+  if (variable_get('fblikebutton_content_type_display_field', 0)) {
+    // The levels of the array that we return correspond to the
+    // entity type, bundle and then either 'display' or 'form'.
+    $extra = array();
+    $types = variable_get('fblikebutton_node_types', array());
+    foreach ($types as $type) {
+      if ($type != '0') {
+        $extra['node'][$type]['display']['fblikebutton_field'] = array(
+          'label' => t('Facebook like button'),
+          'description' => t('Facebook like, added in fblikebutton_node_view().'),
+          'weight' => 10,
+        );
+      }
+    }
+    return $extra;
+  }
+}
\ No newline at end of file