diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 77e0a354a..3a28a9d3e 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -7,7 +7,18 @@
  *= stub reports_pdf
  */
 
-@import "shared_styles/global_elements";
+@import "shared_styles/constants/*";
+
+@import "constants";
+
+@import "bootstrap-sprockets";
+@import "bootstrap";
+@import "bootstrap-datetimepicker";
+@import "bootstrap-colorselector";
+@import "bootstrap-tagsinput";
+@import "bootstrap-tagsinput-typeahead";
+
+@import "shared_styles/elements/*";
 
 @import "handsontable.full.min";
 @import "ajax-bootstrap-select.min";
diff --git a/app/assets/stylesheets/shared_styles/global_elements.scss b/app/assets/stylesheets/shared_styles/global_elements.scss
index 0bc9664a9..5bfab7225 100644
--- a/app/assets/stylesheets/shared_styles/global_elements.scss
+++ b/app/assets/stylesheets/shared_styles/global_elements.scss
@@ -1,16 +1,6 @@
 // scss-lint:disable Comment
 
 @import "constants/*";
-
-@import "../constants";
-
-@import "bootstrap-sprockets";
-@import "bootstrap";
-@import "bootstrap-datetimepicker";
-@import "bootstrap-colorselector";
-@import "bootstrap-tagsinput";
-@import "bootstrap-tagsinput-typeahead";
-
 @import "elements/*";
 
 // Examples
diff --git a/app/views/reports/new/modal/_experiment_contents_inner.html.erb b/app/views/reports/new/modal/_experiment_contents_inner.html.erb
index c80f4be66..71c7ff6ee 100644
--- a/app/views/reports/new/modal/_experiment_contents_inner.html.erb
+++ b/app/views/reports/new/modal/_experiment_contents_inner.html.erb
@@ -8,7 +8,7 @@
   <div class="checkbox-tree">
     <ul>
       <li>
-        <%= form.custom_check_box :experiment_all, label: experiment.name %>
+        <%= form.check_box :experiment_all, label: experiment.name %>
         <ul>
 
           <% experiment.my_module_groups.each do |my_module_group| %>
@@ -24,7 +24,7 @@
           <!-- Tasks without groups -->
           <% experiment.my_modules.without_group.each do |my_module| %>
             <li>
-              <%= form.custom_check_box "modules[#{my_module.id}]", label: my_module.name %>
+              <%= form.check_box "modules[#{my_module.id}]", label: my_module.name %>
             </li>
           <% end %>
 
diff --git a/app/views/user_my_modules/_index_edit.html.erb b/app/views/user_my_modules/_index_edit.html.erb
index 04ab903b6..c5c384454 100644
--- a/app/views/user_my_modules/_index_edit.html.erb
+++ b/app/views/user_my_modules/_index_edit.html.erb
@@ -43,7 +43,7 @@
       <%= collection_select(:user_my_module, :user_id, @unassigned_users, :id, :full_name, {}, { class: 'selectpicker' }) %>
       </div>
       <div class="col-xs-2">
-        <%= f.button class: 'btn btn btn-primary' do %>
+        <%= f.button class: 'btn btn-primary' do %>
           <span class="fas fa-plus"></span>
           <span class="hidden-xs"><%= t("experiments.canvas.full_zoom.modal_manage_users.create") %></span>
         <% end %>