diff --git a/feedback.admin.inc b/feedback.admin.inc
index 88718208..cf819130 100644
--- a/feedback.admin.inc
+++ b/feedback.admin.inc
@@ -19,7 +19,7 @@ function feedback_admin_view_form($form, &$form_state) {
     array('data' => t('Date'), 'field' => 'f.timestamp'),
     array('data' => t('User'), 'field' => 'u.name'),
     t('Message'),
-    t('Delete'),
+    t('Operations'),
   );
   // Hack to prevent pager_query() from issuing PHP notices.
   if (!isset($_GET['page'])) {
@@ -58,7 +58,20 @@ function feedback_admin_view_form($form, &$form_state) {
         $form['feedback-messages'][$status][$fid]['date'] = array('#markup' => format_date($entry->timestamp, 'small'));
         $form['feedback-messages'][$status][$fid]['user'] = array('#markup' => check_plain(format_username($entry)));
         $form['feedback-messages'][$status][$fid]['message'] = feedback_format_message($entry);
-        $form['feedback-messages'][$status][$fid]['delete'] = array('#type' => 'link', '#title' => t('delete'), '#href' => "admin/reports/feedback/$fid/delete");
+        $form['feedback-messages'][$status][$fid]['operations'] = array(
+          '#theme' => 'links',
+          '#links' => array(
+            'edit' => array(
+              'title' => t('edit'),
+              'href' => "admin/reports/feedback/$fid/edit"
+            ),
+            'delete' => array(
+              'title' => t('delete'),
+              'href' => "admin/reports/feedback/$fid/delete"
+            ),
+          ),
+          '#attributes' => array(),
+        );
       }
     }
   }
@@ -93,7 +106,7 @@ function theme_feedback_admin_view_form($variables) {
         drupal_render($entry['date']),
         drupal_render($entry['user']),
         drupal_render($entry['message']),
-        drupal_render($entry['delete']),
+        drupal_render($entry['operations']),
       );
       // Render the checkbox.
       $rows[count($rows) - 1][0] = drupal_render($entry);
@@ -133,6 +146,92 @@ function feedback_admin_view_form_submit($form, &$form_state) {
   }
 }
 
