diff --git a/mod/assign/templates/grading_actions.mustache b/mod/assign/templates/grading_actions.mustache
index 09dd88e6360..50b37e37feb 100644
--- a/mod/assign/templates/grading_actions.mustache
+++ b/mod/assign/templates/grading_actions.mustache
@@ -30,6 +30,15 @@
 
     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>
+{{/showreview}}
 <form data-region="grading-actions-form" class="hide">
     <label>{{#str}}sendstudentnotifications, mod_assign{{/str}}
            <input type="checkbox" name="sendstudentnotifications"
@@ -40,17 +49,8 @@
     {{/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" name="resetbutton">{{#str}}reset{{/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 class="btn collapse-review-panel">{{#pix}} layout-expand-right, mod_assign, {{#str}} collapsereviewpanel, mod_assign {{/str}} {{/pix}}</button>
-        <button class="btn collapse-none active">{{#pix}} layout-default, mod_assign, {{#str}} defaultlayout, mod_assign {{/str}} {{/pix}}</button>
-        <button class="btn collapse-grade-panel">{{#pix}} layout-expand-left, mod_assign, {{#str}} collapsegradepanel, mod_assign {{/str}} {{/pix}}</button>
-    </div>
-</div>
-{{/showreview}}
 {{#js}}
 require(['mod_assign/grading_actions'], function(GradingActions) {
     new GradingActions('[data-region="grade-actions"]');
diff --git a/mod/assign/templates/grading_navigation.mustache b/mod/assign/templates/grading_navigation.mustache
index 9a6927a8608..ab2d9e56005 100644
--- a/mod/assign/templates/grading_navigation.mustache
+++ b/mod/assign/templates/grading_navigation.mustache
@@ -30,15 +30,15 @@
 
     This template includes ajax functionality, so it cannot be shown in the template library.
 }}
-
-<div data-region="grading-navigation" class="row-fluid">
+<div class="container-fluid">
+<div data-region="grading-navigation" class="row">
 
 {{!
     There are three chunks, which appear side-by-side at large screen sizes.
     A) Assignment info, which has 3 rows:
 }}
 
-<div data-region="assignment-info" class="span4">
+<div data-region="assignment-info" class="col-md-4">
 
 {{!
     Row 1) course name & link.
@@ -81,19 +81,20 @@
 {{!
     B) Current user name and info.
 }}
-<div data-region="user-info" class="span4" data-assignmentid="{{assignmentid}}" data-groupid="{{groupid}}">
+<div data-region="user-info" class="col-md-4" data-assignmentid="{{assignmentid}}" data-groupid="{{groupid}}">
     {{> mod_assign/grading_navigation_user_info }}
 </div>
 
 {{!
     C) User selector widget.
 }}
-<div data-region="user-selector" class="span4">
+<div data-region="user-selector" class="col-md-4">
     <div class="alignment">
         {{> mod_assign/grading_navigation_user_selector }}
     </div>
 </div>
 </div>
+</div>
 {{#js}}
 require(['mod_assign/grading_navigation', 'core/tooltip'], function(GradingNavigation, ToolTip) {
     var nav = new GradingNavigation('[data-region="user-selector"]');
diff --git a/mod/assign/templates/grading_navigation_user_selector.mustache b/mod/assign/templates/grading_navigation_user_selector.mustache
index f2283929cc8..30378ce5f17 100644
--- a/mod/assign/templates/grading_navigation_user_selector.mustache
+++ b/mod/assign/templates/grading_navigation_user_selector.mustache
@@ -23,7 +23,7 @@
     * none
 
     Data attributes required for JS:
-    * data-action, data-assignmentid, data-groupid, data-region, data-currentuserid
+    * data-action, data-assignmentid, data-groupid, data-region
 
     Context variables required for this template:
     * see mod/assign/classes/output/grading_app.php
@@ -31,11 +31,10 @@
     This template uses ajax functionality, so it cannot be shown in the template library.
 }}
 <a href="#previous" data-action="previous-user">{{{larrow}}}</a>
-    <span>
-        <select data-action="change-user" data-currentuserid="{{currentuserid}}" data-assignmentid="{{assignmentid}}" data-groupid="{{groupid}}">
-        </select>
+    <span data-region="input-field">
+        <select data-action="change-user" data-currentuserid="{{currentuserid}}" data-assignmentid="{{assignmentid}}" data-groupid="{{groupid}}"></select>
     </span>
-    <a href="#next" data-action="next-user">{{{rarrow}}}</a>
+<a href="#next" data-action="next-user">{{{rarrow}}}</a>
 
 <br>
 
@@ -45,47 +44,41 @@
     </small>
 </span>
 
-<span data-region="configure-filters" id="filter-configuration-{{uniqid}}" class="well well-large p-2">
-    <form class="container-fluid">
-        <div class="row-fluid">
-            <label class="span4 text-right" for="filter-general-{{uniqid}}">
+<span data-region="configure-filters" id="filter-configuration-{{uniqid}}" class="card card-large p-2">
+    <form>
+        <span class="row px-3 py-1">
+            <label class="text-right w-25 p-2 m-0" for="filter-general-{{uniqid}}">
                 {{#str}}filter, mod_assign{{/str}}
             </label>
-            <div class="span8">
-                <select name="filter" class="custom-select span8" id="filter-general-{{uniqid}}">
-                {{#filters}}
-                    <option value="{{key}}" {{#active}}selected="selected"{{/active}}> {{name}} </option>
-                {{/filters}}
-                </select>
-            </div>
-        </div>
+            <select name="filter" class="custom-select w-50" id="filter-general-{{uniqid}}">
+            {{#filters}}
+                <option value="{{key}}" {{#active}}selected="selected"{{/active}} > {{name}} </option>
+            {{/filters}}
+            </select>
+        </span>
         {{#hasmarkingallocation}}
-        <div class="row-fluid">
-            <label class="span4 text-right" for="filter-marker-{{uniqid}}">
+        <span class="row px-3 py-1">
+            <label class="text-right w-25 p-2 m-0" for="filter-marker-{{uniqid}}">
                 {{#str}}markerfilter, mod_assign{{/str}}
             </label>
-            <div class="span8">
-                <select name="markerfilter" class="custom-select span8" id="filter-marker-{{uniqid}}">
-                {{#markingallocationfilters}}
-                    <option value="{{key}}" {{#active}}selected="selected"{{/active}} > {{name}} </option>
-                {{/markingallocationfilters}}
-                </select>
-            </div>
-        </div>
+            <select name="markerfilter" class="custom-select w-50" id="filter-marker-{{uniqid}}">
+            {{#markingallocationfilters}}
+                <option value="{{key}}" {{#active}}selected="selected"{{/active}} > {{name}} </option>
+            {{/markingallocationfilters}}
+            </select>
+        </span>
         {{/hasmarkingallocation}}
         {{#hasmarkingworkflow}}
-        <div class="row-fluid">
-            <label class="span4 text-right" for="filter-workflow-{{uniqid}}">
+        <span class="row px-3 py-1">
+            <label class="text-right w-25 p-2 m-0" for="filter-workflow-{{uniqid}}">
                 {{#str}}workflowfilter, mod_assign{{/str}}
             </label>
-            <div class="span8">
-                <select name="workflowfilter" class="custom-select span8" id="filter-workflow-{{uniqid}}">
-                {{#markingworkflowfilters}}
-                    <option value="{{key}}" {{#active}}selected="selected"{{/active}} > {{name}} </option>
-                {{/markingworkflowfilters}}
-                </select>
-            </div>
-        </div>
+            <select name="workflowfilter" class="custom-select w-50" id="filter-workflow-{{uniqid}}">
+            {{#markingworkflowfilters}}
+                <option value="{{key}}" {{#active}}selected="selected"{{/active}} > {{name}} </option>
+            {{/markingworkflowfilters}}
+            </select>
+        </span>
         {{/hasmarkingworkflow}}
     </form>
 </span>
diff --git a/theme/boost/templates/mod_assign/grading_actions.mustache b/theme/bootstrapbase/templates/mod_assign/grading_actions.mustache
similarity index 75%
rename from theme/boost/templates/mod_assign/grading_actions.mustache
rename to theme/bootstrapbase/templates/mod_assign/grading_actions.mustache
index 50b37e37feb..09dd88e6360 100644
--- a/theme/boost/templates/mod_assign/grading_actions.mustache
+++ b/theme/bootstrapbase/templates/mod_assign/grading_actions.mustache
@@ -30,15 +30,6 @@
 
     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>
-{{/showreview}}
 <form data-region="grading-actions-form" class="hide">
     <label>{{#str}}sendstudentnotifications, mod_assign{{/str}}
            <input type="checkbox" name="sendstudentnotifications"
@@ -49,8 +40,17 @@
     {{/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>
+    <button type="submit" class="btn" name="resetbutton">{{#str}}reset{{/str}}</button>
 </form>
+{{#showreview}}
+<div class="btn-toolbar collapse-buttons">
+    <div class="btn-group">
+        <button class="btn collapse-review-panel">{{#pix}} layout-expand-right, mod_assign, {{#str}} collapsereviewpanel, mod_assign {{/str}} {{/pix}}</button>
+        <button class="btn collapse-none active">{{#pix}} layout-default, mod_assign, {{#str}} defaultlayout, mod_assign {{/str}} {{/pix}}</button>
+        <button class="btn collapse-grade-panel">{{#pix}} layout-expand-left, mod_assign, {{#str}} collapsegradepanel, mod_assign {{/str}} {{/pix}}</button>
+    </div>
+</div>
+{{/showreview}}
 {{#js}}
 require(['mod_assign/grading_actions'], function(GradingActions) {
     new GradingActions('[data-region="grade-actions"]');
diff --git a/theme/boost/templates/mod_assign/grading_navigation.mustache b/theme/bootstrapbase/templates/mod_assign/grading_navigation.mustache
similarity index 90%
rename from theme/boost/templates/mod_assign/grading_navigation.mustache
rename to theme/bootstrapbase/templates/mod_assign/grading_navigation.mustache
index ab2d9e56005..9a6927a8608 100644
--- a/theme/boost/templates/mod_assign/grading_navigation.mustache
+++ b/theme/bootstrapbase/templates/mod_assign/grading_navigation.mustache
@@ -30,15 +30,15 @@
 
     This template includes ajax functionality, so it cannot be shown in the template library.
 }}
-<div class="container-fluid">
-<div data-region="grading-navigation" class="row">
+
+<div data-region="grading-navigation" class="row-fluid">
 
 {{!
     There are three chunks, which appear side-by-side at large screen sizes.
     A) Assignment info, which has 3 rows:
 }}
 
-<div data-region="assignment-info" class="col-md-4">
+<div data-region="assignment-info" class="span4">
 
 {{!
     Row 1) course name & link.
@@ -81,20 +81,19 @@
 {{!
     B) Current user name and info.
 }}
-<div data-region="user-info" class="col-md-4" data-assignmentid="{{assignmentid}}" data-groupid="{{groupid}}">
+<div data-region="user-info" class="span4" data-assignmentid="{{assignmentid}}" data-groupid="{{groupid}}">
     {{> mod_assign/grading_navigation_user_info }}
 </div>
 
 {{!
     C) User selector widget.
 }}
-<div data-region="user-selector" class="col-md-4">
+<div data-region="user-selector" class="span4">
     <div class="alignment">
         {{> mod_assign/grading_navigation_user_selector }}
     </div>
 </div>
 </div>
-</div>
 {{#js}}
 require(['mod_assign/grading_navigation', 'core/tooltip'], function(GradingNavigation, ToolTip) {
     var nav = new GradingNavigation('[data-region="user-selector"]');
diff --git a/theme/boost/templates/mod_assign/grading_navigation_user_selector.mustache b/theme/bootstrapbase/templates/mod_assign/grading_navigation_user_selector.mustache
similarity index 57%
rename from theme/boost/templates/mod_assign/grading_navigation_user_selector.mustache
rename to theme/bootstrapbase/templates/mod_assign/grading_navigation_user_selector.mustache
index 30378ce5f17..f2283929cc8 100644
--- a/theme/boost/templates/mod_assign/grading_navigation_user_selector.mustache
+++ b/theme/bootstrapbase/templates/mod_assign/grading_navigation_user_selector.mustache
@@ -23,7 +23,7 @@
     * none
 
     Data attributes required for JS:
-    * data-action, data-assignmentid, data-groupid, data-region
+    * data-action, data-assignmentid, data-groupid, data-region, data-currentuserid
 
     Context variables required for this template:
     * see mod/assign/classes/output/grading_app.php
@@ -31,10 +31,11 @@
     This template uses ajax functionality, so it cannot be shown in the template library.
 }}
 <a href="#previous" data-action="previous-user">{{{larrow}}}</a>
-    <span data-region="input-field">
-        <select data-action="change-user" data-currentuserid="{{currentuserid}}" data-assignmentid="{{assignmentid}}" data-groupid="{{groupid}}"></select>
+    <span>
+        <select data-action="change-user" data-currentuserid="{{currentuserid}}" data-assignmentid="{{assignmentid}}" data-groupid="{{groupid}}">
+        </select>
     </span>
-<a href="#next" data-action="next-user">{{{rarrow}}}</a>
+    <a href="#next" data-action="next-user">{{{rarrow}}}</a>
 
 <br>
 
@@ -44,41 +45,47 @@
     </small>
 </span>
 
-<span data-region="configure-filters" id="filter-configuration-{{uniqid}}" class="card card-large p-2">
-    <form>
-        <span class="row px-3 py-1">
-            <label class="text-right w-25 p-2 m-0" for="filter-general-{{uniqid}}">
+<span data-region="configure-filters" id="filter-configuration-{{uniqid}}" class="well well-large p-2">
+    <form class="container-fluid">
+        <div class="row-fluid">
+            <label class="span4 text-right" for="filter-general-{{uniqid}}">
                 {{#str}}filter, mod_assign{{/str}}
             </label>
-            <select name="filter" class="custom-select w-50" id="filter-general-{{uniqid}}">
-            {{#filters}}
-                <option value="{{key}}" {{#active}}selected="selected"{{/active}} > {{name}} </option>
-            {{/filters}}
-            </select>
-        </span>
+            <div class="span8">
+                <select name="filter" class="custom-select span8" id="filter-general-{{uniqid}}">
+                {{#filters}}
+                    <option value="{{key}}" {{#active}}selected="selected"{{/active}}> {{name}} </option>
+                {{/filters}}
+                </select>
+            </div>
+        </div>
         {{#hasmarkingallocation}}
-        <span class="row px-3 py-1">
-            <label class="text-right w-25 p-2 m-0" for="filter-marker-{{uniqid}}">
+        <div class="row-fluid">
+            <label class="span4 text-right" for="filter-marker-{{uniqid}}">
                 {{#str}}markerfilter, mod_assign{{/str}}
             </label>
-            <select name="markerfilter" class="custom-select w-50" id="filter-marker-{{uniqid}}">
-            {{#markingallocationfilters}}
-                <option value="{{key}}" {{#active}}selected="selected"{{/active}} > {{name}} </option>
-            {{/markingallocationfilters}}
-            </select>
-        </span>
+            <div class="span8">
+                <select name="markerfilter" class="custom-select span8" id="filter-marker-{{uniqid}}">
+                {{#markingallocationfilters}}
+                    <option value="{{key}}" {{#active}}selected="selected"{{/active}} > {{name}} </option>
+                {{/markingallocationfilters}}
+                </select>
+            </div>
+        </div>
         {{/hasmarkingallocation}}
         {{#hasmarkingworkflow}}
-        <span class="row px-3 py-1">
-            <label class="text-right w-25 p-2 m-0" for="filter-workflow-{{uniqid}}">
+        <div class="row-fluid">
+            <label class="span4 text-right" for="filter-workflow-{{uniqid}}">
                 {{#str}}workflowfilter, mod_assign{{/str}}
             </label>
-            <select name="workflowfilter" class="custom-select w-50" id="filter-workflow-{{uniqid}}">
-            {{#markingworkflowfilters}}
-                <option value="{{key}}" {{#active}}selected="selected"{{/active}} > {{name}} </option>
-            {{/markingworkflowfilters}}
-            </select>
-        </span>
+            <div class="span8">
+                <select name="workflowfilter" class="custom-select span8" id="filter-workflow-{{uniqid}}">
+                {{#markingworkflowfilters}}
+                    <option value="{{key}}" {{#active}}selected="selected"{{/active}} > {{name}} </option>
+                {{/markingworkflowfilters}}
+                </select>
+            </div>
+        </div>
         {{/hasmarkingworkflow}}
     </form>
 </span>