@@ -157,16 +137,40 @@
     'type' => MENU_NORMAL_ITEM, // optional
     'file' => 'quiz.admin.inc',
   );
+  
+  /**
+   * Lets change this to filter by the Quiz Title instead of showing ALL the quiz results
+   * then we can click the title and be taken into a deeper layer to show results filtered by 
+   * the quiz id.
+   */
   $items['admin/quiz/results'] = array(
     'title' => t('@quiz results', array('@quiz' => QUIZ_NAME)),
-    'page callback' => 'quiz_admin',
+    'page callback' => 'quiz_admin_quizzes',
     'access arguments' => array('administer quiz'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'quiz.admin.inc',
   );
   
+  /**
+   * Changed to filter based on Quiz id, this will show us all the results for this specific 
+   * quiz.  This should help with organization and locating the appropriate result set based 
@@ -460,7 +462,7 @@
    */
   $form['aid'] = array(
     '#title' => t('Assign Action'),
-    '#description' => t('Select an action to be preformed after a user has completed this quiz.'),
+    '#description' => t('Select an action to be preformed after a user has completed this @quiz.', array('@quiz' => QUIZ_NAME)),
     '#type' => 'select',
     /*
      * An idea here would be to add a system conf variable into the quiz_action_options() function that
@@ -471,7 +473,7 @@
      * those specific actions.  @note:  In doing this you loose your default "Choose an Action"
      * option.  Review actions and the quiz_action_options() function for further explaination.
      */
-    '#options' => quiz_action_options(),
+    '#options' => quiz_action_options(variable_get('quiz_action_type', 'all')),
     '#default_value' => MD5($node->aid),
   );
   
@@ -1895,6 +1917,10 @@
     return $options;
   }
   else {
+    $options[$type][0] = t('Choose an action');
+    //lets sort it to get the choose an action back first
+    ksort($options[$type]);
     return $options[$type];
   }
-}
+}
\ No newline at end of file