Index: faq.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/faq.css,v
retrieving revision 1.1.2.7.2.1
diff -u -p -r1.1.2.7.2.1 faq.css
--- faq.css 5 Nov 2007 10:58:14 -0000 1.1.2.7.2.1
+++ faq.css 11 Jun 2008 15:56:42 -0000
@@ -35,3 +35,7 @@ img.faq_tax_image {
   float: left;
   padding: 0px 3px 0px 3px;
 }
+
+div.faq_category_header, div.faq_qa_header {
+  overflow: auto;
+}
Index: faq.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/faq/faq.module,v
retrieving revision 1.1.4.63.2.51
diff -u -p -r1.1.4.63.2.51 faq.module
--- faq.module 11 Jun 2008 14:19:51 -0000 1.1.4.63.2.51
+++ faq.module 11 Jun 2008 15:56:42 -0000
@@ -1876,7 +1876,7 @@ function _get_indented_faq_terms($vid, $
       }

       // Get term description.
-      $desc = theme('faq_category_description', check_markup($term->description), $term_image);
+      $desc = theme('faq_category_description', check_markup($term->description));

       // See if this term has any nodes itself, should it be a link?
       $result = db_query(db_rewrite_sql("SELECT COUNT(n.nid) AS c FROM {term_node} tn INNER JOIN {node} n ON n.nid = tn.nid WHERE n.status = 1 AND n.type = 'faq' AND tn.tid = '%d' ", "n", "nid"), $term->tid);
@@ -1897,7 +1897,9 @@ function _get_indented_faq_terms($vid, $
       else {
         $cur_item = $term_image . check_plain($term->name) . $desc;
       }
-      $cur_item .= '<div class="clear-block"></div>';
+      if (!empty($term_image)) {
+        $cur_item .= '<div class="clear-block"></div>';
+      }

       if (!$hide_child_terms) {
         $term_items = _get_indented_faq_terms($vid, $term->tid);
@@ -2151,7 +2153,7 @@ function theme_faq_format_answer($node,
   if ($node->links) {
     $answer .= '<div class="links">'. theme('links', $node->links) .'</div>';
   }
-  $answer .= '</div><div class="clear-block"></div>'."\n";
+  $answer .= "</div>\n";

   return $answer;
 }
@@ -2208,8 +2210,8 @@ function theme_faq_category_header($term
   // Configure header.
   $hdr = "h5";
   if ($term->depth > 0) $hdr = "h6";
-  $header = "<$hdr class=\"faq_header\">";
-  $header .= $term_image;
+  $header = $term_image;
+  $header .= "<$hdr class=\"faq_header\">";
   if ($category_display == 'hide_qa') {
     $header .= l($term->name, "faq/$term->tid");
   }
@@ -2221,7 +2223,7 @@ function theme_faq_category_header($term


   // Configure category description.
-  $desc = theme('faq_category_description', check_markup($term->description), $term_image);
+  $desc = theme('faq_category_description', check_markup($term->description));


   // Get list of sub-categories if necessary.
@@ -2334,7 +2336,7 @@ function faq_view_child_category_headers
       }

       // Configure child term description.
-      $child_term_desc = theme('faq_category_description', check_markup($child_term->description), $term_image);
+      $child_term_desc = theme('faq_category_description', check_markup($child_term->description));

       // Configure child term header.
       $child_categories[] = theme('faq_child_category_header', $child_term, $term_image, $child_term_desc, $faq_count, $term_node_count);
@@ -2352,15 +2354,11 @@ function faq_view_child_category_headers
  * @return
  *   HTML formatted description text.
  */
-function theme_faq_category_description($term_description = '', $term_image = '') {
+function theme_faq_category_description($term_description = '') {
   $description = '';
   if (!empty($term_description)) {
-    $description = '<div class="faq_qa_description"><p>';
-    $description .= $term_description ."</p></div>\n";
-  }
-  // Only add this div if we're displaying an image.
-  if (!empty($term_image)) {
-    $description .= '<div class="clear-block"></div>';
+    $description = '<div class="faq_qa_description">';
+    $description .= $term_description ."</div>\n";
   }

   return $description;
@@ -2386,10 +2384,12 @@ function theme_faq_category_description(
 function theme_faq_child_category_header($term, $term_image, $description, $faq_count, $node_count) {
   if ($faq_count) {
     $header = $term_image . l($term->name, "faq/$term->tid") ." ($node_count) $description";
-    $header .= '<div class="clear-block"></div>';
   }
   else {
     $header = $term_image . l($term->name, "faq/$term->tid") . $description;
+  }
+
+  if (!empty($term_image)) {
     $header .= '<div class="clear-block"></div>';
   }

@@ -2410,10 +2410,9 @@ function theme_faq_child_category_header
 function theme_faq_answer_category_header($term, $term_image) {
   $hdr = "h5";
   if ($term->depth > 0) $hdr = "h6";
-  $answer_header = "<$hdr class=\"faq_header\">";
-  $answer_header .= $term_image;
+  $answer_header = $term_image;
+  $answer_header .= "<$hdr class=\"faq_header\">";
   $answer_header .= check_plain($term->name) ."</$hdr>\n";
-  $answer_header .= '<div class="clear-block"></div>';

   return $answer_header;
 }