diff --git page_example/page_example.module page_example/page_example.module
index 085d77f..8081c89 100755
--- page_example/page_example.module
+++ page_example/page_example.module
@@ -17,7 +17,7 @@
  */
 function page_example_help($path, $arg) {
   switch ($path) {
-    case 'example/foo':
+    case 'examples/help#simple':
       // Here is some help text for a custom page. This information will be
       // introduced in the page when viewing example/foo URL.
       return t('This sentence contains all the letters in the English alphabet.');
@@ -34,8 +34,8 @@ function page_example_help($path, $arg) {
  */
 function page_example_perm() {
   return array(
-    'access foo content',
-    'access baz content',
+    'access simple page',
+    'access arguments page',
   );
 }
 
@@ -76,11 +76,18 @@ function page_example_perm() {
  */
 function page_example_menu() {
   // This is the minimum information you can provide for a menu item. This menu
-  // item will be created in the default menu: Navigation.
-  $items['example/foo'] = array(
-    'title' => 'Page example: (foo)',
-    'page callback' => 'page_example_foo',
-    'access arguments' => array('access foo content'),
+  // item will be created in the default menu.
+  $items['examples/page_example'] = array(
+    'title' => 'Page Example',
+    'page callback' => 'page_example_description',
+    'access callback' => TRUE,
+    'expanded' => TRUE,
+  );
+
+  $items['examples/page_example/simple'] = array(
+    'title' => 'Simple - no arguments',
+    'page callback' => 'page_example_simple',
+    'access arguments' => array('access simple page'),
   );
 
   // By using the MENU_CALLBACK type, we can register the callback for this
@@ -92,17 +99,22 @@ function page_example_menu() {
   // would be replaced by 'example', a 1 by 'baz', and like wise 2 and 3 will
   // be replaced by what ever the user provides. These will be passed as
   // arguments to the page_example_baz() function.
-  $items['example/baz/%/%'] = array(
-    'title' => 'Baz',
-    'page callback' => 'page_example_baz',
-    'page arguments' => array(2, 3),
-    'access arguments' => array('access baz content'),
+  $items['examples/page_example/arguments/%/%'] = array(
+    'title' => 'Page example with arguments',
+    'page callback' => 'page_example_arguments',
+    'page arguments' => array(3, 4),
+    'access arguments' => array('access arguments page'),
     'type' => MENU_CALLBACK,
   );
-
+  
   return $items;
 }
 
+function page_example_description() {
+  return '<p>'.t('The page_example provides two pages, "simple" and "arguments". The <a href="@simple_link">simple page</a> just returns a renderable array for display. The <a href="@arguments_link">arguments page</a> takes two arguments and displays them, as in @arguments_link', array('@simple_link' => url('examples/page_example/simple', array('absolute' => TRUE)), '@arguments_link' => url('examples/page_example/arguments/23/56', array('absolute' => TRUE)))).'<p>';
+}
+
+
 /**
  * A simple page callback.
  *
@@ -114,28 +126,28 @@ function page_example_menu() {
  * If you do not want to use the theme system (for example for outputting an
  * image or XML), you should print the content yourself and not return anything.
  */
-function page_example_foo() {
-  return '<p>' . t('The quick brown fox jumps over the lazy dog.') . ' </p>';
+function page_example_simple() {
+  return '<p>' . t('Simple page: The quick brown fox jumps over the lazy dog.') . '</p>';
 }
 
 /**
  * A more complex page callback that takes arguments.
  *
- * The arguments are passed in from the page URL. The in our hook_menu
+ * The arguments are passed in from the page URL. There in our hook_menu
  * implementation we instructed the menu system to extract the last two
  * parameters of the path and pass them to this function as arguments.
  */
-function page_example_baz($alice, $bob) {
-  // Make sure you don't trust the URL to be safe! Always check for threats.
-  if (!is_numeric($alice) || !is_numeric($bob)) {
+function page_example_arguments($first, $second) {
+  // Make sure you don't trust the URL to be safe! Always check for exploits.
+  if (!is_numeric($first) || !is_numeric($second)) {
     // We will just show a standard "access denied" page in this case.
-    return drupal_access_denied();
+    drupal_access_denied();
+    return;  // We actually don't get here.
   }
 
-  $list[] = t("Alice's number was @number.", array('@number' => $alice));
-  $list[] = t("Bob's number was @number.", array('@number' => $bob));
-  $list[] = t('The total was @number.', array('@number' => $alice + $bob));
+  $list[] = t("First number was @number.", array('@number' => $first));
+  $list[] = t("Second number was @number.", array('@number' => $second));
+  $list[] = t('The total was @number.', array('@number' => $first + $second));
 
-  return t("baz content") . theme('item_list', $list);
+  return theme('item_list', $list);
 }
-
diff --git page_example/page_example.test page_example/page_example.test
index f8143c2..b1d3b49 100644
--- page_example/page_example.test
+++ page_example/page_example.test
@@ -62,8 +62,8 @@ class PageExampleTestCase extends DrupalWebTestCase {
 
     // Verify that anonymous user can't access the pages created by
     // page_example module
-    $this->pageExampleVerifyNoAccess('example/foo');
-    $this->pageExampleVerifyNoAccess('example/baz/1/2');
+    $this->pageExampleVerifyNoAccess('examples/page_example/simple');
+    $this->pageExampleVerifyNoAccess('examples/page_example/arguments/1/2');
 
     // Create a regular user and login.
     $this->web_user = $this->drupalCreateUser();
@@ -71,50 +71,51 @@ class PageExampleTestCase extends DrupalWebTestCase {
 
     // Verify that regular user can't access the pages created by
     // page_example module
-    $this->pageExampleVerifyNoAccess('example/foo');
-    $this->pageExampleVerifyNoAccess('example/baz/1/2');
+    $this->pageExampleVerifyNoAccess('examples/page_example/simple');
+    $this->pageExampleVerifyNoAccess('examples/page_example/arguments/1/2');
 
-    // Create a user with permissions to access 'foo' page and login.
-    $this->web_user = $this->drupalCreateUser(array('access foo content'));
+    // Create a user with permissions to access 'simple' page and login.
+    $this->web_user = $this->drupalCreateUser(array('access simple page'));
     $this->drupalLogin($this->web_user);
 
     // Verify that user can access foo content
-    $this->drupalGet('example/foo');
-    $this->assertResponse(200, t('foo content successfully accessed.'));
-    $this->assertRaw(t('The quick brown fox jumps over the lazy dog.'), t('foo content successfully verified.'));
+    $this->drupalGet('examples/page_example/simple');
+    $this->assertResponse(200, t('Simple page content successfully accessed.'));
+    $this->assertText(t('The quick brown fox jumps over the lazy dog.'), t('foo content successfully verified.'));
 
-    // Check if user can't access baz page
-    $this->pageExampleVerifyNoAccess('example/baz/1/2');
+    // Check if user can't access arguments page
+    $this->pageExampleVerifyNoAccess('examples/page_example/arguments/1/2');
+    
+    
 
-
-
-    // Create a user with permissions to access 'foo' page and login.
-    $this->web_user = $this->drupalCreateUser(array('access baz content'));
+    // Create a user with permissions to access 'arguments' page and login.
+    $this->web_user = $this->drupalCreateUser(array('access arguments page'));
     $this->drupalLogin($this->web_user);
-
+    
     // Verify that user can access foo content
-    $alice = $this->randomNumber(3);
-    $bob = $this->randomNumber(3);
-    $this->drupalGet('example/baz/' . $alice . '/' . $bob);
-    $this->assertResponse(200, t('baz content successfully accessed.'));
+    $first = $this->randomNumber(3);
+    $second = $this->randomNumber(3);
+    $this->drupalGet('examples/page_example/arguments/' . $first . '/' . $second);
+    $this->assertResponse(200, t('arguments content successfully accessed.'));
+    
     // Verify argument usage
-    $this->assertRaw(t("Alice's number was @number.", array('@number' => $alice)), t('baz alice argument successfully verified.'));
-    $this->assertRaw(t("Bob's number was @number.", array('@number' => $bob)), t('baz bob argument successfully verified.'));
-    $this->assertRaw(t('The total was @number.', array('@number' => $alice + $bob)), t('baz content successfully verified.'));
+    $this->assertRaw(t("First number was @number.", array('@number' => $first)), t('arguments first argument successfully verified.'));
+    $this->assertRaw(t("Second number was @number.", array('@number' => $second)), t('arguments second argument successfully verified.'));
+    $this->assertRaw(t('The total was @number.', array('@number' => $first + $second)), t('arguments content successfully verified.'));
 
-    // Verify incomplete argument call to baz content
-    $this->drupalGet('example/baz/' . $alice . '/');
-    $this->assertResponse(404, t('Invalid argument for baz content successfully verified'));
+    // Verify incomplete argument call to arguments content
+    $this->drupalGet('examples/page_example/arguments/' . $first . '/');
+    $this->assertText("provides two pages");
 
-    // Verify invalid argument call to baz content
-    $this->drupalGet('example/baz/' . $alice . '/' . $this->randomString());
-    $this->assertResponse(403, t('Invalid argument for baz content successfully verified'));
+    // Verify invalid argument call to arguments content
+    $this->drupalGet('examples/page_example/arguments/' . $first . '/' . $this->randomString());
+    $this->assertResponse(403, t('Invalid argument for arguments content successfully verified'));
 
-    // Verify invalid argument call to baz content
-    $this->drupalGet('example/baz/' . $this->randomString() . '/' . $bob);
-    $this->assertResponse(403, t('Invalid argument for baz content successfully verified'));
+    // Verify invalid argument call to arguments content
+    $this->drupalGet('examples/page_example/arguments/' . $this->randomString() . '/' . $second);
+    $this->assertResponse(403, t('Invalid argument for arguments content successfully verified'));
 
-    // Check if user can't access foo page
-    $this->pageExampleVerifyNoAccess('example/foo');
+    // Check if user can't access simple page
+    $this->pageExampleVerifyNoAccess('examples/page_example/simple');
   }
 }