diff --git a/reviews.module b/reviews.module
index c98faf6..9da3d78 100644
--- a/reviews.module
+++ b/reviews.module
@@ -7,7 +7,7 @@
  * content type basis.
  */
 
-// Ensure tha the file containing all the basic API functions is included.
+// Ensure that the file containing all the basic API functions is included.
 module_load_include('inc', 'reviews', 'includes/reviews.api');
 
 /**
@@ -28,6 +28,10 @@ function reviews_permission() {
     'administer reviews' => array(
       'title' => t('Administer settings for the reviews system.'),
     ),
+    'moderate reviews' => array(
+      'title' => t('Moderate reviews'),
+      'description' => t('Allow user to moderate pending reviews.'),
+    ),
     'read reviews' => array(
       'title' => t('Read reviews.'),
       'description' => t('Allow user to read reviews for the node being displayed.'),
@@ -54,10 +58,8 @@ function reviews_menu() {
     'description' => t('Administer node reviews.'),
     'position' => 'left',
     'weight' => -8,
-    'page callback' => 'system_admin_menu_block_page',
-    'access arguments' => array('administer reviews'),
-    'file path' => drupal_get_path('module', 'system'),
-    'file' => 'system.admin.inc',
+    'access arguments' => array('moderate reviews'),
+    'type' => MENU_LOCAL_TASK | MENU_NORMAL_ITEM,
   );
 
   $items['admin/content/reviews/list'] = array(
@@ -65,8 +67,8 @@ function reviews_menu() {
     'description' => t('List published and unpublished reviews left by users.'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('reviews_list'),
-    'access arguments' => array('administer reviews'),
-    'type' => MENU_NORMAL_ITEM,
+    'access arguments' => array('moderate reviews'),
+    'type' => MENU_DEFAULT_LOCAL_TASK,
     'file' => 'includes/reviews.admin.inc',
   );
 
@@ -75,12 +77,12 @@ function reviews_menu() {
     'description' => t('Moderate reviews left by users.'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('reviews_moderation'),
-    'access arguments' => array('administer reviews'),
-    'type' => MENU_NORMAL_ITEM,
+    'access arguments' => array('moderate reviews'),
+    'type' => MENU_LOCAL_TASK,
     'file' => 'includes/reviews.admin.inc',
   );
 
-  $items['admin/config/reviews'] = array(
+  $items['admin/config/content/reviews'] = array(
     'title' => 'Reviews',
     'description' => 'Administer reviews.',
     'page callback' => 'drupal_get_form',
@@ -99,7 +101,7 @@ function reviews_menu() {
     'title' => 'Approve Review',
     'page callback' => 'reviews_approve_review',
     'page arguments' => array(4),
-    'access arguments' => array('administer reviews'),
+    'access arguments' => array('moderate reviews'),
     'type' => MENU_CALLBACK,
     'file' => 'includes/reviews.admin.inc',
   );
@@ -117,7 +119,7 @@ function reviews_menu() {
     'title' => 'Add Review',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('reviews_add_review', 1),
-    'access arguments' => array('add review'),
+    'access arguments' => array('add reviews'),
     'file' => 'includes/reviews.pages.inc',
     'type' => variable_get('reviews_link_type', 'tab') == 'tab' ? MENU_LOCAL_TASK : MENU_CALLBACK,
   );
@@ -353,7 +355,7 @@ function reviews_pathauto($op) {
 }
 
 /**
- * helper function to create the alias
+ * Helper function to create the alias.
  */
 function reviews_create_alias($node, $op) {
   module_load_include('inc', 'pathauto');
@@ -364,12 +366,12 @@ function reviews_create_alias($node, $op) {
  * Implements hook_node_view().
  */
 function reviews_node_view($node, $view_mode, $langcode) {
-	if (variable_get('reviews_link_type', 'tab') == 'link') {
-		if ($view_mode == 'full' && reviews_user_reviewed_load($node->nid)) {
-		  $node->content['add_review_link'] = array(
-		    '#markup' => '<div class="reviews add-review-link">' . l(t('Add review'), 'node/' . $node->nid . '/add-review') . '</div>',
-		    '#weight' => 100,
-		  );
-		}
-	}
+  if (variable_get('reviews_link_type', 'tab') == 'link') {
+    if ($view_mode == 'full' && reviews_user_reviewed_load($node->nid)) {
+      $node->content['add_review_link'] = array(
+        '#markup' => '<div class="reviews add-review-link">' . l(t('Add review'), 'node/' . $node->nid . '/add-review') . '</div>',
+        '#weight' => 100,
+      );
+    }
+  }
 }