diff --git a/mod/glossary/formats/continuous/continuous_format.php b/mod/glossary/formats/continuous/continuous_format.php
index 0ba951be2b5..10135f88ccd 100644
--- a/mod/glossary/formats/continuous/continuous_format.php
+++ b/mod/glossary/formats/continuous/continuous_format.php
@@ -4,7 +4,7 @@ function glossary_show_entry_continuous($course, $cm, $glossary, $entry, $mode='
 
     global $USER;
 
-    echo '<table class="glossarypost continuous">';
+    echo '<table class="glossarypost continuous" cellspacing="0">';
     echo '<tr valign="top">';
     echo '<td class="entry">';
     glossary_print_entry_approval($cm, $entry, $mode);
diff --git a/mod/glossary/formats/dictionary/dictionary_format.php b/mod/glossary/formats/dictionary/dictionary_format.php
index 75af2777109..784d22f48d7 100644
--- a/mod/glossary/formats/dictionary/dictionary_format.php
+++ b/mod/glossary/formats/dictionary/dictionary_format.php
@@ -4,7 +4,7 @@ function glossary_show_entry_dictionary($course, $cm, $glossary, $entry, $mode='
 
     global $CFG, $USER;
 
-    echo '<table class="glossarypost dictionary">';
+    echo '<table class="glossarypost dictionary" cellspacing="0">';
     echo '<tr valign="top">';
     echo '<td class="entry">';
     glossary_print_entry_approval($cm, $entry, $mode);
diff --git a/mod/glossary/formats/encyclopedia/encyclopedia_format.php b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
index 90ae92090cd..5dbd989fdf8 100644
--- a/mod/glossary/formats/encyclopedia/encyclopedia_format.php
+++ b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
@@ -9,7 +9,7 @@ function glossary_show_entry_encyclopedia($course, $cm, $glossary, $entry, $mode
 
     $return = false;
     if ($entry) {
-        echo '<table class="glossarypost encyclopedia" align="center">';
+        echo '<table class="glossarypost encyclopedia" cellspacing="0">';
         echo '<tr valign="top">';
         echo '<td class="picture">';
         
@@ -48,6 +48,7 @@ function glossary_show_entry_encyclopedia($course, $cm, $glossary, $entry, $mode
 
         if ($printicons or $ratings or $aliases) {
             echo '</td></tr>';
+            echo '<tr>';
             echo '<td class="left">&nbsp;</td>';
             echo '<td colspan="2" class="entrylowersection">';
             $return = glossary_print_entry_lower_section($course, $cm, $glossary, $entry,$mode,$hook,$printicons,$ratings, $aliases);
diff --git a/mod/glossary/formats/entrylist/entrylist_format.php b/mod/glossary/formats/entrylist/entrylist_format.php
index 71f198dc7ba..f8049d26074 100644
--- a/mod/glossary/formats/entrylist/entrylist_format.php
+++ b/mod/glossary/formats/entrylist/entrylist_format.php
@@ -5,7 +5,7 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode=''
 
     $return = false;
 
-    echo '<table class="glossarypost entrylist">';
+    echo '<table class="glossarypost entrylist" cellspacing="0">';
 
     echo '<tr valign="top">';
     echo '<td class="entry">';
diff --git a/mod/glossary/formats/faq/faq_format.php b/mod/glossary/formats/faq/faq_format.php
index 7cd49f84fc7..e35ab0e061b 100644
--- a/mod/glossary/formats/faq/faq_format.php
+++ b/mod/glossary/formats/faq/faq_format.php
@@ -5,7 +5,7 @@ function glossary_show_entry_faq($course, $cm, $glossary, $entry, $mode="", $hoo
     $return = false;
     if ( $entry ) {
 
-        echo '<table class="glossarypost faq">';
+        echo '<table class="glossarypost faq" cellspacing="0">';
 
         echo '<tr valign="top">';
         echo '<td class="entryheader">';
diff --git a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
index 0a89ce847ae..61848861516 100644
--- a/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
+++ b/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
@@ -9,7 +9,7 @@ function glossary_show_entry_fullwithauthor($course, $cm, $glossary, $entry, $mo
 
     $return = false;
     if ($entry) {
-        echo '<table class="glossarypost fullwithauthor">';
+        echo '<table class="glossarypost fullwithauthor" cellspacing="0">';
         echo '<tr valign="top">';
         
         echo '<td class="picture">';
diff --git a/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php b/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
index 3c610a62f4d..5f5e589f421 100644
--- a/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
+++ b/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
@@ -6,7 +6,7 @@ function glossary_show_entry_fullwithoutauthor($course, $cm, $glossary, $entry,
 
     $return = false;
     if ($entry) {
-        echo "\n".'<table class="glossarypost fullwithoutauthor" align="center">';
+        echo '<table class="glossarypost fullwithoutauthor" cellspacing="0">';
         echo '<tr valign="top">';
 
         echo '<td class="entryheader">';
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 8c393bd49f0..b30cc9489cf 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -1965,9 +1965,8 @@ function glossary_print_ratings_mean($entryid, $scale) {
             $strratings = get_string("ratings", "glossary");
         }
 
-        echo "<font size=\"-1\">$strratings: ";
+        echo "$strratings: ";
         link_to_popup_window ("/mod/glossary/report.php?id=$entryid", "ratings", $mean, 400, 600);
-        echo "</font>";
     }
 }
 
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 0c9e5e24674..6f93ae7b8b9 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -378,7 +378,7 @@
 
 
     if ($ratingsmenuused) {
-        echo "<p><center><input type=\"submit\" value=\"".get_string("sendinratings", "glossary")."\" />";
+        echo "<center><input type=\"submit\" value=\"".get_string("sendinratings", "glossary")."\" />";
         if ($glossary->scale < 0) {
             if ($scale = get_record("scale", "id", abs($glossary->scale))) {
                 print_scale_menu_helpbutton($course->id, $scale );