diff --git a/country_page.module b/country_page.module
index 05a163b..1c55e43 100644
--- a/country_page.module
+++ b/country_page.module
@@ -13,6 +13,24 @@ function country_page_menu() {
     'access callback' => 'country_page_view_access',
     'access arguments' => array(1),
   );
+
+  $items['country/%country/view'] = array(
+    'title' => 'View',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => -10,
+  );
+
+  $items['country/%country/edit'] = array(
+    'title' => 'Edit',
+    'description' => 'Edit a country.',
+    'type' => MENU_LOCAL_TASK,
+    'page callback' => 'countries_admin_page',
+    'page arguments' => array(1),
+    'access arguments' => array('edit country pages'),
+    'file' => 'countries.admin.inc',
+    'file path' => drupal_get_path('module', 'countries'),
+  );
+
   return $items;
 }
 
@@ -33,6 +51,10 @@ function country_page_permission() {
       'title' => t('View country pages'),
       'description' => t('Lets users view non-administrative country pages.'),
     ),
+    'edit country pages' =>  array(
+      'title' => t('Edit country pages'),
+      'description' => t('Lets users edit non-administrative country pages.'),
+    ),
   );
 }
 
@@ -49,6 +71,16 @@ function country_page_view_access($country) {
   return FALSE;
 }
 
+function country_page_form_countries_admin_form_alter(&$form, &$form_state, $form_id) {
+  $form['#submit'][] = 'country_page_country_page_admin_form_submit';
+}
+
+function country_page_country_page_admin_form_submit($form, &$form_state) {
+  if (arg(0) == 'country' && arg(2) == 'edit') {
+    $form_state['redirect'] = arg(0) . '/' . arg(1);
+  }
+}
+
 /**
  * Implements hook_field_formatter_info().
  */