diff --git a/backup/moodle1/lib.php b/backup/moodle1/lib.php
index b51b2bba..bdec7e10 100644
--- a/backup/moodle1/lib.php
+++ b/backup/moodle1/lib.php
@@ -22,8 +22,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Choice conversion handler
  */
diff --git a/backup/moodle2/backup_questionnaire_settingslib.php b/backup/moodle2/backup_questionnaire_settingslib.php
index 63f4c35d..c8c163e0 100644
--- a/backup/moodle2/backup_questionnaire_settingslib.php
+++ b/backup/moodle2/backup_questionnaire_settingslib.php
@@ -22,8 +22,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
  // This activity has no particular settings but the inherited from the generic
  // backup_activity_task so here there isn't any class definition, like the ones
  // existing in /backup/moodle2/backup_settingslib.php (activities section).
diff --git a/backup/moodle2/backup_questionnaire_stepslib.php b/backup/moodle2/backup_questionnaire_stepslib.php
index 7af614ca..747b304b 100644
--- a/backup/moodle2/backup_questionnaire_stepslib.php
+++ b/backup/moodle2/backup_questionnaire_stepslib.php
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Define all the backup steps that will be used by the backup_questionnaire_activity_task.
  *
diff --git a/backup/moodle2/restore_questionnaire_stepslib.php b/backup/moodle2/restore_questionnaire_stepslib.php
index 7b537479..9b3b46e6 100644
--- a/backup/moodle2/restore_questionnaire_stepslib.php
+++ b/backup/moodle2/restore_questionnaire_stepslib.php
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Define all the restore steps that will be used by the restore_questionnaire_activity_task.
  *
diff --git a/classes/db/bulk_sql_config.php b/classes/db/bulk_sql_config.php
index cc3a1e0d..dce187cd 100644
--- a/classes/db/bulk_sql_config.php
+++ b/classes/db/bulk_sql_config.php
@@ -16,8 +16,6 @@
 
 namespace mod_questionnaire\db;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * For bulk sql operations on useresponses.
  *
diff --git a/classes/event/all_responses_deleted.php b/classes/event/all_responses_deleted.php
index ce634f0b..af2b1227 100644
--- a/classes/event/all_responses_deleted.php
+++ b/classes/event/all_responses_deleted.php
@@ -24,8 +24,6 @@
 
 namespace mod_questionnaire\event;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The mod_questionnaire all responses deleted event class.
  *
diff --git a/classes/event/all_responses_saved_as_text.php b/classes/event/all_responses_saved_as_text.php
index 867982a6..860b27c0 100644
--- a/classes/event/all_responses_saved_as_text.php
+++ b/classes/event/all_responses_saved_as_text.php
@@ -24,8 +24,6 @@
 
 namespace mod_questionnaire\event;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The mod_questionnaire all_responses_saved_as_text event class.
  *
diff --git a/classes/event/all_responses_viewed.php b/classes/event/all_responses_viewed.php
index 44961418..c2af5318 100644
--- a/classes/event/all_responses_viewed.php
+++ b/classes/event/all_responses_viewed.php
@@ -24,8 +24,6 @@
 
 namespace mod_questionnaire\event;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The mod_questionnaire all_responses_viewed event class.
  *
diff --git a/classes/event/attempt_resumed.php b/classes/event/attempt_resumed.php
index 7b4c0410..c2057e2c 100644
--- a/classes/event/attempt_resumed.php
+++ b/classes/event/attempt_resumed.php
@@ -24,8 +24,6 @@
 
 namespace mod_questionnaire\event;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The mod_questionnaire attempt_resumed event.
  *
diff --git a/classes/event/attempt_saved.php b/classes/event/attempt_saved.php
index 95d28013..b4fc02fe 100644
--- a/classes/event/attempt_saved.php
+++ b/classes/event/attempt_saved.php
@@ -24,8 +24,6 @@
 
 namespace mod_questionnaire\event;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The mod_questionnaire attempt_saved event class.
  *
diff --git a/classes/event/attempt_submitted.php b/classes/event/attempt_submitted.php
index d36366e1..2b82b017 100644
--- a/classes/event/attempt_submitted.php
+++ b/classes/event/attempt_submitted.php
@@ -24,8 +24,6 @@
 
 namespace mod_questionnaire\event;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The mod_questionnaire attempt_submitted event class.
  *
