diff --git a/gelf.drush.inc b/gelf.drush.inc
index 9073fcb..5391080 100644
--- a/gelf.drush.inc
+++ b/gelf.drush.inc
@@ -20,7 +20,7 @@ function gelf_drush_command() {
 }
 
 /**
- * Implementation of hook_drush_help().
+ * Implements hook_drush_help().
  */
 function gelf_drush_help($section) {
   switch ($section) {
diff --git a/gelf.module b/gelf.module
index 185125a..ef0cf89 100644
--- a/gelf.module
+++ b/gelf.module
@@ -13,27 +13,43 @@
  */
 function gelf_menu() {
   $items = array();
-  $items['admin/settings/logging/gelf'] = array(
-    'title' => 'GELF settings',
+  $items['admin/config/gelf'] = array(
+    'title' => 'Gelf Settings',
     'description' => 'Settings for logging to Graylog2 using GELF.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('gelf_admin_settings_form'),
-    'access arguments' => array('administer gelf'),
+    'position' => 'right',
+    'weight' => '-5',
+    'page callback' => 'system_admin_menu_block_page',
+    'access arguments' => array('administer site configuration'),
+    'file' => 'system.admin.inc',
+    'file path' => drupal_get_path('module', 'system'),
   );
+
+  $items['admin/config/gelf/settings'] = array(
+     'title' => 'GELF settings',
+     'description' => 'Settings for logging to Graylog2 using GELF.',
+     'page callback' => 'drupal_get_form',
+     'page arguments' => array('gelf_admin_settings_form'),
+     'access arguments' => array('administer gelf'),
+     'position' => 'right',
+  );
+
   return $items;
 }
 
 /**
- * Implemetation of hook_perm()
- *
- * Allows admins to control access to gelf settings.
+ * Implemets hook_permimssion()
  */
-function gelf_perm() {
-  return array('administer gelf');
+function gelf_permission() {
+  return array(
+    'administer gelf' => array(
+      'title' => t('administer gelf'),
+      'description' => t('TODO Add a description for \'administer gelf\''),
+    ),
+  );
 }
 
 /**
- * Implement hook_watchdog().
+ * Implements hook_watchdog().
  */
 function gelf_watchdog($entry) {
   if (module_exists('libraries') && $gelflib_path = libraries_get_path('gelf-php')) {
@@ -86,7 +102,7 @@ function gelf_watchdog($entry) {
 /**
  * Menu callback for GELF admin settings.
  */
-function gelf_admin_settings_form() {
+function gelf_admin_settings_form($form, &$form_state) {
   $form = array();
 
   $form['gelf_host'] = array(