diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index 7f5e3da27ae..c7b57f846ba 100644
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -118,7 +118,7 @@ if ($courseitemfilter > 0) {
 
             echo '<tr>';
             echo '<td>'.$shortname.'</td>';
-            echo '<td align="right">';
+            echo '<td class="text-right">';
             echo format_float(($c->sumvalue / $c->countvalue), 2);
             echo '</td>';
             echo '</tr>';
diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index 64bce99c0bc..c56bfa30130 100644
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -122,7 +122,7 @@ if ($feedbackcompletion->is_empty()) {
                     'generalbox boxaligncenter');
         }
         if (!$PAGE->has_secondary_navigation() && $feedbackcompletion->can_view_analysis()) {
-            echo '<p align="center">';
+            echo '<p class="text-center">';
             $analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id' => $cm->id, 'courseid' => $courseid));
             echo html_writer::link($analysisurl, get_string('completed_feedbacks', 'feedback'));
             echo '</p>';
diff --git a/mod/feedback/item/info/lib.php b/mod/feedback/item/info/lib.php
index f1157ec8968..3d9d189ef84 100644
--- a/mod/feedback/item/info/lib.php
+++ b/mod/feedback/item/info/lib.php
@@ -157,7 +157,7 @@ class feedback_item_info extends feedback_item_base {
         $analysed_item = $this->get_analysed($item, $groupid, $courseid);
         $data = $analysed_item->data;
         if (is_array($data)) {
-            echo '<tr><th colspan="2" align="left">';
+            echo '<tr><th class="text-left">';
             echo $itemnr . ' ';
             if (strval($item->label) !== '') {
                 echo '('. format_string($item->label).') ';
@@ -167,7 +167,7 @@ class feedback_item_info extends feedback_item_base {
             $sizeofdata = count($data);
             for ($i = 0; $i < $sizeofdata; $i++) {
                 $class = strlen(trim($data[$i]->show)) ? '' : ' class="isempty"';
-                echo '<tr'.$class.'><td colspan="2" class="singlevalue">';
+                echo '<tr'.$class.'><td class="singlevalue">';
                 echo str_replace("\n", '<br />', $data[$i]->show);
                 echo '</td></tr>';
             }
diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
index 0c0286be41c..cbfb7d00fb8 100644
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -209,14 +209,14 @@ class feedback_item_multichoice extends feedback_item_base {
         if ($analysed_item) {
             $itemname = $analysed_item[1];
             echo "<table class=\"analysis itemtype_{$item->typ}\">";
-            echo '<tr><th colspan="2" align="left">';
+            echo '<tr><th class="text-left">';
             echo $itemnr . ' ';
             if (strval($item->label) !== '') {
                 echo '('. format_string($item->label).') ';
             }
             echo format_string($itemname);
             echo '</th></tr>';
-            echo "</table>";
+
             $analysed_vals = $analysed_item[2];
             $count = 0;
             $data = [];
@@ -241,7 +241,8 @@ class feedback_item_multichoice extends feedback_item_base {
             $chart->add_series($series);
             $chart->set_labels($data['labels']);
 
-            echo $OUTPUT->render($chart);
+            echo '<tr><td>'. $OUTPUT->render($chart) . '</td></tr>';
+            echo "</table>";
         }
     }
 
diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php
index c2d93be26d5..1c46ed3fa2a 100644
--- a/mod/feedback/item/multichoicerated/lib.php
+++ b/mod/feedback/item/multichoicerated/lib.php
@@ -180,14 +180,13 @@ class feedback_item_multichoicerated extends feedback_item_base {
         $analysed_item = $this->get_analysed($item, $groupid, $courseid);
         if ($analysed_item) {
             echo "<table class=\"analysis itemtype_{$item->typ}\">";
-            echo '<tr><th colspan="2" align="left">';
+            echo '<tr><th class="text-left">';
             echo $itemnr . ' ';
             if (strval($item->label) !== '') {
                 echo '('. format_string($item->label).') ';
             }
             echo format_string($analysed_item[1]);
             echo '</th></tr>';
-            echo '</table>';
             $analysed_vals = $analysed_item[2];
             $avg = 0.0;
             $count = 0;
@@ -215,12 +214,12 @@ class feedback_item_multichoicerated extends feedback_item_base {
             $series->set_labels($data['series_labels']);
             $chart->add_series($series);
             $chart->set_labels($data['labels']);
-            echo $OUTPUT->render($chart);
-
+            echo '<tr><td>'. $OUTPUT->render($chart) . '</td></tr>';
             $avg = format_float($avg, 2);
-            echo '<tr><td align="left" colspan="2"><b>';
+            echo '<tr><td class="text-left"><b>';
             echo get_string('average', 'feedback').': '.$avg.'</b>';
             echo '</td></tr>';
+            echo '</table>';
         }
     }
 
diff --git a/mod/feedback/item/numeric/lib.php b/mod/feedback/item/numeric/lib.php
index 2d3a340e1cf..d4afe29966e 100644
--- a/mod/feedback/item/numeric/lib.php
+++ b/mod/feedback/item/numeric/lib.php
@@ -144,7 +144,7 @@ class feedback_item_numeric extends feedback_item_base {
 
         if (isset($values->data) AND is_array($values->data)) {
             echo "<table class=\"analysis itemtype_{$item->typ}\">";
-            echo '<tr><th colspan="2" align="left">';
+            echo '<tr><th class="text-left">';
             echo $itemnr . ' ';
             if (strval($item->label) !== '') {
                 echo '('. format_string($item->label).') ';
@@ -153,7 +153,7 @@ class feedback_item_numeric extends feedback_item_base {
             echo '</th></tr>';
 
             foreach ($values->data as $value) {
-                echo '<tr><td colspan="2" class="singlevalue">';
+                echo '<tr><td class="singlevalue">';
                 echo $this->format_float($value);
                 echo '</td></tr>';
             }
@@ -163,7 +163,7 @@ class feedback_item_numeric extends feedback_item_base {
             } else {
                 $avg = '-';
             }
-            echo '<tr><td colspan="2"><b>';
+            echo '<tr><td><b>';
             echo get_string('average', 'feedback').': '.$avg;
             echo '</b></td></tr>';
             echo '</table>';
diff --git a/mod/feedback/item/textarea/lib.php b/mod/feedback/item/textarea/lib.php
index cc3a997fa2a..cdc09d3b89f 100644
--- a/mod/feedback/item/textarea/lib.php
+++ b/mod/feedback/item/textarea/lib.php
@@ -135,7 +135,7 @@ class feedback_item_textarea extends feedback_item_base {
         $values = feedback_get_group_values($item, $groupid, $courseid);
         if ($values) {
             echo "<table class=\"analysis itemtype_{$item->typ}\">";
-            echo '<tr><th colspan="2" align="left">';
+            echo '<tr><th class="text-left">';
             echo $itemnr . ' ';
             if (strval($item->label) !== '') {
                 echo '('. format_string($item->label).') ';
@@ -145,7 +145,7 @@ class feedback_item_textarea extends feedback_item_base {
             foreach ($values as $value) {
                 $class = strlen(trim($value->value)) ? '' : ' class="isempty"';
                 echo '<tr'.$class.'>';
-                echo '<td colspan="2" class="singlevalue">';
+                echo '<td class="singlevalue">';
                 echo str_replace("\n", '<br />', $value->value);
                 echo '</td>';
                 echo '</tr>';
diff --git a/mod/feedback/item/textfield/lib.php b/mod/feedback/item/textfield/lib.php
index c8260ffc909..c703ecfb3b9 100644
--- a/mod/feedback/item/textfield/lib.php
+++ b/mod/feedback/item/textfield/lib.php
@@ -131,7 +131,7 @@ class feedback_item_textfield extends feedback_item_base {
         $values = feedback_get_group_values($item, $groupid, $courseid);
         if ($values) {
             echo "<table class=\"analysis itemtype_{$item->typ}\">";
-            echo '<tr><th colspan="2" align="left">';
+            echo '<tr><th class="text-left">';
             echo $itemnr . ' ';
             if (strval($item->label) !== '') {
                 echo '('. format_string($item->label).') ';
@@ -140,7 +140,7 @@ class feedback_item_textfield extends feedback_item_base {
             echo '</th></tr>';
             foreach ($values as $value) {
                 $class = strlen(trim($value->value)) ? '' : ' class="isempty"';
-                echo '<tr'.$class.'><td colspan="2" class="singlevalue">';
+                echo '<tr'.$class.'><td class="singlevalue">';
                 echo str_replace("\n", '<br />', $value->value);
                 echo '</td></tr>';
             }
diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 7a707ae8514..86d10857fee 100644
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -489,7 +489,7 @@ function feedback_print_recent_mod_activity($activity, $courseid, $detail, $modn
 
     echo '<table border="0" cellpadding="3" cellspacing="0" class="forum-recent">';
 
-    echo "<tr><td class=\"userpicture\" valign=\"top\">";
+    echo "<tr><td class=\"userpicture align-top\">";
     echo $OUTPUT->user_picture($activity->user, array('courseid'=>$courseid));
     echo "</td><td>";
 
diff --git a/mod/feedback/tests/behat/behat_mod_feedback.php b/mod/feedback/tests/behat/behat_mod_feedback.php
index f81e4e9fa29..17f1302e762 100644
--- a/mod/feedback/tests/behat/behat_mod_feedback.php
+++ b/mod/feedback/tests/behat/behat_mod_feedback.php
@@ -149,8 +149,8 @@ class behat_mod_feedback extends behat_base {
      */
     public function i_show_chart_data_for_the_feedback($feedbackname) {
 
-        $feedbackxpath = "//th[contains(normalize-space(string(.)), \"" . $feedbackname . "\")]/ancestor::table/" .
-            "following-sibling::div[contains(concat(' ', normalize-space(@class), ' '), ' chart-area ')][1]" .
+        $feedbackxpath = "//th[contains(normalize-space(string(.)), \"" . $feedbackname . "\")]/ancestor::table//" .
+            "div[contains(concat(' ', normalize-space(@class), ' '), ' chart-table ')]" .
             "//p[contains(concat(' ', normalize-space(@class), ' '), ' chart-table-expand ') and ".
             "//a[contains(normalize-space(string(.)), '".get_string('showchartdata')."')]]";