diff --git a/grade/report/singleview/templates/bulk_insert.mustache b/grade/report/singleview/templates/bulk_insert.mustache
index ad4b657442443..abe592ac131ab 100644
--- a/grade/report/singleview/templates/bulk_insert.mustache
+++ b/grade/report/singleview/templates/bulk_insert.mustache
@@ -21,10 +21,10 @@
     <input type="checkbox" name="{{applyname}}" value="1" id="{{applyname}}">
     <label for="{{applyname}}">{{applylabel}}</label>
 </div>
-<fieldset>
+<fieldset class="form-inline">
     <legend class="accesshide">{{label}}</legend>
     <label for="{{menuname}}">{{menulabel}}</label>
-    <select name="{{menuname}}" id="{{menuname}}">
+    <select name="{{menuname}}" id="{{menuname}}" class="form-control">
         {{#menuoptions}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
         {{/menuoptions}}
diff --git a/grade/report/singleview/templates/button.mustache b/grade/report/singleview/templates/button.mustache
index a922e89b8d118..43fdbcf1adf25 100644
--- a/grade/report/singleview/templates/button.mustache
+++ b/grade/report/singleview/templates/button.mustache
@@ -17,4 +17,4 @@
 {{!
     Button.
 }}
-<input type="{{type}}" value={{#quote}}{{value}}{{/quote}}>
+<input type="{{type}}" value={{#quote}}{{value}}{{/quote}} class="btn btn-secondary">
diff --git a/grade/report/singleview/templates/dropdown_attribute.mustache b/grade/report/singleview/templates/dropdown_attribute.mustache
index e6388ca809ed6..9f3be1a882d0a 100644
--- a/grade/report/singleview/templates/dropdown_attribute.mustache
+++ b/grade/report/singleview/templates/dropdown_attribute.mustache
@@ -17,7 +17,7 @@
 {{!
     Dropdown attribute.
 }}
-<select id="{{name}}" name="{{name}}" tabindex="1" {{#disabled}}disabled{{/disabled}}>
+<select id="{{name}}" name="{{name}}" class="custom-select" tabindex="1" {{#disabled}}disabled{{/disabled}}>
     {{#options}}
         <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
     {{/options}}
diff --git a/grade/report/singleview/templates/text_attribute.mustache b/grade/report/singleview/templates/text_attribute.mustache
index 3b93780129b4c..ffd06e967fd40 100644
--- a/grade/report/singleview/templates/text_attribute.mustache
+++ b/grade/report/singleview/templates/text_attribute.mustache
@@ -18,5 +18,5 @@
     Text attribute.
 }}
 <label for="{{name}}" class="accesshide">{{label}}</label>
-<input id="{{name}}" name="{{name}}" type="text" value="{{value}}" {{#tabindex}}tabindex="{{.}}"{{/tabindex}} {{#disabled}}disabled{{/disabled}}>
+<input id="{{name}}" name="{{name}}" type="text" value="{{value}}" class="form-control" {{#tabindex}}tabindex="{{.}}"{{/tabindex}} {{#disabled}}disabled{{/disabled}}>
 <input type="hidden" name="old{{name}}" value="{{value}}">
diff --git a/theme/boost/templates/gradereport_singleview/bulk_insert.mustache b/theme/bootstrapbase/templates/gradereport_singleview/bulk_insert.mustache
similarity index 92%
rename from theme/boost/templates/gradereport_singleview/bulk_insert.mustache
rename to theme/bootstrapbase/templates/gradereport_singleview/bulk_insert.mustache
index abe592ac131ab..ad4b657442443 100644
--- a/theme/boost/templates/gradereport_singleview/bulk_insert.mustache
+++ b/theme/bootstrapbase/templates/gradereport_singleview/bulk_insert.mustache
@@ -21,10 +21,10 @@
     <input type="checkbox" name="{{applyname}}" value="1" id="{{applyname}}">
     <label for="{{applyname}}">{{applylabel}}</label>
 </div>
-<fieldset class="form-inline">
+<fieldset>
     <legend class="accesshide">{{label}}</legend>
     <label for="{{menuname}}">{{menulabel}}</label>
-    <select name="{{menuname}}" id="{{menuname}}" class="form-control">
+    <select name="{{menuname}}" id="{{menuname}}">
         {{#menuoptions}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
         {{/menuoptions}}
diff --git a/theme/boost/templates/gradereport_singleview/button.mustache b/theme/bootstrapbase/templates/gradereport_singleview/button.mustache
similarity index 89%
rename from theme/boost/templates/gradereport_singleview/button.mustache
rename to theme/bootstrapbase/templates/gradereport_singleview/button.mustache
index 43fdbcf1adf25..a922e89b8d118 100644
--- a/theme/boost/templates/gradereport_singleview/button.mustache
+++ b/theme/bootstrapbase/templates/gradereport_singleview/button.mustache
@@ -17,4 +17,4 @@
 {{!
     Button.
 }}
-<input type="{{type}}" value={{#quote}}{{value}}{{/quote}} class="btn btn-secondary">
+<input type="{{type}}" value={{#quote}}{{value}}{{/quote}}>
diff --git a/theme/boost/templates/gradereport_singleview/dropdown_attribute.mustache b/theme/bootstrapbase/templates/gradereport_singleview/dropdown_attribute.mustache
similarity index 89%
rename from theme/boost/templates/gradereport_singleview/dropdown_attribute.mustache
rename to theme/bootstrapbase/templates/gradereport_singleview/dropdown_attribute.mustache
index 9f3be1a882d0a..e6388ca809ed6 100644
--- a/theme/boost/templates/gradereport_singleview/dropdown_attribute.mustache
+++ b/theme/bootstrapbase/templates/gradereport_singleview/dropdown_attribute.mustache
@@ -17,7 +17,7 @@
 {{!
     Dropdown attribute.
 }}
-<select id="{{name}}" name="{{name}}" class="custom-select" tabindex="1" {{#disabled}}disabled{{/disabled}}>
+<select id="{{name}}" name="{{name}}" tabindex="1" {{#disabled}}disabled{{/disabled}}>
     {{#options}}
         <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
     {{/options}}
diff --git a/theme/boost/templates/gradereport_singleview/text_attribute.mustache b/theme/bootstrapbase/templates/gradereport_singleview/text_attribute.mustache
similarity index 89%
rename from theme/boost/templates/gradereport_singleview/text_attribute.mustache
rename to theme/bootstrapbase/templates/gradereport_singleview/text_attribute.mustache
index ffd06e967fd40..3b93780129b4c 100644
--- a/theme/boost/templates/gradereport_singleview/text_attribute.mustache
+++ b/theme/bootstrapbase/templates/gradereport_singleview/text_attribute.mustache
@@ -18,5 +18,5 @@
     Text attribute.
 }}
 <label for="{{name}}" class="accesshide">{{label}}</label>
-<input id="{{name}}" name="{{name}}" type="text" value="{{value}}" class="form-control" {{#tabindex}}tabindex="{{.}}"{{/tabindex}} {{#disabled}}disabled{{/disabled}}>
+<input id="{{name}}" name="{{name}}" type="text" value="{{value}}" {{#tabindex}}tabindex="{{.}}"{{/tabindex}} {{#disabled}}disabled{{/disabled}}>
 <input type="hidden" name="old{{name}}" value="{{value}}">