diff --git a/mod/glossary/formats/2.php b/mod/glossary/formats/2.php
index 9fe13943142..8eb95e9343d 100644
--- a/mod/glossary/formats/2.php
+++ b/mod/glossary/formats/2.php
@@ -8,7 +8,7 @@ function glossary_print_entry_by_format($course, $cm, $glossary, $entry, $mode="
     $user = get_record("user", "id", $entry->userid);
     $strby = get_string("writtenby", "glossary");
 
-    echo "\n<table border=0 width=95% cellspacing=0 valign=top cellpadding=3 class=forumpost align=center>";
+    echo "\n<br /><table border=0 width=95% cellspacing=0 valign=top cellpadding=3 class=forumpost align=center>";
 
     echo "\n<tr>";
     echo "\n<td bgcolor=\"$colour\" width=35 valign=top class=\"forumpostpicture\">";
@@ -17,7 +17,7 @@ function glossary_print_entry_by_format($course, $cm, $glossary, $entry, $mode="
         print_user_picture($user->id, $course->id, $user->picture);
 
         echo "</td>";
-        echo "<td nowrap valign=\"top\" width=100% bgcolor=\"$THEME->cellheading\" class=\"forumpostheader\">";
+        echo "<td valign=\"top\" width=100% bgcolor=\"$THEME->cellheading\" class=\"forumpostheader\">";
 
         glossary_print_entry_approval($cm, $entry, $mode);
         glossary_print_entry_attachment($entry,"html","right");
diff --git a/mod/glossary/formats/3.php b/mod/glossary/formats/3.php
index ab1920adcb3..9df16b24b26 100644
--- a/mod/glossary/formats/3.php
+++ b/mod/glossary/formats/3.php
@@ -8,7 +8,7 @@ function glossary_print_entry_by_format($course, $cm, $glossary, $entry, $mode="
     $user = get_record("user", "id", $entry->userid);
     $strby = get_string("writtenby", "glossary");
 
-    echo "\n<table border=0 width=95% cellspacing=0 valign=top cellpadding=3 class=forumpost align=center>";
+    echo "\n<br /><table border=0 width=95% cellspacing=0 valign=top cellpadding=3 class=forumpost align=center>";
 
     echo "\n<tr>";
     echo "\n<td bgcolor=\"$colour\" width=35 valign=top class=\"forumpostpicture\">";
@@ -16,7 +16,7 @@ function glossary_print_entry_by_format($course, $cm, $glossary, $entry, $mode="
     if ($entry) {
         print_user_picture($user->id, $course->id, $user->picture);
         echo "</td>";
-        echo "<td align=\"top\" nowrap width=100% bgcolor=\"$THEME->cellheading\" class=\"forumpostheader\">";
+        echo "<td align=\"top\" width=100% bgcolor=\"$THEME->cellheading\" class=\"forumpostheader\">";
         glossary_print_entry_approval($cm, $entry, $mode);
         echo "<b>";
         glossary_print_entry_concept($entry);
diff --git a/mod/glossary/formats/4.php b/mod/glossary/formats/4.php
index 0b00e13d0bd..87bc412a9cc 100644
--- a/mod/glossary/formats/4.php
+++ b/mod/glossary/formats/4.php
@@ -6,7 +6,7 @@ function glossary_print_entry_by_format($course, $cm, $glossary, $entry, $mode="
     if ( $entry ) {
         $colour = $THEME->cellheading2;
 
-        echo '<table border=1 cellspacing=0 width=95% valign=top cellpadding=10>';
+        echo '<br /><table border=0 cellspacing=0 width=95% valign=top cellpadding=10 class=forumpost>';
 
         echo '<tr>';
         echo "<td width=100% bgcolor=\"$colour\">";
diff --git a/mod/glossary/formats/5.php b/mod/glossary/formats/5.php
index 13be389e88c..9bf3cb880a5 100644
--- a/mod/glossary/formats/5.php
+++ b/mod/glossary/formats/5.php
@@ -6,17 +6,17 @@ function glossary_print_entry_by_format($course, $cm, $glossary, $entry, $mode="
     $colour = $THEME->cellheading2;
     $return = false;
 
-    echo "\n<table border=1 cellspacing=0 width=95% valign=top cellpadding=10>";
+    echo "\n<br /><table border=0 width=95% cellspacing=0 valign=top cellpadding=3 class=forumpost align=center>";
 
     echo "\n<tr>";
-    echo "<td width=100% bgcolor=\"$colour\">";
+    echo "<td width=100% bgcolor=\"$THEME->cellheading\">";
     glossary_print_entry_approval($cm, $entry, $mode);
     if ($entry) {
         glossary_print_entry_attachment($entry,"html","right");
         echo "<b>";
         glossary_print_entry_concept($entry);
         echo "</b><br />";
-        echo "&nbsp;&nbsp;<font size=1>".get_string("lastedited").": ".userdate($entry->timemodified)."</font>";
+        echo "<font size=1>".get_string("lastedited").": ".userdate($entry->timemodified)."</font>";
         echo "</tr>";
         echo "\n<tr><td width=100% bgcolor=\"$THEME->cellcontent\">";
 		
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 2f9dab24209..80b71d7f5bd 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -185,7 +185,7 @@ function glossary_user_complete($course, $user, $mod, $glossary) {
              $glossary->displayformat == GLOSSARY_FORMAT_CONTINUOUS ) {
             print_simple_box_start("center","70%");
         } else {
-            echo '<table width="95%" boder="0"><tr><td>';
+            echo '<table width="95%" border="0"><tr><td>';
         }
         foreach ($entries as $entry) {
             $cm = get_coursemodule_from_instance("glossary", $glossary->id, $course->id);
@@ -508,7 +508,8 @@ function glossary_print_entry_definition($entry) {
         $definition = str_replace(array_keys($tags),$tags,$definition);
     }
 
-    $text = format_text($definition, $entry->format);
+    $options->para = false;
+    $text = format_text($definition, $entry->format,$options);
     if (!empty($entry->highlight)) {
         $text = highlight($entry->highlight, $text);
     }
@@ -661,7 +662,7 @@ function glossary_print_entry_by_default($course, $cm, $glossary, $entry,$mode="
     $colour = $THEME->cellheading2;
 
     echo "\n<TR>";
-    echo "<TD WIDTH=100% class=\"generalbox\" valign=\"top\" BGCOLOR=\"#FFFFFF\">";
+    echo "<TD WIDTH=100% valign=\"top\" BGCOLOR=\"#FFFFFF\">";
         glossary_print_entry_approval($cm, $entry, $mode);
         glossary_print_entry_attachment($entry,"html","right");
         echo "<b>";
@@ -1111,6 +1112,10 @@ for ($row = 0; $row < $numrows; $row++) {
                          $currentcolor = $tabcolor;
                          $currentstyle = 'generaltab';
                     }
+
+                    if (!isset($data[$tabproccessed]->link)) {
+                        $data[$tabproccessed]->link = NULL;
+                    }
                     echo "<td class=\"$currentstyle\" width=\"$tabwidth%\" bgcolor=\"$currentcolor\" align=\"center\"><b>";
                     if ($tabproccessed != $currenttab and $data[$tabproccessed]->link) {
                         echo "<a href=\"" . $data[$tabproccessed]->link . "\">";
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index eb660f087b7..d3f7f505499 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -439,7 +439,6 @@
                 if ( glossary_print_entry($course, $cm, $glossary, $entry, $mode, $hook,1,$displayformat,$ratings) ) {
                     $ratingsmenuused = true;
                 }
-                echo "<br />";
 
                 $entriesshown++;
             }