diff --git a/classes/event/course_module_instance_list_viewed.php b/classes/event/course_module_instance_list_viewed.php
index c3d0bd65..f4781d73 100644
--- a/classes/event/course_module_instance_list_viewed.php
+++ b/classes/event/course_module_instance_list_viewed.php
@@ -24,7 +24,6 @@
  */
 
 namespace mod_questionnaire\event;
-defined('MOODLE_INTERNAL') || die();
 
 /**
  * The mod_questionnaire instance list viewed event class.
diff --git a/classes/event/course_module_viewed.php b/classes/event/course_module_viewed.php
index 85d74bae..3c6dbb42 100644
--- a/classes/event/course_module_viewed.php
+++ b/classes/event/course_module_viewed.php
@@ -24,8 +24,6 @@
 
 namespace mod_questionnaire\event;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The mod_survery course module viewed event class.
  *
diff --git a/classes/event/non_respondents_viewed.php b/classes/event/non_respondents_viewed.php
index 462bec23..cc27edf7 100644
--- a/classes/event/non_respondents_viewed.php
+++ b/classes/event/non_respondents_viewed.php
@@ -24,8 +24,6 @@
 
 namespace mod_questionnaire\event;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The mod_questionnaire non_respondents_viewed event class.
  *
diff --git a/classes/event/questionnaire_previewed.php b/classes/event/questionnaire_previewed.php
index 296b19f2..c4607e81 100644
--- a/classes/event/questionnaire_previewed.php
+++ b/classes/event/questionnaire_previewed.php
@@ -24,8 +24,6 @@
 
 namespace mod_questionnaire\event;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The mod_questionnaire questionnaire_previewed event class.
  *
diff --git a/classes/event/response_deleted.php b/classes/event/response_deleted.php
index 393c62ca..2453579d 100644
--- a/classes/event/response_deleted.php
+++ b/classes/event/response_deleted.php
@@ -24,8 +24,6 @@
 
 namespace mod_questionnaire\event;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The mod_questionnaire response_deleted event class.
  *
diff --git a/classes/event/response_viewed.php b/classes/event/response_viewed.php
index 2ae67a88..db0cb69b 100644
--- a/classes/event/response_viewed.php
+++ b/classes/event/response_viewed.php
@@ -24,8 +24,6 @@
 
 namespace mod_questionnaire\event;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The mod_questionnaire response_viewed event class.
  *
diff --git a/classes/question/essay.php b/classes/question/essay.php
index d91be3bf..3e8591bc 100644
--- a/classes/question/essay.php
+++ b/classes/question/essay.php
@@ -93,11 +93,11 @@ protected function question_survey_display($response, $descendantsdata, $blankqu
             $editor = editors_get_preferred_editor();
             $editor->use_editor($name, questionnaire_get_editor_options($this->context));
             $texteditor = html_writer::tag('textarea', $value,
-                            array('id' => $name, 'name' => $name, 'rows' => $rows, 'cols' => $cols, 'class'=>'form-control'));
+                            ['id' => $name, 'name' => $name, 'rows' => $rows, 'cols' => $cols, 'class' => 'form-control']);
         } else {
             $editor = FORMAT_PLAIN;
             $texteditor = html_writer::tag('textarea', $value,
-                            array('id' => $name, 'name' => $name, 'rows' => $rows, 'cols' => $cols));
+                            ['id' => $name, 'name' => $name, 'rows' => $rows, 'cols' => $cols]);
         }
         $output .= $texteditor;
 
@@ -131,9 +131,9 @@ protected function response_survey_display($response) {
      * @param string $helptext
      */
     protected function form_length(\MoodleQuickForm $mform, $helptext = '') {
-        $responseformats = array(
+        $responseformats = [
                         "0" => get_string('formateditor', 'questionnaire'),
-                        "1" => get_string('formatplain', 'questionnaire'));
+                        "1" => get_string('formatplain', 'questionnaire')];
         $mform->addElement('select', 'precise', get_string('responseformat', 'questionnaire'), $responseformats);
         $mform->setType('precise', PARAM_INT);
         return $mform;
@@ -153,7 +153,7 @@ public function supports_mobile() {
      * @param string $helptext
      */
     protected function form_precise(\MoodleQuickForm $mform, $helptext = '') {
-        $choices = array();
+        $choices = [];
         for ($lines = 5; $lines <= 40; $lines += 5) {
             $choices[$lines] = get_string('nlines', 'questionnaire', $lines);
         }
diff --git a/classes/search/activity.php b/classes/search/activity.php
index 25004bb1..3c775a1e 100644
--- a/classes/search/activity.php
+++ b/classes/search/activity.php
@@ -25,8 +25,6 @@
 
 namespace mod_questionnaire\search;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Search area for mod_questionnaire activities.
  *
diff --git a/db/install.php b/db/install.php
index 479cf2bd..2e630363 100644
--- a/db/install.php
+++ b/db/install.php
@@ -22,7 +22,6 @@
  * @copyright  2016 Mike Churchward (mike.churchward@poetopensource.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-defined('MOODLE_INTERNAL') || die();
 
 /**
  * The install function.
diff --git a/db/upgrade.php b/db/upgrade.php
index fe31f36c..daf754d2 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -22,8 +22,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * The module upgrade function.
  * @param int $oldversion
diff --git a/drawchart.php b/drawchart.php
index 1b144892..ab50fe83 100644
--- a/drawchart.php
+++ b/drawchart.php
@@ -22,8 +22,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * This is the function.
  * @param string $feedbacktype
diff --git a/lang/en/questionnaire.php b/lang/en/questionnaire.php
index 74c8fb28..d904e11b 100644
--- a/lang/en/questionnaire.php
+++ b/lang/en/questionnaire.php
@@ -632,7 +632,7 @@
 $string['usetemplate'] = 'Use template';
 $string['vertical'] = 'Vertical';
 $string['view'] = 'View';
-$string['viewallresponses'] = 'View All Responses';
+$string['viewallresponses'] = 'View all responses';
 $string['viewallresponses_help'] = 'If the questionnaire is set to **Group Mode**: *Visible groups*, or is set to *Separate groups* and the current user
  has the *moodle/site:accessallgroups* capability (in the current context), and groups have been defined in the current course,
  then the user has access to a dropdown list of groups. This dropdown list enables the user to "filter" the questionnaire responses by groups.
@@ -643,7 +643,7 @@
 $string['viewindividualresponse'] = 'Individual responses';
 $string['viewindividualresponse_help'] = 'Click on the respondents\' names in the list below to view their individual responses.';
 $string['viewresponses'] = 'All responses ({$a})';
-$string['viewyourresponses'] = 'Your responses- view {$a}';
+$string['viewyourresponses'] = 'View your response(s)';
 $string['warning'] = 'Warning, error encountered.';
 $string['wronganswers'] = 'There is something wrong with your answers (see below)';
 $string['wrongdateformat'] = 'The date entered: <strong>{$a}</strong> does not correspond to the format shown in the example.';
@@ -652,6 +652,6 @@
 $string['wrongformats'] = 'There is something wrong with your answer to questions:&nbsp;';
 $string['yesno'] = 'Yes/No';
 $string['yesno_help'] = 'Simple Yes/No question.';
-$string['yourresponse'] = 'Your response';
-$string['yourresponses'] = 'Your responses';
+$string['yourresponse'] = 'View your response(s)';
+$string['yourresponses'] = 'View your response(s)';
 $string['crontask'] = 'Questionnaire cleanup job';
diff --git a/questionnaire.class.php b/questionnaire.class.php
index 39d1d941..6dd9b1a2 100644
--- a/questionnaire.class.php
+++ b/questionnaire.class.php
@@ -3994,9 +3994,19 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre
         }
 
         if ($usergraph && $this->survey->chart_type) {
-            $this->page->add_to_page('feedbackcharts',
-                draw_chart($feedbacktype = 'sections', array_values($chartlabels), $groupname,
-                    $allresponses, $this->survey->chart_type, array_values($scorepercent), array_values($allscorepercent), $sectionlabel));
+            $this->page->add_to_page(
+                'feedbackcharts',
+                draw_chart(
+                    'sections',
+                    array_values($chartlabels),
+                    $groupname,
+                    $allresponses,
+                    $this->survey->chart_type,
+                    array_values($scorepercent),
+                    array_values($allscorepercent),
+                    $sectionlabel
+                )
+            );
         }
         if ($this->survey->feedbackscores) {
             $this->page->add_to_page('feedbackscores', html_writer::table($table));
diff --git a/styles.css b/styles.css
index ce712dad..93710aa4 100644
--- a/styles.css
+++ b/styles.css
@@ -397,6 +397,17 @@ td.selected {
     margin-left: 20px;
 }
 
+.mod_questionnaire_flex-container {
+    display: inline-flex;
+}
+
+#page-mod-questionnaire-view .mod_questionnaire_viewpage div.complete,
+#page-mod-questionnaire-view .mod_questionnaire_viewpage div.yourresponse,
+#page-mod-questionnaire-view .mod_questionnaire_viewpage div.allresponses {
+    flex-grow: 1;
+    margin-right: 10px;
+}
+
 #page-mod-questionnaire-questions #fitem_id_allchoices #id_allchoices,
 #page-mod-questionnaire-questions #fitem_id_allnameddegrees #id_allnameddegrees {
     resize: both;
diff --git a/templates/viewpage.mustache b/templates/viewpage.mustache
index 0cbede3c..a681cbfd 100644
--- a/templates/viewpage.mustache
+++ b/templates/viewpage.mustache
@@ -49,8 +49,10 @@
     <h2>{{questionnairename}}</h2>
     {{#intro}}<div class="intro">{{{intro}}}</div>{{/intro}}
     {{#message}}<div class="message">{{{message}}}</div>{{/message}}
-    {{#complete}}<div class="complete">{{{complete}}}</div>{{/complete}}
-    {{#guestuser}}<div class="guestuser">{{{guestuser}}}</div>{{/guestuser}}
-    {{#yourresponse}}<div class="yourresponse">{{{yourresponse}}}</div>{{/yourresponse}}
-    {{#allresponses}}<div class="allresponses">{{{allresponses}}}</div>{{/allresponses}}
+    <div class="mod_questionnaire_flex-container">
+        {{#complete}}<div class="complete">{{{complete}}}</div>{{/complete}}
+        {{#guestuser}}<div class="guestuser">{{{guestuser}}}</div>{{/guestuser}}
+        {{#yourresponse}}<div class="yourresponse">{{{yourresponse}}}</div>{{/yourresponse}}
+        {{#allresponses}}<div class="allresponses">{{{allresponses}}}</div>{{/allresponses}}
+    </div>
 </div>
\ No newline at end of file
diff --git a/tests/behat/add_feedback.feature b/tests/behat/add_feedback.feature
index 4e4bb75c..62eec944 100644
--- a/tests/behat/add_feedback.feature
+++ b/tests/behat/add_feedback.feature
@@ -87,7 +87,7 @@ Feature: In questionnaire, personality tests can be constructed using feedback o
     And I press "Submit questionnaire"
     Then I should see "Thank you for completing this Questionnaire."
     And I press "Continue"
-    Then I should see "Your response"
+    Then I should see "View your response(s)"
     And I should see "These are the main Feedback notes"
     And I should see "Global feedback label"
     And I should see "76%"
@@ -110,7 +110,7 @@ Feature: In questionnaire, personality tests can be constructed using feedback o
     And I press "Submit questionnaire"
     Then I should see "Thank you for completing this Questionnaire."
     And I press "Continue"
-    Then I should see "Your response"
+    Then I should see "View your response(s)"
     And I should see "These are the main Feedback notes"
     And I should see "Global feedback label"
     And I should see "44%"
diff --git a/tests/behat/add_multi_feedback_with_sections.feature b/tests/behat/add_multi_feedback_with_sections.feature
index 9dc1850b..3a3ba05d 100644
--- a/tests/behat/add_multi_feedback_with_sections.feature
+++ b/tests/behat/add_multi_feedback_with_sections.feature
@@ -129,7 +129,7 @@ Feature: In questionnaire, personality tests can be constructed using feedback o
     And I press "Submit questionnaire"
     Then I should see "Thank you for completing this Questionnaire."
     And I press "Continue"
-    Then I should see "Your response"
+    Then I should see "View your response(s)"
     And I should see "These are the main Feedback notes"
     And I should see "Section 1 label"
     And I should see "39%"
diff --git a/tests/behat/anonymous_questionnaire.feature b/tests/behat/anonymous_questionnaire.feature
index 7c7d6c5f..03e9ca9d 100644
--- a/tests/behat/anonymous_questionnaire.feature
+++ b/tests/behat/anonymous_questionnaire.feature
@@ -41,6 +41,6 @@ Feature: Questionnaires can be anonymous
     And I press "Submit questionnaire"
     Then I should see "Thank you for completing this Questionnaire."
     And I press "Continue"
-    Then I should see "Your response"
+    Then I should see "View your response(s)"
     And I should see "Anonymous questionnaire"
     And I should see "Respondent: - Anonymous -"
diff --git a/tests/behat/check_responses.feature b/tests/behat/check_responses.feature
index a305e0f7..1d290d43 100644
--- a/tests/behat/check_responses.feature
+++ b/tests/behat/check_responses.feature
@@ -32,19 +32,19 @@ Feature: Review responses
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I follow "Test questionnaire"
-    Then I should see "View All Responses"
-    And I navigate to "View All Responses" in current page administration
-    Then I should see "View All Responses."
+    Then I should see "View all responses"
+    And I navigate to "View all responses" in current page administration
+    Then I should see "View all responses."
     And I should see "All participants."
     And I should see "View Default order"
     And I should see "Responses: 6"
     And I follow "Ascending order"
-    Then I should see "View All Responses."
+    Then I should see "View all responses."
     And I should see "All participants."
     And I should see "Ascending order"
     And I should see "Responses: 6"
     And I follow "Descending order"
-    Then I should see "View All Responses."
+    Then I should see "View all responses."
     And I should see "All participants."
     And I should see "Descending order"
     And I should see "Responses: 6"
@@ -71,7 +71,7 @@ Feature: Review responses
     And I follow "Admin User"
     Then I should see "1 / 5"
     And I follow "Summary"
-    Then I should see "View All Responses."
+    Then I should see "View all responses."
     And I should see "All participants."
     And I should see "View Default order"
     And I should see "Responses: 5"
@@ -79,4 +79,4 @@ Feature: Review responses
     Then I should see "Are you sure you want to delete ALL the responses in this questionnaire?"
     And I press "Delete"
     Then I should see "You are not eligible to take this questionnaire."
-    And I should not see "View All Responses"
+    And I should not see "View all responses"
diff --git a/tests/behat/check_responses_capabilities.feature b/tests/behat/check_responses_capabilities.feature
index 595b533a..821ed6d7 100644
--- a/tests/behat/check_responses_capabilities.feature
+++ b/tests/behat/check_responses_capabilities.feature
@@ -29,9 +29,9 @@ Feature: Review responses with different capabilities
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I follow "Test questionnaire"
-    Then I should see "View All Responses"
-    And I navigate to "View All Responses" in current page administration
-    Then I should see "View All Responses."
+    Then I should see "View all responses"
+    And I navigate to "View all responses" in current page administration
+    Then I should see "View all responses."
     And I should see "All participants."
     And I should see "View Default order"
     And I should see "Responses: 6"
@@ -63,7 +63,7 @@ Feature: Review responses with different capabilities
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I follow "Test questionnaire"
-    Then I should not see "View All Responses"
+    Then I should not see "View all responses"
     And I log out
 
   @javascript
@@ -94,8 +94,8 @@ Feature: Review responses with different capabilities
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I follow "Test questionnaire"
-    Then I should not see "View All Responses"
+    Then I should not see "View all responses"
     And I am on "Course 1" course homepage
     And I follow "Test questionnaire 2"
-    Then I should see "View All Responses"
+    Then I should see "View all responses"
     And I log out
diff --git a/tests/behat/numeric_question_digits.feature b/tests/behat/numeric_question_digits.feature
index 770c0a41..a7a98b1d 100644
--- a/tests/behat/numeric_question_digits.feature
+++ b/tests/behat/numeric_question_digits.feature
@@ -45,7 +45,7 @@ Feature: Numeric questions can specify a maximum number of digits, and minimum n
     And I press "Submit questionnaire"
     Then I should see "Thank you for completing this Questionnaire."
     And I press "Continue"
-    Then I should see "Your response"
+    Then I should see "View your response(s)"
     And I should see "Test questionnaire"
     And I should see "Enter no more than six digits including the decimal point"
     And I should see "1.2345"
diff --git a/tests/behat/numeric_question_zero.feature b/tests/behat/numeric_question_zero.feature
index a54724b9..d4cb8bc0 100644
--- a/tests/behat/numeric_question_zero.feature
+++ b/tests/behat/numeric_question_zero.feature
@@ -37,7 +37,7 @@ Feature: Numeric questions can have zero as a valid response
     And I press "Submit questionnaire"
     Then I should see "Thank you for completing this Questionnaire."
     And I press "Continue"
-    Then I should see "Your response"
+    Then I should see "View your response(s)"
     And I should see "Test questionnaire"
     And I should see "Enter a number"
     And I should see "0"
diff --git a/tests/behat/public_questionnaire.feature b/tests/behat/public_questionnaire.feature
index 6fa0f5e6..c2b32000 100644
--- a/tests/behat/public_questionnaire.feature
+++ b/tests/behat/public_questionnaire.feature
@@ -62,35 +62,35 @@ Feature: Questionnaires can use an existing public survey to gather responses in
     And I press "Submit questionnaire"
     Then I should see "Thank you for completing this Questionnaire."
     And I press "Continue"
-    Then I should see "Your response"
+    Then I should see "View your response(s)"
     And I should see "Enter a number"
     And "//div[contains(@class,'questionnaire_numeric') and contains(@class,'questionnaire_response')]//span[@class='selected' and text()='1']" "xpath_element" should exist
 
     And I am on "Course 3" course homepage
     And I follow "Questionnaire instance 2"
     And I should see "Answer the questions..."
-    And I should not see "Your response"
+    And I should not see "View your response(s)"
     And I navigate to "Answer the questions..." in current page administration
     Then I should see "Questionnaire instance 2"
     And I set the field "Enter a number" to "2"
     And I press "Submit questionnaire"
     Then I should see "Thank you for completing this Questionnaire."
     And I press "Continue"
-    Then I should see "Your response"
+    Then I should see "View your response(s)"
     And I should see "Enter a number"
     And "//div[contains(@class,'questionnaire_numeric') and contains(@class,'questionnaire_response')]//span[@class='selected' and text()='2']" "xpath_element" should exist
 
     And I am on "Course 2" course homepage
     And I follow "Questionnaire instance 1"
-    Then I should see "Your response"
-    And I navigate to "Your response" in current page administration
+    Then I should see "View your response(s)"
+    And I navigate to "View your response(s)" in current page administration
     And I should see "Enter a number"
     And "//div[contains(@class,'questionnaire_numeric') and contains(@class,'questionnaire_response')]//span[@class='selected' and text()='1']" "xpath_element" should exist
 
     And I am on "Course 3" course homepage
     And I follow "Questionnaire instance 2"
-    Then I should see "Your response"
-    And I navigate to "Your response" in current page administration
+    Then I should see "View your response(s)"
+    And I navigate to "View your response(s)" in current page administration
     And I should see "Enter a number"
     And "//div[contains(@class,'questionnaire_numeric') and contains(@class,'questionnaire_response')]//span[@class='selected' and text()='2']" "xpath_element" should exist
     And I log out
diff --git a/tests/behat/public_questionnaire_teacher.feature b/tests/behat/public_questionnaire_teacher.feature
index ce390e5d..949bb8bf 100644
--- a/tests/behat/public_questionnaire_teacher.feature
+++ b/tests/behat/public_questionnaire_teacher.feature
@@ -79,12 +79,12 @@ Feature: Public questionnaires gather all instance responses in one master cours
   @javascript
   Scenario: Teacher should not see responses for a questionnaire using a public instance
     And I am on the "Questionnaire instance 1" "mod_questionnaire > view" page logged in as "teacher2"
-    And I should not see "Your response"
-    And I should not see "View All Responses"
+    And I should not see "View your response(s)"
+    And I should not see "View all responses"
     And I log out
 
   # Scenario: Teacher in course with main public questionnaire should see all responses
     And I am on the "Public questionnaire" "mod_questionnaire > view" page logged in as "teacher1"
-    Then I should see "View All Responses"
-    And I navigate to "View All Responses" in current page administration
+    Then I should see "View all responses"
+    And I navigate to "View all responses" in current page administration
     Then I should see "Responses: 2"
diff --git a/tests/behat/radio_question_other.feature b/tests/behat/radio_question_other.feature
index 8b6e6468..84d5659e 100644
--- a/tests/behat/radio_question_other.feature
+++ b/tests/behat/radio_question_other.feature
@@ -55,7 +55,7 @@ Feature: Radio questions allow optional "other" responses with optional labels
     And I press "Submit questionnaire"
     Then I should see "Thank you for completing this Questionnaire."
     And I press "Continue"
-    Then I should see "Your response"
+    Then I should see "View your response(s)"
     And I should see "Test questionnaire"
     And I should see "Other: Yellow"
     And I should see "Another colour: Indigo"
diff --git a/tests/behat/text_question_zero.feature b/tests/behat/text_question_zero.feature
index 4d5fe2b3..6645709c 100644
--- a/tests/behat/text_question_zero.feature
+++ b/tests/behat/text_question_zero.feature
@@ -37,7 +37,7 @@ Feature: Text questions can have zero as a valid response
     And I press "Submit questionnaire"
     Then I should see "Thank you for completing this Questionnaire."
     And I press "Continue"
-    Then I should see "Your response"
+    Then I should see "View your response(s)"
     And I should see "Test questionnaire"
     And I should see "Enter zero"
     And "//div[contains(@class,'questionnaire_text') and contains(@class,'questionnaire_response')]//span[@class='selected' and text()='0']" "xpath_element" should exist
diff --git a/tests/generator_test.php b/tests/generator_test.php
index 2a07bc66..f3fd71af 100644
--- a/tests/generator_test.php
+++ b/tests/generator_test.php
@@ -23,8 +23,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Unit tests for questionnaire_generator_testcase.
  * @group mod_questionnaire
diff --git a/tests/privacy_provider_test.php b/tests/privacy_provider_test.php
index 43e65f3f..21ee99ea 100644
--- a/tests/privacy_provider_test.php
+++ b/tests/privacy_provider_test.php
@@ -23,8 +23,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
 use \mod_questionnaire\privacy\provider;
 
 /**
diff --git a/version.php b/version.php
index b1cc1ae9..d17a22e1 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version  = 2021062301;  // The current module version (Date: YYYYMMDDXX)
+$plugin->version  = 2021062301;  // The current module version (Date: YYYYMMDDXX).
 $plugin->requires = 2020061500; // Moodle version (3.9).
 
 $plugin->component = 'mod_questionnaire';
diff --git a/view.php b/view.php
index e71007d1..e2212603 100644
--- a/view.php
+++ b/view.php
@@ -137,13 +137,14 @@
         $argstr .= '&byresponse=1&action=vresp';
     }
     $questionnaire->page->add_to_page('yourresponse',
-        '<a href="'.$CFG->wwwroot.htmlspecialchars('/mod/questionnaire/myreport.php?'.$argstr).'">'.$titletext.'</a>');
+        '<a href="' .$CFG->wwwroot.htmlspecialchars('/mod/questionnaire/myreport.php?' . $argstr).
+        '" class="btn btn-primary">' . $titletext . '</a>');
 }
 
 if ($questionnaire->can_view_all_responses($usernumresp)) {
     $argstr = 'instance='.$questionnaire->id.'&group='.$currentgroupid;
     $questionnaire->page->add_to_page('allresponses',
-        '<a href="'.$CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'.$argstr).'">'.
+        '<a href="'.$CFG->wwwroot.htmlspecialchars('/mod/questionnaire/report.php?'.$argstr).'" class="btn btn-primary">'.
         get_string('viewallresponses', 'questionnaire').'</a>');
 }