diff --git a/blocks/tags/lang/en/block_tags.php b/blocks/tags/lang/en/block_tags.php
index 0643b911d66..265cd5aeec0 100644
--- a/blocks/tags/lang/en/block_tags.php
+++ b/blocks/tags/lang/en/block_tags.php
@@ -82,6 +82,7 @@ $string['pluginname'] = 'Tags';
 $string['select'] = 'Select...';
 $string['showcoursetags'] = 'Show course tags';
 $string['showcoursetagsdef'] = 'Display the course tagging features in the tags block, allowing students to tag courses.';
+$string['suggestedtagthisunit'] = 'Suggested tag to this course:';
 $string['tags'] = 'tags';
 $string['tagthisunit'] = 'Tag this course:';
 $string['tagunits'] = 'to tag your favourite courses';
diff --git a/tag/coursetags_edit.php b/tag/coursetags_edit.php
index 53e6be65186..49930b11340 100644
--- a/tag/coursetags_edit.php
+++ b/tag/coursetags_edit.php
@@ -147,6 +147,7 @@ echo $OUTPUT->header();
         // Print the add and delete form
         coursetag_get_jscript();
         $edittagthisunit = get_string('edittagthisunit', $tagslang);
+        $suggestedtagthisunit = get_string('suggestedtagthisunit', $tagslang);
         $arrowtitle = get_string('arrowtitle', $tagslang);
         $sesskey = sesskey();
         $leftarrow = $OUTPUT->pix_url('t/arrow_left');
@@ -159,12 +160,19 @@ echo $OUTPUT->header();
                 <div class="coursetag_edit_centered">
                     <div class="coursetag_edit_row">
                         <div class="coursetag_edit_left">
-                            $edittagthisunit
+                            <label class="accesshide" for="coursetag_sug_keyword">$suggestedtagthisunit</label>
                         </div>
                         <div class="coursetag_edit_right">
                             <div class="coursetag_form_input1">
-                                <input type="text" name="coursetag_sug_keyword" class="coursetag_form_input1a" disabled="disabled" />
+                                <input type="text" name="coursetag_sug_keyword" id="coursetag_sug_keyword" class="coursetag_form_input1a" disabled="disabled" />
                             </div>
+                        </div>
+                    </div>
+                    <div class="coursetag_edit_row">
+                        <div class="coursetag_edit_left">
+                            <label for="coursetag_new_tag">$edittagthisunit</label>
+                        </div>
+                        <div class="coursetag_edit_right">
                             <div class="coursetag_form_input2">
                                 <input type="text" name="coursetag_new_tag" id="coursetag_new_tag" class="coursetag_form_input2a"
                                     onfocus="ctags_getKeywords()" onkeyup="ctags_getKeywords()" maxlength="50" />
@@ -182,10 +190,12 @@ EOT;
             $outstr .= <<<EOT1
                     <div class="coursetag_edit_row">
                         <div class="coursetag_edit_left">
-                            $editdeletemytag
+                            <label for="del_tag">
+                                $editdeletemytag
+                            </label>
                         </div>
                         <div class="coursetag_edit_right">
-                            <select name="del_tag">
+                            <select id="del_tag" name="del_tag">
                                 $selectoptions
                             </select>
                         </div>
