diff --git a/css/watcher.css b/css/watcher.css
index a052f10..8a7b31f 100644
--- a/css/watcher.css
+++ b/css/watcher.css
@@ -73,7 +73,7 @@
   height: 18px;
 }
 
-.watcher_node_watched {
+div.watcher_node_watched {
   background-image: url(../images/watch.gif)!important;
 }
 
@@ -151,4 +151,4 @@
   -moz-border-radius: .4em;
   -webkit-border-radius: .4em;
   border-radius: .4em;
-}
\ No newline at end of file
+}
diff --git a/watcher.module b/watcher.module
index 0bcb267..b41c465 100755
--- a/watcher.module
+++ b/watcher.module
@@ -179,6 +179,28 @@ function theme_watcher_node_toggle_watching_link($variables) {
 }
 
 /**
+ * Return a watching post icon with link to be displayed in the nodes link section (below the body)
+ */
+function theme_watcher_node_links_toggle_watching_link($variables) {
+  $user_is_watching = $variables['user_is_watching'];
+  // Set up classes
+  $class_watch_status_link = ( $user_is_watching ? ' watcher_node_toggle_watching_link_watched' : '');
+
+  $output = array( 'watcher-link' => array(
+                                  'title' => ( $user_is_watching ? $variables['t']['watch_toggle_enabled'] : $variables['t']['watch_toggle_disabled'] ),
+                                  'href' => "user/{$variables['uid']}/watcher/toggle/{$variables['nid']}",
+                                  'attributes' => array(
+                                                  'class' => "watcher_node_toggle_watching_link$class_watch_status_link",
+                                                  'title' => ( $user_is_watching ? $variables['t']['watch_toggle_enabled_title'] : $variables['t']['watch_toggle_disabled_title'] ),
+                                                  ),
+                                  'query' => $variables['query'],
+                                  ),
+  );
+  
+  return $output;
+} 
+
+/**
  * Return the help page
  *
  * @param $content
@@ -239,6 +261,9 @@ function watcher_theme($existing, $type, $theme, $path) {
     'watcher_node_toggle_watching_link' => array(
       'variables' => array('uid' => NULL, 'nid' => NULL, 'query' => NULL, 'user_is_watching' => NULL, 't' => array()),
     ),
+    'watcher_node_links_toggle_watching_link' => array(
+      'variables' => array('uid' => NULL, 'nid' => NULL, 'query' => NULL, 'user_is_watching' => NULL, 't' => array()),
+    ),
     'watcher_help_page' => array(
       'variables' => array('content'),
     ),
@@ -785,6 +810,17 @@ function _watcher_admin_settings_watch_toggle_link(&$form) {
       '#description' => t('Determines whether or not to show the "watch this post" toggle link in node teasers (used on front page and content listings). Teasers are the shortened down version of a node, often shown on a site\'s frontpage or on pages that summarize content. If disabled, link will only be shown when nodes are shown as pages (full view).'),
       '#default_value' => variable_get('watcher_toggle_link_in_teaser', FALSE),
   );
+  
+  $form['togglelink']['watcher_toggle_link_position'] = array(
+      '#type' => 'radios',
+      '#title' => t('Where should "watch this post" toggle links be inserted on each node?'),
+      '#description' => t('This setting applies for both full page view and teasers (if the "display in teasers" option is checked).'),
+      '#options' => array(
+        'body' => t('At the bottom of the node body'),
+        'links' => t('In the node links section'),
+      ),
+      '#default_value' => variable_get('watcher_toggle_link_position', 'body'),
+  );
 }
 
 /**
@@ -2283,12 +2319,21 @@ function _watcher_node_watch_link(&$node, $view_mode) {
   // Add CSS
   drupal_add_css(drupal_get_path('module', 'watcher') .'/css/watcher.css');
 
-  //Add element to node
-  $node->content['watcher'] = array(
-    '#markup' => theme('watcher_node_toggle_watching_link', array('uid' => $user->uid, 'nid' => $node->nid, 'query' => $link_query, 'user_is_watching' => $watching, 't' => $tstrings)),
-    '#weight' => 30,
-  );
-}
+  //Add element to node body or links section.
+  $position = variable_get('watcher_toggle_link_position', 'body');
+    if ($position == 'body') {
+    $node->content['watcher'] = array(
+      '#markup' => theme('watcher_node_toggle_watching_link', array('uid' => $user->uid, 'nid' => $node->nid, 'query' => $link_query, 'user_is_watching' => $watching, 't' => $tstrings)),
+      '#weight' => 30,
+    );
+  } else {
+    $node->content['links']['watcher'] = array(
+      '#theme' => 'links__node__watcher',
+      '#links' => theme('watcher_node_links_toggle_watching_link', array('uid' => $user->uid, 'nid' => $node->nid, 'query' => $link_query, 'user_is_watching' => $watching, 't' => $tstrings)),
+      '#attributes' => array('class' => array('links', 'inline')),
+    );
+  }
+}  
 
 /**
  * Save user settings for Watcher