diff --git a/twitter_post/twitter_post.module b/twitter_post/twitter_post.module
index 1b9bcd0..f2f01f1 100644
--- a/twitter_post/twitter_post.module
+++ b/twitter_post/twitter_post.module
@@ -44,6 +44,7 @@ function twitter_post_form_alter(&$form, $form_state, $form_id) {
     }
     $form['twitter'] = array(
       '#type' => 'fieldset',
+      '#group' => 'additional_settings',
       '#title' => t('Post to twitter.com'),
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
@@ -62,11 +63,11 @@ function twitter_post_form_alter(&$form, $form_state, $form_id) {
 }
 
 /**
- * Implementation of hook_node_insert().
+ * Implementation of hook_node_presave().
  *
  * Intercepts newly published nodes and posts noticed to Twitter.
  */
-function twitter_post_node_insert($node) {
+function twitter_post_node_presave($node) {
   if (!empty($node->status) && !empty($node->twitter) && !empty($node->twitter['post'])) {
     module_load_include('inc', 'twitter');
 
@@ -97,14 +98,6 @@ function twitter_post_node_insert($node) {
 }
 
 /**
- * Implementation of hook_node_update().
- */
-function twitter_post_node_update($node) {
-  twitter_post_node_insert($node);
-}
-
-
-/**
  * Generate a twitter posting form for the given user.
  *
  * @param $account