diff --git a/tag/locallib.php b/tag/locallib.php
index 095bbda04a2..158524c72f3 100644
--- a/tag/locallib.php
+++ b/tag/locallib.php
@@ -233,6 +233,7 @@ function tag_print_search_box($return=false) {
     $output = $OUTPUT->box_start('','tag-search-box');
     $output .= '<form action="'.$CFG->wwwroot.'/tag/search.php" style="display:inline">';
     $output .= '<div>';
+    $output .= '<label class="accesshide" for="searchform_search">'.get_string('searchtags', 'tag').'</label>';
     $output .= '<input id="searchform_search" name="query" type="text" size="40" />';
     $output .= '<button id="searchform_button" type="submit">'. get_string('search', 'tag') .'</button><br />';
     $output .= '</div>';
diff --git a/tag/manage.php b/tag/manage.php
index 2a886d3c7aa..ad3cafeb969 100644
--- a/tag/manage.php
+++ b/tag/manage.php
@@ -246,6 +246,7 @@ $totalcount = $DB->count_records_sql("
 $table->initialbars(true); // always initial bars
 $table->pagesize($perpage, $totalcount);
 
+//@todo MDL-35474 convert to mform
 echo '<form class="tag-management-form" method="post" action="'.$CFG->wwwroot.'/tag/manage.php"><div>';
 
 //retrieve tags from DB
@@ -253,25 +254,32 @@ if ($tagrecords = $DB->get_records_sql($query, $params, $table->get_page_start()
 
     //populate table with data
     foreach ($tagrecords as $tag) {
-        $id             =   $tag->id;
-        $name           =   '<a href="'.$CFG->wwwroot.'/tag/index.php?id='.$tag->id.'">'. tag_display_name($tag) .'</a>';
-        $owner          =   '<a href="'.$CFG->wwwroot.'/user/view.php?id='.$tag->owner.'">' . fullname($tag) . '</a>';
-        $count          =   $tag->count;
-        $flag           =   $tag->flag;
-        $timemodified   =   format_time(time() - $tag->timemodified);
-        $checkbox       =   '<input type="checkbox" name="tagschecked[]" value="'.$tag->id.'" />';
-        $text           =   '<input type="text" name="newname['.$tag->id.']" />';
-        $tagtype        =   html_writer::select($existing_tagtypes, 'tagtypes['.$tag->id.']', $tag->tagtype, false);
+        $id             = $tag->id;
+        $params         = array('id' => $tag->id);
+        $taglink        = new moodle_url($CFG->wwwroot . '/tag/index.php', $params);
+        $name           = html_writer::link($taglink, tag_display_name($tag));
+        $params         = array('id' => $tag->owner);
+        $ownerlink      = new moodle_url($CFG->wwwroot . '/user/view.php', $params);
+        $owner          = html_writer::link($ownerlink, fullname($tag));
+        $count          = $tag->count;
+        $flag           = $tag->flag;
+        $timemodified   = format_time(time() - $tag->timemodified);
+        $checkbox       = html_writer::tag('input', '', array('type' => 'checkbox', 'name' => 'tagschecked[]', 'value' => $tag->id));
+        $attrs          = array('type' => 'text', 'id' => 'newname_' . $tag->id, 'name' => 'newname["'.$tag->id.'"]');
+        $text           = html_writer::label(get_string('newname', 'tag'), 'newname_' . $tag->id, false, array('class' => 'accesshide'));
+        $text          .= html_writer::empty_tag('input', $attrs);
+        $tagtype        = html_writer::label(get_string('tagtype', 'tag'), 'menutagtypes'. $tag->id, false, array('class' => 'accesshide'));
+        $tagtype       .= html_writer::select($existing_tagtypes, 'tagtypes['.$tag->id.']', $tag->tagtype, false, array('id' => 'menutagtypes'. $tag->id));
 
         //if the tag if flagged, highlight it
         if ($tag->flag > 0) {
-            $id = '<span class="flagged-tag">' . $id . '</span>';
-            $name = '<span class="flagged-tag">' . $name . '</span>';
-            $owner = '<span class="flagged-tag">' . $owner . '</span>';
-            $count = '<span class="flagged-tag">' . $count . '</span>';
-            $flag = '<span class="flagged-tag">' . $flag . '</span>';
-            $timemodified = '<span class="flagged-tag">' . $timemodified . '</span>';
-            $tagtype = '<span class="flagged-tag">'. $tagtype. '</span>';
+            $id = html_writer::tag('span', $id, array('class' => 'flagged-tag'));
+            $name = html_writer::tag('span', $name, array('class' => 'flagged-tag'));
+            $owner = html_writer::tag('span', $owner, array('class' => 'flagged-tag'));
+            $count = html_writer::tag('span', $count, array('class' => 'flagged-tag'));
+            $flag = html_writer::tag('span', $flag, array('class' => 'flagged-tag'));
+            $timemodified = html_writer::tag('span', $timemodified, array('class' => 'flagged-tag'));
+            $tagtype = html_writer::tag('span', $tagtype, array('class' => 'flagged-tag'));
         }
 
         $data = array($id, $name, $owner, $count, $flag, $timemodified, $text, $tagtype, $checkbox);
@@ -279,31 +287,43 @@ if ($tagrecords = $DB->get_records_sql($query, $params, $table->get_page_start()
         $table->add_data($data);
     }
 
-    echo '<input type="button" onclick="checkall()" value="'.get_string('selectall').'" /> ';
-    echo '<input type="button" onclick="checknone()" value="'.get_string('deselectall').'" /> ';
-    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" /> ';
-    echo '<br/><br/>';
-    echo '<select id="menuformaction" name="action">
-                <option value="" selected="selected">'. get_string('withselectedtags', 'tag') .'</option>
-                <option value="reset">'. get_string('resetflag', 'tag') .'</option>
-                <option value="delete">'. get_string('delete', 'tag') .'</option>
-                <option value="changetype">'. get_string('changetype', 'tag') .'</option>
-                <option value="changename">'. get_string('changename', 'tag') .'</option>
-            </select>';
+    echo html_writer::empty_tag('input', array('type' => 'button', 'onclick' => 'checkall()', 'value' => get_string('selectall')));
+    echo html_writer::empty_tag('input', array('type' => 'button', 'onclick' => 'checknone()', 'value' => get_string('deselectall')));
+    echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey()));
+    echo html_writer::empty_tag('br');
+    echo html_writer::empty_tag('br');
 
-    echo '<button id="tag-management-submit" type="submit">'. get_string('ok') .'</button>';
+    echo html_writer::label(get_string('withselectedtags', 'tag'), 'menuformaction', false, array('class' => 'accesshide'));
+    $options = array('' => get_string('withselectedtags', 'tag'),
+                     'reset' => get_string('resetflag', 'tag'),
+                     'delete' => get_string('delete', 'tag'),
+                     'changetype' => get_string('changetype', 'tag'),
+                     'changename' => get_string('changename', 'tag'));
+    echo html_writer::select($options, 'action', '', array(), array('id' => 'menuformaction'));
+
+    echo html_writer::tag('button', get_string('ok'), array('id' => 'tag-management-submit', 'type' => 'submit'));
 }
 
 $table->print_html();
+
+//@todo MDL-35474 convert to mform
 echo '</div></form>';
 
 if ($perpage == SHOW_ALL_PAGE_SIZE) {
-    echo '<div id="showall"><a href="'. $baseurl .'&amp;perpage='. DEFAULT_PAGE_SIZE .'">'. get_string('showperpage', '', DEFAULT_PAGE_SIZE) .'</a></div>';
+    echo html_writer::start_tag('div', array('id' => 'showall'));
+    $params = array('perpage' => DEFAULT_PAGE_SIZE);
+    $url = new moodle_url($baseurl, $params);
+    echo html_writer::link($url, get_string('showperpage', '', DEFAULT_PAGE_SIZE));
+    echo html_writer::end_tag('div');
 
 } else if ($totalcount > 0 and $perpage < $totalcount) {
-    echo '<div id="showall"><a href="'. $baseurl .'&amp;perpage='. SHOW_ALL_PAGE_SIZE .'">'. get_string('showall', '', $totalcount) .'</a></div>';
+    echo html_writer::start_tag('div', array('id' => 'showall'));
+    $params = array('perpage' => SHOW_ALL_PAGE_SIZE);
+    $url = new moodle_url($baseurl, $params);
+    echo html_writer::link($url, get_string('showall', '', $totalcount));
+    echo html_writer::end_tag('div');
 }
 
-echo '<br/>';
+echo html_writer::empty_tag('br');
 
 echo $OUTPUT->footer();