diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 74088c3a6f0..c1cb1ccc349 100644
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -154,13 +154,7 @@ while ($section <= $course->numsections) {
 
     if (!empty($displaysection) and $displaysection != $section) {  // Check this topic is visible
         if ($showsection) {
-            $strsummary = strip_tags(format_string($thissection->summary,true));
-            if (strlen($strsummary) < 57) {
-                $strsummary = ' - '.$strsummary;
-            } else {
-                $strsummary = ' - '.substr($strsummary, 0, 60).'...';
-            }
-            $sectionmenu[$section] = s($section.$strsummary);
+            $sectionmenu[$section] = get_section_name($course, $thissection);
         }
         $section++;
         continue;
diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 55cbd2fb49e..470f0532206 100644
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -155,7 +155,7 @@
 
         if (!empty($displaysection) and $displaysection != $section) {  // Check this week is visible
             if ($showsection) {
-                $sectionmenu[$section] = s("$strweek $section |     $weekday - $endweekday");
+                $sectionmenu[$section] = get_section_name($course, $thissection);
             }
             $section++;
             $weekdate = $nextweekdate;
diff --git a/course/view.php b/course/view.php
index 4ca99c8cfcb..6658281c20e 100644
--- a/course/view.php
+++ b/course/view.php
@@ -207,12 +207,15 @@
         // go to another page, (c) clicks Back button - the page will
         // automatically reload. Otherwise it would start with the wrong tick
         // values.
-        print '<form action="."><div><input type="hidden" id="completion_dynamic_change"
-          name="completion_dynamic_change" value="0" /></div></form>';
+        echo html_writer::start_tag('form', array('action'=>'.', 'method'=>'get'));
+        echo html_writer::start_tag('div');
+        echo html_writer::empty_tag('input', array('type'=>'hidden', 'id'=>'completion_dynamic_change', 'name'=>'completion_dynamic_change', 'value'=>'0'));
+        echo html_writer::end_tag('div');
+        echo html_writer::end_tag('form');
     }
 
     // Course wrapper start.
-    echo '<div class="course-content">';
+    echo html_writer::start_tag('div', array('class'=>'course-content'));
 
     $modinfo =& get_fast_modinfo($COURSE);
     get_all_mods($course->id, $mods, $modnames, $modnamesplural, $modnamesused);
@@ -242,16 +245,15 @@
     // Include the actual course format.
     require($CFG->dirroot .'/course/format/'. $course->format .'/format.php');
     // Content wrapper end.
-    echo "</div>\n\n";
+
+    echo html_writer::end_tag('div');
 
     // Use AJAX?
     if ($useajax && has_capability('moodle/course:manageactivities', $context)) {
         // At the bottom because we want to process sections and activities
         // after the relevant html has been generated. We're forced to do this
         // because of the way in which lib/ajax/ajaxcourse.js is written.
-
-        echo '<script type="text/javascript" ';
-        echo "src=\"{$CFG->wwwroot}/lib/ajax/ajaxcourse.js\"></script>\n";
+        echo html_writer::script(false, new moodle_url('/lib/ajax/ajaxcourse.js'));
         $COURSE->javascriptportal->print_javascript($course->id);
     }