Index: faq.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/faq.css,v
retrieving revision 1.1.2.6.2.4
diff -u -p -r1.1.2.6.2.4 faq.css
--- faq.css	22 Dec 2008 01:34:50 -0000	1.1.2.6.2.4
+++ faq.css	27 Oct 2009 02:53:22 -0000
@@ -37,5 +37,6 @@ img.faq-tax-image {
 }
 
 div.faq-detailed-question {
+  padding-left: 20px;
   font-style: italic;
 }
Index: faq.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/faq.module,v
retrieving revision 1.1.4.52.2.113
diff -u -p -r1.1.4.52.2.113 faq.module
--- faq.module	26 Oct 2009 22:36:02 -0000	1.1.4.52.2.113
+++ faq.module	27 Oct 2009 02:53:23 -0000
@@ -213,7 +213,7 @@ function faq_form(&$node, &$param) {
     '#title' => check_plain($type->title_label),
     '#default_value' => $node->title,
     '#required' => TRUE,
-    '#weight' => 0,
+    '#weight' => -2,
     '#description' => t('Question to be answered.  This will appear in all question listings, such as the FAQ blocks.'),
   );
 
@@ -325,9 +325,9 @@ function faq_view($node, $teaser = FALSE
   drupal_add_css(drupal_get_path('module', 'faq') .'/faq.css');
   $node = node_prepare($node, $teaser);
   $node->detailed_question = check_markup($node->detailed_question, $node->format, FALSE);
-  $content = $node->content['body']['#value'];
 
-  if (variable_get('faq_display', 'questions_top') == 'hide_answer' && !empty($node->detailed_question) && variable_get('faq_question_length', 'short') == 'both') {
+  if ($page && !empty($node->detailed_question) && variable_get('faq_question_length', 'short') == 'both') {
+    $content = $node->content['body']['#value'];
     $node->content['body']['#value'] = '<div class="faq-detailed-question">'. $node->detailed_question .'</div>'. $content;
   }
 
@@ -1111,7 +1111,7 @@ function faq_view_question(&$data, $node
     }
   }
 
-  if (variable_get('faq_display', 'questions_top') != 'hide_answer' && !empty($node->detailed_question) && variable_get('faq_question_length', 'short') == 'both') {
+  if (!empty($node->detailed_question) && variable_get('faq_question_length', 'short') == 'both') {
     $question .= '<div class="faq-detailed-question">'. $node->detailed_question .'</div>';
   }
   $data['question'] = $question;