diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php
index e77cb44c443..e503179a0d1 100644
--- a/mod/glossary/edit.php
+++ b/mod/glossary/edit.php
@@ -185,7 +185,10 @@ if (!empty($id)) {
 $PAGE->set_title(format_string($glossary->name));
 $PAGE->set_heading($course->fullname);
 echo $OUTPUT->header();
-echo $OUTPUT->heading(format_string($glossary->name));
+echo $OUTPUT->heading(format_string($glossary->name), 2);
+if ($glossary->intro) {
+    echo $OUTPUT->box(format_module_intro('glossary', $glossary, $cm->id), 'generalbox', 'intro');
+}
 
 $mform->display();
 
diff --git a/mod/glossary/editcategories.php b/mod/glossary/editcategories.php
index 92daac29a5c..c2bfaafe42b 100644
--- a/mod/glossary/editcategories.php
+++ b/mod/glossary/editcategories.php
@@ -78,6 +78,7 @@ if (!empty($action)) {
 $PAGE->set_title(format_string($glossary->name));
 $PAGE->set_heading($course->fullname);
 echo $OUTPUT->header();
+echo $OUTPUT->heading(format_string($glossary->name), 2);
 
 // Prepare format_string/text options
 $fmtoptions = array(
@@ -106,7 +107,7 @@ if ( $hook >0 ) {
             add_to_log($course->id, "glossary", "edit category", "editcategories.php?id=$cm->id", $hook,$cm->id);
 
         } else {
-            echo "<h3 class=\"main\">" . get_string("edit"). " " . get_string("category","glossary") . "</h3>";
+            echo $OUTPUT->heading(format_string(get_string("edit"). " " . get_string("category","glossary")), 3);
 
             $name = $category->name;
             $usedynalink = $category->usedynalink;
@@ -128,7 +129,7 @@ if ( $hook >0 ) {
 
             redirect("editcategories.php?id=$cm->id");
         } else {
-            echo "<p>" . get_string("delete"). " " . get_string("category","glossary"). "</p>";
+            echo $OUTPUT->heading(format_string(get_string("delete"). " " . get_string("category","glossary")), 3);
 
             echo $OUTPUT->box_start('generalbox boxaligncenter errorboxcontent boxwidthnarrow');
             echo "<div class=\"boxaligncenter deletecatconfirm\">".format_string($category->name, true, $fmtoptions)."<br/>";
diff --git a/mod/glossary/index.php b/mod/glossary/index.php
index b20829d1315..47ec16ecc8e 100644
--- a/mod/glossary/index.php
+++ b/mod/glossary/index.php
@@ -35,6 +35,7 @@ $PAGE->navbar->add($strglossarys, "index.php?id=$course->id");
 $PAGE->set_title($strglossarys);
 $PAGE->set_heading($course->fullname);
 echo $OUTPUT->header();
+echo $OUTPUT->heading(format_string($strglossarys), 2);
 
 /// Get all the appropriate data
 
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 239aebb80d6..0046b8cfeb0 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -1085,7 +1085,7 @@ function glossary_print_entry_default ($entry, $glossary, $cm) {
 
     require_once($CFG->libdir . '/filelib.php');
 
-    echo '<h3>'. strip_tags($entry->concept) . ': </h3>';
+    echo $OUTPUT->heading(strip_tags($entry->concept), 4);
 
     $definition = $entry->definition;
 
@@ -1105,13 +1105,13 @@ function glossary_print_entry_default ($entry, $glossary, $cm) {
 }
 
 /**
- * Print glossary concept/term as a heading &lt;h3>
+ * Print glossary concept/term as a heading &lt;h4>
  * @param object $entry
  */
 function  glossary_print_entry_concept($entry, $return=false) {
     global $OUTPUT;
 
-    $text = html_writer::tag('h3', format_string($entry->concept));
+    $text = $OUTPUT->heading(format_string($entry->concept), 4);
     if (!empty($entry->highlight)) {
         $text = highlight($entry->highlight, $text);
     }
diff --git a/mod/glossary/tabs.php b/mod/glossary/tabs.php
index f4c8ea86bb1..bafd4d1c700 100644
--- a/mod/glossary/tabs.php
+++ b/mod/glossary/tabs.php
@@ -102,9 +102,9 @@
         default:
             glossary_print_alphabet_menu($cm, $glossary, "letter", $hook, $sortkey, $sortorder);
             if ($mode == 'search' and $hook) {
-                echo "<h3>$strsearch: $hook</h3>";
+                echo html_writer::tag('div', "$strsearch: $hook");
             }
         break;
     }
-    echo '<hr />';
+    echo html_writer::empty_tag('hr');
 ?>
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 1290cdfdf98..3c852dbd22b 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -263,6 +263,7 @@ if ($tab == GLOSSARY_APPROVAL_VIEW) {
 } else { /// Print standard header
     echo $OUTPUT->header();
 }
+echo $OUTPUT->heading(format_string($glossary->name), 2);
 
 /// All this depends if whe have $showcommonelements
 if ($showcommonelements) {
@@ -449,7 +450,7 @@ if ($allentries) {
                     echo '<th >';
                 }
 
-                echo $OUTPUT->heading($pivottoshow);
+                echo $OUTPUT->heading($pivottoshow, 3);
                 echo "</th></tr></table></div>\n";
 
             }