--- multichoice.ori	Tue Jun 09 18:00:48 2009
+++ multichoice.module	Thu Jun 11 00:18:07 2009
@@ -738,6 +738,9 @@ function multichoice_render_question_for
     '#type' => $type,
     '#options' => $options,
   );
+  $form['nav_wrapper_open'] = array(
+    '#value' => '<div class="question-navigation">'
+  );
 
   if (empty($quiz) || empty($_SESSION['quiz_' . $quiz->nid])) {
     drupal_set_message(t('You are viewing a question outside of a quiz. This is not scored.'), 'status');
@@ -783,6 +786,9 @@ function multichoice_render_question_for
     $form['submit']['#disabled'] = TRUE;
     $form['submit']['#description'] = "Preview only. Submission is disabled.";
   }
+  $form['nav_wrapper_close'] = array(
+    '#value' => '</div>'
+  );
   return $form;
 }