diff --git a/course/view.php b/course/view.php
index b21293dc10f..766a52aa88d 100644
--- a/course/view.php
+++ b/course/view.php
@@ -95,7 +95,7 @@ function print_side_block($heading="", $list=NULL, $footer="", $icons=NULL) {
             } else {
                 echo "";
             }
-            echo "</TD>\n<TD WIDTH=100%>";
+            echo "</TD>\n<TD WIDTH=100% VALIGN=top>";
             echo "<P><FONT SIZE=2>$string</FONT></P>";
             echo "</TD></TR>\n";
         }
diff --git a/mod/choice/index.php b/mod/choice/index.php
index 65ea5068768..56cf165d872 100644
--- a/mod/choice/index.php
+++ b/mod/choice/index.php
@@ -32,8 +32,16 @@
 
     $timenow = time();
 
-    $table->head  = array ("Week", "Question", "Answer");
-    $table->align = array ("CENTER", "LEFT", "CENTER");
+    if ($course->format == "weeks") {
+        $table->head  = array ("Week", "Question", "Answer");
+        $table->align = array ("CENTER", "LEFT", "LEFT");
+    } else if ($course->format == "topics") {
+        $table->head  = array ("Topic", "Question", "Answer");
+        $table->align = array ("CENTER", "LEFT", "LEFT");
+    } else {
+        $table->head  = array ("Question", "Answer");
+        $table->align = array ("LEFT", "LEFT");
+    }
 
     foreach ($choices as $choice) {
         $answer = $answers[$choice->id];
@@ -49,9 +57,14 @@
                 break;
         }
 
-        $table->data[] = array ("<P>$choice->section</P>",
-                                "<P><A HREF=\"view.php?id=$choice->coursemodule\">$choice->name</A></P>",
-                                "<P>$aa</P>");
+        if ($course->format == "weeks" || $course->format == "topics") {
+            $table->data[] = array ("$choice->section",
+                                    "<A HREF=\"view.php?id=$choice->coursemodule\">$choice->name</A>",
+                                    "$aa");
+        } else {
+            $table->data[] = array ("<A HREF=\"view.php?id=$choice->coursemodule\">$choice->name</A>",
+                                    "$aa");
+        }
     }
     print_table($table);
 
diff --git a/mod/survey/index.php b/mod/survey/index.php
index 42e95218a22..71f4d6d186c 100644
--- a/mod/survey/index.php
+++ b/mod/survey/index.php
@@ -21,8 +21,16 @@
         notice("There are no surveys.", "../../course/view.php?id=$course->id");
     }
     
-    $table->head  = array ("Week", "Name", "Status");
-    $table->align = array ("CENTER", "LEFT", "LEFT");
+    if ($course->format == "weeks") {
+        $table->head  = array ("Week", "Name", "Status");
+        $table->align = array ("CENTER", "LEFT", "LEFT");
+    } else if ($course->format == "topics") {
+        $table->head  = array ("Topic", "Name", "Status");
+        $table->align = array ("CENTER", "LEFT", "LEFT");
+    } else {
+        $table->head  = array ("Name", "Status");
+        $table->align = array ("LEFT", "LEFT");
+    }
 
     foreach ($surveys as $survey) {
         if (survey_already_done($survey->id, $USER->id)) {
@@ -30,9 +38,14 @@
         } else {
             $ss = "<A HREF=\"view.php?id=$survey->coursemodule\">Not done yet</A>";
         }
-        $table->data[] = array ("$survey->section", 
-                                "<A HREF=\"view.php?id=$survey->coursemodule\">$survey->name</A>",
-                                "$ss");
+        if ($course->format == "weeks" or $course->format == "topics") {
+            $table->data[] = array ("$survey->section", 
+                                    "<A HREF=\"view.php?id=$survey->coursemodule\">$survey->name</A>",
+                                    "$ss");
+        } else {
+            $table->data[] = array ("<A HREF=\"view.php?id=$survey->coursemodule\">$survey->name</A>",
+                                    "$ss");
+        }
     }
 
     print_table($table);