+/**
+ * Form builder; Feedback entry edit form.
+ *
+ * @ingroup forms
+ */
+function feedback_entry_form($form, &$form_state, $entry) {
+  $form['#fid'] = $entry->fid;
+
+  $form['location'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Location'),
+    '#required' => TRUE,
+    '#default_value' => $entry->location,
+  );
+
+  $account = user_load($entry->uid);
+  $form['user'] = array(
+    '#title' => t('User'),
+    '#type' => 'item',
+    '#markup' => theme('username', array('account' => $account)),
+  );
+
+  $form['status'] = array(
+    '#title' => t('Processed'),
+    '#type' => 'radios',
+    '#options' => array(
+       FEEDBACK_OPEN => 'Open',
+       FEEDBACK_PROCESSED => 'Processed',
+    ),
+    '#default_value' => $entry->status,
+  );
+
+  $form['message'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Message'),
+    '#required' => TRUE,
+    '#wysiwyg' => FALSE,
+    '#default_value' => $entry->message,
+  );
+
+  field_attach_form('feedback', $entry, $form, $form_state);
+
+  $form['actions'] = array(
+    '#type' => 'actions',
+  );
+  $form['actions']['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Submit'),
+  );
+  $form['actions']['delete'] = array(
+    '#type' => 'submit',
+    '#value' => t('Delete'),
+    '#submit' => array('feedback_entry_form_delete_submit'),
+  );
+
+  return $form;
+}
+
+/**
+ * Form submit callback for entry edit form.
+ */
+function feedback_entry_form_submit(&$form, &$form_state) {
+  $entry = feedback_load($form['#fid']);
+  entity_form_submit_build_entity('feedback', $entry, $form, $form_state);
+  $entry->message = $form_state['values']['message'];
+  $entry->location = $form_state['values']['location'];
+  $entry->location_masked = feedback_mask_path($entry->location);
+  $entry->url = url($entry->location, array('absolute' => TRUE));
+  $entry->status = $form_state['values']['status'];
+  feedback_save($entry);
+  drupal_set_message(t('The entry has been updated.'));
+}
+
+/**
+ * Button submit function: handle the 'Delete' button on the feedback entry edit form.
+ */
+function feedback_entry_form_delete_submit($form, &$form_state) {
+  $destination = array();
+  if (isset($_GET['destination'])) {
+    $destination = drupal_get_destination();
+    unset($_GET['destination']);
+  }
+  $fid = $form['#fid'];
+  $form_state['redirect'] = array('admin/reports/feedback/' . $fid . '/delete', array('query' => $destination));
+}
+
 /**
  * Form builder; The general feedback settings form.
  *
diff --git a/feedback.info b/feedback.info
index e515a4a0..6ecaee0f 100644
--- a/feedback.info
+++ b/feedback.info
@@ -5,11 +5,13 @@ core = 7.x
 configure = admin/config/user-interface/feedback
 files[] = feedback.controller.inc
 files[] = views/feedback_handler_field_feedback_link.inc
+files[] = views/feedback_handler_field_feedback_link_delete.inc
+files[] = views/feedback_handler_field_feedback_link_edit.inc
 files[] = tests/feedback.test
 
-; Information added by drupal.org packaging script on 2012-10-22
+; Information added by drupal.org packaging script on 2012-11-10
 version = "7.x-2.x-dev"
 core = "7.x"
 project = "feedback"
-datestamp = "1350867277"
+datestamp = "1352509461"
 
diff --git a/feedback.module b/feedback.module
index cea2a363..9763575d 100644
--- a/feedback.module
+++ b/feedback.module
@@ -119,11 +119,25 @@ function feedback_menu() {
     'access arguments' => array('view feedback messages'),
     'file' => 'feedback.admin.inc',
   );
+  $items['admin/reports/feedback/%feedback/view'] = array(
+    'title' => 'View',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => -10,
+  );
+  $items['admin/reports/feedback/%feedback/edit'] = array(
+    'title' => 'Edit',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('feedback_entry_form', 3),
+    'access arguments' => array('view feedback messages'),
+    'type' => MENU_LOCAL_TASK,
+    'file' => 'feedback.admin.inc',
+  );
   $items['admin/reports/feedback/%feedback/delete'] = array(
     'title' => 'Delete feedback entry',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('feedback_delete_confirm', 3),
     'access arguments' => array('view feedback messages'),
+    'type' => MENU_CALLBACK,
     'file' => 'feedback.admin.inc',
   );
   $items['admin/config/user-interface/feedback'] = array(
@@ -206,14 +220,9 @@ function feedback_form($form, &$form_state) {
   if (!isset($form_state['inline']['location'])) {
     $form_state['inline']['location'] = $_GET['q'];
   }
-  # changed value by type by hidden to be able to change location value in JS
-  // $form['location'] = array(
-  //   '#type' => 'value',
-  //   '#value' => $form_state['inline']['location'],
-  // );
   $form['location'] = array(
-    '#type' => 'hidden',
-    '#default_value' => $form_state['inline']['location'],
+    '#type' => 'value',
+    '#value' => $form_state['inline']['location'],
   );
 
   $form['help'] = array(
@@ -350,15 +359,12 @@ function feedback_format_message($entry) {
       $message .= '<div class="browserinfo">(' . check_plain($entry->useragent) . ')</div>';
     }
   }
+  $elements['message'] = array('#markup' => $message);
   $uri = entity_uri('feedback', $entry);
   if ($uri['path'] != $_GET['q']) {
     $links['view'] = array('title' => t('view'), 'href' => $uri['path']);
+    $elements['links'] = array('#theme' => 'links__feedback_message', '#links' => $links);
   }
-  else {
-    $links['delete'] = array('title' => t('delete'), 'href' => $uri['path'] . '/delete');
-  }
-  $elements['message'] = array('#markup' => $message);
-  $elements['links'] = array('#theme' => 'links__feedback_message', '#links' => $links);
   return $elements;
 }
 
@@ -534,6 +540,12 @@ function feedback_mollom_form_list() {
   $forms['feedback_form'] = array(
     'title' => t('Feedback form'),
     'entity' => 'feedback',
+    'bundle' => 'feedback',
+    'entity delete multiple callback' => 'feedback_delete_multiple',
+    'delete form' => 'feedback_delete_confirm',
+    'delete form file' => array(
+      'name' => 'feedback.admin',
+    ),
     'report access' => array('view feedback messages'),
   );
   return $forms;
@@ -543,15 +555,15 @@ function feedback_mollom_form_list() {
  * Implements hook_mollom_form_info().
  */
 function feedback_mollom_form_info($form_id) {
-  if ($form_id == 'feedback_form') {
-    return array(
-      'mode' => MOLLOM_MODE_ANALYSIS,
-      'bypass access' => array('administer feedback'),
-      'elements' => array(
-        'message' => t('Message'),
-      ),
-    );
-  }
+  $form_info = array(
+    'mode' => MOLLOM_MODE_ANALYSIS,
+    'bypass access' => array('administer feedback'),
+    'elements' => array(
+      'message' => t('Message'),
+    ),
+  );
+  mollom_form_info_add_fields($form_info, 'feedback', 'feedback');
+  return $form_info;
 }
 
 /**
diff --git a/tests/feedback_test.info b/tests/feedback_test.info
index ec9b546e..22f76be0 100644
--- a/tests/feedback_test.info
+++ b/tests/feedback_test.info
@@ -5,9 +5,9 @@ package = Testing
 hidden = TRUE
 dependencies[] = feedback
 
-; Information added by drupal.org packaging script on 2012-10-22
+; Information added by drupal.org packaging script on 2012-11-10
 version = "7.x-2.x-dev"
 core = "7.x"
 project = "feedback"
-datestamp = "1350867277"
+datestamp = "1352509461"
 
diff --git a/views/feedback.views.inc b/views/feedback.views.inc
index 85583b16..ab8ac507 100644
--- a/views/feedback.views.inc
+++ b/views/feedback.views.inc
@@ -42,6 +42,20 @@ function feedback_views_data() {
       'handler' => 'feedback_handler_field_feedback_link',
     ),
   );
+  $data['feedback']['view_entry_delete'] = array(
+    'field' => array(
+      'title' => t('Delete entry'),
+      'help' => t('Provide a simple link to delete the feedback entry.'),
+      'handler' => 'feedback_handler_field_feedback_link_delete',
+    ),
+  );
+  $data['feedback']['view_entry_edit'] = array(
+    'field' => array(
+      'title' => t('Edit entry'),
+      'help' => t('Provide a simple link to the edit feedback entry.'),
+      'handler' => 'feedback_handler_field_feedback_link_edit',
+    ),
+  );
   $data['feedback']['uid'] = array(
     'title' => t('User Id'),
     'help' => t('The user id of the author of a feedback message.'),
diff --git a/views/feedback.views_default.inc b/views/feedback.views_default.inc
index 03b3c58a..a83f04ec 100644
--- a/views/feedback.views_default.inc
+++ b/views/feedback.views_default.inc
@@ -9,19 +9,20 @@
  * Implements hook_views_default_views().
  */
 function feedback_views_default_views() {
-  $view = new view;
+  $view = new view();
   $view->name = 'feedback_messages';
   $view->description = 'Override the default feedback messages report.';
   $view->tag = 'feedback';
   $view->base_table = 'feedback';
   $view->human_name = '';
   $view->core = 0;
-  $view->api_version = '3.0-alpha1';
-  $view->disabled = TRUE; /* Edit this to true to make a default view disabled initially */
+  $view->api_version = '3.0';
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
   /* Display: Defaults */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->display->display_options['title'] = 'Feedback Messages';
+  $handler->display->display_options['use_more_always'] = FALSE;
   $handler->display->display_options['access']['type'] = 'perm';
   $handler->display->display_options['access']['perm'] = 'view feedback messages';
   $handler->display->display_options['cache']['type'] = 'none';
@@ -37,7 +38,8 @@ function feedback_views_default_views() {
     'message' => 'message',
     'useragent' => 'message',
     'view_entry' => 'message',
-    'fid' => 'message',
+    'view_entry_delete' => 'message',
+    'view_entry_edit' => 'message',
   );
   $handler->display->display_options['style_options']['default'] = '-1';
   $handler->display->display_options['style_options']['info'] = array(
@@ -46,93 +48,74 @@ function feedback_views_default_views() {
       'default_sort_order' => 'asc',
       'align' => '',
       'separator' => '',
+      'empty_column' => 0,
     ),
     'timestamp' => array(
       'sortable' => 1,
       'default_sort_order' => 'asc',
       'align' => '',
       'separator' => '',
+      'empty_column' => 0,
     ),
     'name' => array(
       'sortable' => 1,
       'default_sort_order' => 'asc',
       'align' => '',
       'separator' => '',
+      'empty_column' => 0,
     ),
     'message' => array(
       'align' => '',
       'separator' => '',
+      'empty_column' => 0,
     ),
     'useragent' => array(
       'sortable' => 0,
       'default_sort_order' => 'asc',
       'align' => '',
       'separator' => '',
+      'empty_column' => 0,
     ),
     'view_entry' => array(
       'align' => '',
       'separator' => '',
+      'empty_column' => 0,
     ),
-    'fid' => array(
+    'view_entry_delete' => array(
       'align' => '',
       'separator' => '',
+      'empty_column' => 0,
+    ),
+    'view_entry_edit' => array(
+      'align' => '',
+      'separator' => '',
+      'empty_column' => 0,
     ),
   );
-  $handler->display->display_options['style_options']['override'] = 1;
-  $handler->display->display_options['style_options']['sticky'] = 0;
-  $handler->display->display_options['style_options']['empty_table'] = 0;
   /* Header: Global: Text area */
   $handler->display->display_options['header']['text']['id'] = 'text';
   $handler->display->display_options['header']['text']['table'] = 'views';
   $handler->display->display_options['header']['text']['field'] = 'area';
-  $handler->display->display_options['header']['text']['empty'] = FALSE;
   $handler->display->display_options['header']['text']['content'] = 'Open Feedback Messages';
   $handler->display->display_options['header']['text']['format'] = 'full_html';
   /* No results behavior: Global: Text area */
   $handler->display->display_options['empty']['area']['id'] = 'area';
   $handler->display->display_options['empty']['area']['table'] = 'views';
   $handler->display->display_options['empty']['area']['field'] = 'area';
-  $handler->display->display_options['empty']['area']['empty'] = FALSE;
   $handler->display->display_options['empty']['area']['content'] = 'There are no feedback entries.';
   /* Relationship: Feedback: User Id */
   $handler->display->display_options['relationships']['uid']['id'] = 'uid';
   $handler->display->display_options['relationships']['uid']['table'] = 'feedback';
   $handler->display->display_options['relationships']['uid']['field'] = 'uid';
-  $handler->display->display_options['relationships']['uid']['required'] = 0;
   /* Field: Feedback: Location */
   $handler->display->display_options['fields']['location']['id'] = 'location';
   $handler->display->display_options['fields']['location']['table'] = 'feedback';
   $handler->display->display_options['fields']['location']['field'] = 'location';
-  $handler->display->display_options['fields']['location']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['location']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['location']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['location']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['location']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['location']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['location']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['location']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['location']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['location']['display_as_link'] = 1;
   /* Field: Feedback: Timestamp */
   $handler->display->display_options['fields']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['fields']['timestamp']['table'] = 'feedback';
   $handler->display->display_options['fields']['timestamp']['field'] = 'timestamp';
   $handler->display->display_options['fields']['timestamp']['label'] = 'Date';
-  $handler->display->display_options['fields']['timestamp']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['timestamp']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['timestamp']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['timestamp']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['timestamp']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['timestamp']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['timestamp']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['timestamp']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['timestamp']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['timestamp']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['timestamp']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['timestamp']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['timestamp']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['timestamp']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['timestamp']['empty_zero'] = 0;
   $handler->display->display_options['fields']['timestamp']['date_format'] = 'short';
   /* Field: User: Name */
   $handler->display->display_options['fields']['name']['id'] = 'name';
@@ -140,104 +123,35 @@ function feedback_views_default_views() {
   $handler->display->display_options['fields']['name']['field'] = 'name';
   $handler->display->display_options['fields']['name']['relationship'] = 'uid';
   $handler->display->display_options['fields']['name']['label'] = 'User';
-  $handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['name']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['name']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['name']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['name']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['name']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['name']['link_to_user'] = 1;
-  $handler->display->display_options['fields']['name']['overwrite_anonymous'] = 0;
   /* Field: Feedback: Message */
   $handler->display->display_options['fields']['message']['id'] = 'message';
   $handler->display->display_options['fields']['message']['table'] = 'feedback';
   $handler->display->display_options['fields']['message']['field'] = 'message';
-  $handler->display->display_options['fields']['message']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['message']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['message']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['message']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['message']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['message']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['message']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['message']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['message']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['message']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['message']['alter']['html'] = 0;
   $handler->display->display_options['fields']['message']['element_type'] = 'div';
-  $handler->display->display_options['fields']['message']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['message']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['message']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['message']['empty_zero'] = 0;
   /* Field: Feedback: User agent */
   $handler->display->display_options['fields']['useragent']['id'] = 'useragent';
   $handler->display->display_options['fields']['useragent']['table'] = 'feedback';
   $handler->display->display_options['fields']['useragent']['field'] = 'useragent';
   $handler->display->display_options['fields']['useragent']['label'] = '';
-  $handler->display->display_options['fields']['useragent']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['useragent']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['useragent']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['useragent']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['useragent']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['useragent']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['useragent']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['useragent']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['useragent']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['useragent']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['useragent']['alter']['html'] = 0;
   $handler->display->display_options['fields']['useragent']['element_type'] = 'div';
-  $handler->display->display_options['fields']['useragent']['element_label_colon'] = 1;
-  $handler->display->display_options['fields']['useragent']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['useragent']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['useragent']['empty_zero'] = 0;
   /* Field: Feedback: Link */
   $handler->display->display_options['fields']['view_entry']['id'] = 'view_entry';
   $handler->display->display_options['fields']['view_entry']['table'] = 'feedback';
   $handler->display->display_options['fields']['view_entry']['field'] = 'view_entry';
   $handler->display->display_options['fields']['view_entry']['label'] = '';
-  $handler->display->display_options['fields']['view_entry']['alter']['alter_text'] = 0;
-  $handler->display->display_options['fields']['view_entry']['alter']['make_link'] = 0;
-  $handler->display->display_options['fields']['view_entry']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['view_entry']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['view_entry']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['view_entry']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['view_entry']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['view_entry']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['view_entry']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['view_entry']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['view_entry']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['view_entry']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['view_entry']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['view_entry']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['view_entry']['empty_zero'] = 0;
-  /* Field: Feedback: Delete link */
-  $handler->display->display_options['fields']['fid']['id'] = 'fid';
-  $handler->display->display_options['fields']['fid']['table'] = 'feedback';
-  $handler->display->display_options['fields']['fid']['field'] = 'fid';
-  $handler->display->display_options['fields']['fid']['ui_name'] = 'Feedback: Delete link';
-  $handler->display->display_options['fields']['fid']['label'] = '';
-  $handler->display->display_options['fields']['fid']['alter']['alter_text'] = 1;
-  $handler->display->display_options['fields']['fid']['alter']['text'] = ' delete';
-  $handler->display->display_options['fields']['fid']['alter']['make_link'] = 1;
-  $handler->display->display_options['fields']['fid']['alter']['path'] = 'admin/reports/feedback/[fid]/delete';
-  $handler->display->display_options['fields']['fid']['alter']['absolute'] = 0;
-  $handler->display->display_options['fields']['fid']['alter']['external'] = 0;
-  $handler->display->display_options['fields']['fid']['alter']['replace_spaces'] = 0;
-  $handler->display->display_options['fields']['fid']['alter']['trim'] = 0;
-  $handler->display->display_options['fields']['fid']['alter']['nl2br'] = 0;
-  $handler->display->display_options['fields']['fid']['alter']['word_boundary'] = 1;
-  $handler->display->display_options['fields']['fid']['alter']['ellipsis'] = 1;
-  $handler->display->display_options['fields']['fid']['alter']['strip_tags'] = 0;
-  $handler->display->display_options['fields']['fid']['alter']['html'] = 0;
-  $handler->display->display_options['fields']['fid']['element_label_colon'] = 0;
-  $handler->display->display_options['fields']['fid']['element_wrapper_type'] = 'span';
-  $handler->display->display_options['fields']['fid']['element_default_classes'] = 1;
-  $handler->display->display_options['fields']['fid']['hide_empty'] = 0;
-  $handler->display->display_options['fields']['fid']['empty_zero'] = 0;
-  $handler->display->display_options['fields']['fid']['separator'] = '';
-  $handler->display->display_options['fields']['fid']['format_plural'] = 0;
+  $handler->display->display_options['fields']['view_entry']['element_label_colon'] = FALSE;
+  /* Field: Feedback: Delete entry */
+  $handler->display->display_options['fields']['view_entry_delete']['id'] = 'view_entry_delete';
+  $handler->display->display_options['fields']['view_entry_delete']['table'] = 'feedback';
+  $handler->display->display_options['fields']['view_entry_delete']['field'] = 'view_entry_delete';
+  $handler->display->display_options['fields']['view_entry_delete']['label'] = '';
+  $handler->display->display_options['fields']['view_entry_delete']['element_label_colon'] = FALSE;
+  /* Field: Feedback: Edit entry */
+  $handler->display->display_options['fields']['view_entry_edit']['id'] = 'view_entry_edit';
+  $handler->display->display_options['fields']['view_entry_edit']['table'] = 'feedback';
+  $handler->display->display_options['fields']['view_entry_edit']['field'] = 'view_entry_edit';
+  $handler->display->display_options['fields']['view_entry_edit']['label'] = '';
+  $handler->display->display_options['fields']['view_entry_edit']['element_label_colon'] = FALSE;
   /* Sort criterion: Feedback: Timestamp */
   $handler->display->display_options['sorts']['timestamp']['id'] = 'timestamp';
   $handler->display->display_options['sorts']['timestamp']['table'] = 'feedback';
@@ -251,6 +165,7 @@ function feedback_views_default_views() {
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page_1');
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['path'] = 'admin/reports/feedback';
   $handler->display->display_options['menu']['type'] = 'normal';
   $handler->display->display_options['menu']['title'] = 'Feedback messages';
@@ -261,14 +176,15 @@ function feedback_views_default_views() {
   /* Display: Attachment */
   $handler = $view->new_display('attachment', 'Attachment', 'attachment_1');
   $handler->display->display_options['defaults']['title'] = FALSE;
+  $handler->display->display_options['defaults']['hide_admin_links'] = FALSE;
   $handler->display->display_options['pager']['type'] = 'some';
   $handler->display->display_options['defaults']['header'] = FALSE;
   /* Header: Global: Text area */
   $handler->display->display_options['header']['text']['id'] = 'area';
   $handler->display->display_options['header']['text']['table'] = 'views';
   $handler->display->display_options['header']['text']['field'] = 'area';
-  $handler->display->display_options['header']['text']['empty'] = FALSE;
   $handler->display->display_options['header']['text']['content'] = 'Processed Feedback Messages';
+  $handler->display->display_options['defaults']['filter_groups'] = FALSE;
   $handler->display->display_options['defaults']['filters'] = FALSE;
   /* Filter criterion: Feedback: Status */
   $handler->display->display_options['filters']['status']['id'] = 'status';
@@ -294,15 +210,16 @@ function feedback_views_default_views() {
     t('Items per page'),
     t('- All -'),
     t('Offset'),
+    t('« first'),
+    t('‹ previous'),
+    t('next ›'),
+    t('last »'),
     t('Open Feedback Messages'),
     t('There are no feedback entries.'),
     t('User'),
     t('Location'),
     t('Date'),
     t('Message'),
-    t(' delete'),
-    t('admin/reports/feedback/[fid]/delete'),
-    t('.'),
     t('Page'),
     t('Attachment'),
     t('Processed Feedback Messages'),