diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php
index ae7678258bb..e866a62530a 100644
--- a/mod/feedback/delete_template.php
+++ b/mod/feedback/delete_template.php
@@ -138,4 +138,3 @@ if($shoulddelete == 1) {
 
 echo $OUTPUT->footer();
 
-?>
\ No newline at end of file
diff --git a/mod/feedback/import.php b/mod/feedback/import.php
index f065bdadc93..73cd1459aac 100644
--- a/mod/feedback/import.php
+++ b/mod/feedback/import.php
@@ -287,4 +287,3 @@
             return $textlib->convert($text, $enc);
         }
     }
-?>
\ No newline at end of file
diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index 3a4edd7f1c5..8916ca79c2b 100644
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -305,4 +305,3 @@ if($do_show == 'showoneentry') {
 
 echo $OUTPUT->footer();
 
-?>
\ No newline at end of file
diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
index 70d4251be8a..63688b05cfd 100644
--- a/mod/feedback/show_entries_anonym.php
+++ b/mod/feedback/show_entries_anonym.php
@@ -226,4 +226,3 @@ if($showcompleted) {
 
 echo $OUTPUT->footer();
 
-?>
\ No newline at end of file
diff --git a/mod/feedback/show_nonrespondents.php b/mod/feedback/show_nonrespondents.php
index 92a3d82dbfb..4fb3ff81517 100644
--- a/mod/feedback/show_nonrespondents.php
+++ b/mod/feedback/show_nonrespondents.php
@@ -240,10 +240,10 @@
         }
         if(has_capability('moodle/course:bulkmessaging', $coursecontext)) {
             $usehtmleditor = can_use_html_editor();
-            echo '<br /><div class="buttons">';
+            echo '<div class="buttons"><br />';
             echo '<input type="button" id="checkall" value="'.get_string('selectall').'" /> ';
             echo '<input type="button" id="checknone" value="'.get_string('deselectall').'" /> ';
-            echo '</div';
+            echo '</div>';
             echo '<fieldset class="clearfix">';
             echo '<legend class="ftoggler">'.get_string('send_message', 'feedback').'</legend>';
             echo '<div><label for="feedback_subject">'.get_string('subject', 'feedback').'&nbsp;</label><input type="text" id="feedback_subject" size="50" maxlength="255" name="subject" value="'.$subject.'" /></div>';
@@ -257,10 +257,10 @@
             echo '<br /><div class="buttons">';
             echo '<input type="submit" name="send_message" value="'.get_string('send', 'feedback').'" />';
             echo '</div>';
-            echo '</fieldset>';
             echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
             echo '<input type="hidden" name="action" value="sendmessage" />';
             echo '<input type="hidden" name="id" value="'.$id.'" />';
+            echo '</fieldset>';
             echo '</form>';
             //include the needed js
             $module = array('name'=>'mod_feedback', 'fullpath'=>'/mod/feedback/feedback.js');
@@ -277,4 +277,3 @@
 
     echo $OUTPUT->footer();
 
-?>
\ No newline at end of file