diff --git a/mod/assign/styles.css b/mod/assign/styles.css
index 43bb6232d7b..31e33c7e507 100644
--- a/mod/assign/styles.css
+++ b/mod/assign/styles.css
@@ -967,16 +967,6 @@
     height: 60px;
 }
 
-/*rtl:ignore*/
-.path-mod-assign [data-region="grade-actions-panel"] [data-region="grade-actions"] .collapse-buttons {
-    position: absolute;
-    top: 0;
-    left: auto;
-    right: 15px;
-    margin: 0;
-    line-height: 60px;
-}
-
 .path-mod-assign [data-region="grade-actions"] {
     padding: 1em;
     text-align: center;
diff --git a/mod/assign/templates/grading_actions.mustache b/mod/assign/templates/grading_actions.mustache
index 50b37e37feb..427f1eb7766 100644
--- a/mod/assign/templates/grading_actions.mustache
+++ b/mod/assign/templates/grading_actions.mustache
@@ -30,27 +30,29 @@
 
     This template is initially hidden, and is only displayed after the current user info has been loaded.
 }}
-{{#showreview}}
-<div class="btn-toolbar collapse-buttons">
-    <div class="btn-group">
-        <button type="button" class="btn btn-secondary collapse-review-panel">{{#pix}} layout-expand-right, mod_assign, {{#str}} collapsereviewpanel, mod_assign {{/str}} {{/pix}}</button>
-        <button type="button" class="btn btn-secondary collapse-none active">{{#pix}} layout-default, mod_assign, {{#str}} defaultlayout, mod_assign {{/str}} {{/pix}}</button>
-        <button type="button" class="btn btn-secondary collapse-grade-panel">{{#pix}} layout-expand-left, mod_assign, {{#str}} collapsegradepanel, mod_assign {{/str}} {{/pix}}</button>
-    </div>
+<div class="d-flex justify-content-between">
+    <form data-region="grading-actions-form" class="hide flex-grow-1 align-self-center">
+        <label>{{#str}}sendstudentnotifications, mod_assign{{/str}}
+               <input type="checkbox" name="sendstudentnotifications"
+                      {{#defaultsendnotifications}}checked="checked"{{/defaultsendnotifications}} />
+        </label>
+        {{#helpicon}}
+            {{>core/help_icon}}
+        {{/helpicon}}
+        <button type="submit" class="btn btn-primary" name="savechanges">{{#str}}savechanges{{/str}}</button>
+        <button type="submit" class="btn btn-primary" name="saveandshownext">{{#str}}saveandnext{{/str}}</button>
+        <button type="submit" class="btn btn-secondary" name="resetbutton">{{#str}}reset{{/str}}</button>
+    </form>
+    {{#showreview}}
+        <div class="btn-toolbar collapse-buttons">
+            <div class="btn-group">
+                <button type="button" class="btn btn-secondary collapse-review-panel">{{#pix}} layout-expand-right, mod_assign, {{#str}} collapsereviewpanel, mod_assign {{/str}} {{/pix}}</button>
+                <button type="button" class="btn btn-secondary collapse-none active">{{#pix}} layout-default, mod_assign, {{#str}} defaultlayout, mod_assign {{/str}} {{/pix}}</button>
+                <button type="button" class="btn btn-secondary collapse-grade-panel">{{#pix}} layout-expand-left, mod_assign, {{#str}} collapsegradepanel, mod_assign {{/str}} {{/pix}}</button>
+            </div>
+        </div>
+    {{/showreview}}
 </div>
-{{/showreview}}
-<form data-region="grading-actions-form" class="hide">
-    <label>{{#str}}sendstudentnotifications, mod_assign{{/str}}
-           <input type="checkbox" name="sendstudentnotifications"
-                  {{#defaultsendnotifications}}checked="checked"{{/defaultsendnotifications}} />
-    </label>
-    {{#helpicon}}
-        {{>core/help_icon}}
-    {{/helpicon}}
-    <button type="submit" class="btn btn-primary" name="savechanges">{{#str}}savechanges{{/str}}</button>
-    <button type="submit" class="btn btn-primary" name="saveandshownext">{{#str}}saveandnext{{/str}}</button>
-    <button type="submit" class="btn btn-secondary" name="resetbutton">{{#str}}reset{{/str}}</button>
-</form>
 {{#js}}
 require(['mod_assign/grading_actions'], function(GradingActions) {
     new GradingActions('[data-region="grade-actions"]');
diff --git a/mod/assign/templates/grading_navigation_user_summary.mustache b/mod/assign/templates/grading_navigation_user_summary.mustache
index 0a3ad80932e..2bb67fbb070 100644
--- a/mod/assign/templates/grading_navigation_user_summary.mustache
+++ b/mod/assign/templates/grading_navigation_user_summary.mustache
@@ -37,4 +37,27 @@
         "profileimageurl": "https://moodle.org/pix/u/f3.png"
     }
 }}
-<h4>{{^blindmarking}}<a href="{{globals.config.wwwroot}}/user/view.php?id={{id}}&course={{courseid}}">{{/blindmarking}}{{#profileimageurl}}<img src="{{profileimageurl}}" class="img-rounded" height="40" role="presentation"/>{{/profileimageurl}} {{fullname}}{{#hasidentity}}<em class='nowrap'><small> {{identity}} </small></em>{{/hasidentity}}{{#duedate}}<em class='nowrap'><small>{{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}}</small></em>{{/duedate}}{{^blindmarking}}</a>{{/blindmarking}}</h4>
+<h4>
+    {{^blindmarking}}
+        <a href="{{globals.config.wwwroot}}/user/view.php?id={{id}}&course={{courseid}}">
+    {{/blindmarking}}
+    {{#profileimageurl}}
+        <img src="{{profileimageurl}}" class="img-rounded" height="40" role="presentation"/>
+    {{/profileimageurl}}
+    {{fullname}}
+    {{#hasidentity}}
+        <em class='nowrap'>
+            <small title="{{identity}}">{{identity}}</small>
+        </em>
+    {{/hasidentity}}
+    {{#duedate}}
+        <em class='nowrap'>
+            <small title="{{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}}">
+                {{#str}}duedatecolon, mod_assign, {{duedatestr}}{{/str}}
+            </small>
+        </em>
+    {{/duedate}}
+    {{^blindmarking}}
+        </a>
+    {{/blindmarking}}
+</h4>