diff -Naur ../tmp/views_node_feed/views_node_feed.module ./views_node_feed.module
--- ../tmp/views_node_feed/views_node_feed.module	2009-09-17 08:59:07.000000000 -0700
+++ ./views_node_feed.module	2010-05-06 15:04:21.794668685 -0700
@@ -49,15 +49,21 @@
     'page callback' => 'views_node_feed_admin_settings',
     'type' => MENU_NORMAL_ITEM,
   );
-  $items['admin/settings/views_node_feed/edit'] = array(
-    'title' => 'Add/Edit Node Feed',
-    'title callback' => '_views_node_feed_edit_title_callback',
-    'title arguments' => array(4, "test"),
+  $items['admin/settings/views_node_feed/add'] = array(
+    'title' => 'Add Node Feed',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('views_node_feed_edit_form'),
+    'page arguments' => array('views_node_feed_edit_form', 'new'),
     'access arguments' => array('administer views'),
     'type' => MENU_NORMAL_ITEM,
   );
+  $items['admin/settings/views_node_feed/edit/%'] = array(
+    'title' => 'Edit Feed @ident',
+    'title arguments' => array('@ident' => 4),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('views_node_feed_edit_form', 4),
+    'access arguments' => array('administer views'),
+    'type' => MENU_CALLBACK,
+  );
   $items['admin/settings/views_node_feed/delete'] = array(
     'title' => 'Delete Node Feed',
     'page callback' => 'drupal_get_form',
@@ -132,6 +138,7 @@
     '#default_value' => $new ? '<?php print $node->title; ?><br/>' : $feed['node'],
     '#required' => FALSE,
   );
+  $form['#original_identifier'] = $new ? '' : $ident;
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),
@@ -163,6 +170,10 @@
   );
   $ident = $form_state['values']['identifier'];
   $feeds = views_node_feed_get_feeds();
+  
+  unset($feeds[$form['#original_identifier']]);
+  variable_del('views_node_feed_' . $form['#original_identifier']);
+  
   $feeds[$ident] = $ident;
   variable_set("views_node_feed_$ident", $val);
   variable_set("views_node_feed_feeds", $feeds);
@@ -239,7 +250,7 @@
  */
 function theme_views_node_feed_admin($feeds) {
   $output = '';
-  $output .= '<p>'. l(t('Add new node feed'), 'admin/settings/views_node_feed/edit/new') .'</p>';
+  $output .= '<p>'. l(t('Add new node feed'), 'admin/settings/views_node_feed/add') .'</p>';
 
   $output .= '<p>';
   if (count($feeds) == 0) {