diff --git a/backend/app/assets/javascripts/spree/backend/shipments.js b/backend/app/assets/javascripts/spree/backend/shipments.js
index 2ab3d5a7b12..d34c7cfa9e5 100644
--- a/backend/app/assets/javascripts/spree/backend/shipments.js
+++ b/backend/app/assets/javascripts/spree/backend/shipments.js
@@ -53,7 +53,7 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
         json = response.responseJSON;
         message = json.error;
         for (error in json.errors) {
-          message += '<br />' + json.errors[error].join();
+          message += '<br>' + json.errors[error].join();
         }
         window.show_flash('error', message);
       }
diff --git a/backend/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs b/backend/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs
index c526b001987..1841126db70 100644
--- a/backend/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs
+++ b/backend/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs
@@ -9,7 +9,7 @@
   <td class="line-item-name">
     {{ line_item.variant.name }}<br>
     {{#if line_item.variant.options_text }}
-      {{ line_item.variant.options_text }}<br/>
+      {{ line_item.variant.options_text }}<br>
     {{/if}}
     <strong>{{ t "sku" }}:</strong> {{ line_item.variant.sku }}
   </td>
diff --git a/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs b/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs
index 60dcc671fcd..3292a3ab518 100644
--- a/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs
+++ b/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs
@@ -1,8 +1,8 @@
 <fieldset>
   <table class="stock-levels" data-hook="stock-levels">
     <colgroup>
-      <col style="width: 50%;" />
-      <col style="width: 50%;" />
+      <col style="width: 50%;">
+      <col style="width: 50%;">
     </colgroup>
     <thead>
       <th>{{ t "name" }}</th>
diff --git a/backend/app/helpers/spree/admin/adjustments_helper.rb b/backend/app/helpers/spree/admin/adjustments_helper.rb
index b32df21913a..79370fa6f4f 100644
--- a/backend/app/helpers/spree/admin/adjustments_helper.rb
+++ b/backend/app/helpers/spree/admin/adjustments_helper.rb
@@ -27,7 +27,7 @@ def display_line_item(line_item)
         parts << variant.product.name
         parts << "(#{variant.options_text})" if variant.options_text.present?
         parts << line_item.display_amount
-        safe_join(parts, "<br />".html_safe)
+        safe_join(parts, "<br>".html_safe)
       end
 
       def display_shipment(shipment)
@@ -35,7 +35,7 @@ def display_shipment(shipment)
           "#{t('spree.shipment')} ##{shipment.number}",
           shipment.display_cost
         ]
-        safe_join(parts, "<br />".html_safe)
+        safe_join(parts, "<br>".html_safe)
       end
 
       def display_order(_order)
diff --git a/backend/app/helpers/spree/admin/base_helper.rb b/backend/app/helpers/spree/admin/base_helper.rb
index 234505c6d9d..c77b1dd2c9f 100644
--- a/backend/app/helpers/spree/admin/base_helper.rb
+++ b/backend/app/helpers/spree/admin/base_helper.rb
@@ -17,7 +17,7 @@ def error_message_on(object, method, _options = {})
         obj = object.respond_to?(:errors) ? object : instance_variable_get("@#{object}")
 
         if obj && obj.errors[method].present?
-          errors = safe_join(obj.errors[method], "<br />".html_safe)
+          errors = safe_join(obj.errors[method], "<br>".html_safe)
           content_tag(:span, errors, class: 'formError')
         else
           ''
diff --git a/backend/app/helpers/spree/admin/stock_movements_helper.rb b/backend/app/helpers/spree/admin/stock_movements_helper.rb
index dc8db0b0ded..4b1328ffbca 100644
--- a/backend/app/helpers/spree/admin/stock_movements_helper.rb
+++ b/backend/app/helpers/spree/admin/stock_movements_helper.rb
@@ -23,7 +23,7 @@ def display_variant(stock_movement)
         variant = stock_movement.stock_item.variant
         output = [variant.name]
         output << variant.options_text unless variant.options_text.blank?
-        safe_join(output, "<br />".html_safe)
+        safe_join(output, "<br>".html_safe)
       end
     end
   end
diff --git a/backend/app/views/spree/admin/adjustment_reasons/index.html.erb b/backend/app/views/spree/admin/adjustment_reasons/index.html.erb
index 5d488efca24..110672ae72f 100644
--- a/backend/app/views/spree/admin/adjustment_reasons/index.html.erb
+++ b/backend/app/views/spree/admin/adjustment_reasons/index.html.erb
@@ -17,9 +17,9 @@
 <% if @adjustment_reasons.any? %>
   <table class="index" id='listing_adjustment_reasons'>
     <colgroup>
-      <col style="width: 65%" />
-      <col style="width: 20%" />
-      <col style="width: 15%" />
+      <col style="width: 65%">
+      <col style="width: 20%">
+      <col style="width: 15%">
     </colgroup>
     <thead>
       <tr data-hook="adjustment_reasons_header">
diff --git a/backend/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb b/backend/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb
index 96529f90383..567c5608e64 100644
--- a/backend/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb
+++ b/backend/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb
@@ -1,12 +1,12 @@
 <div data-hook="admin_adjustment_reason_form_fields" class="row">
   <div class="col-3">
     <%= f.field_container :name do %>
-      <%= f.label :name, class: 'required' %><br />
+      <%= f.label :name, class: 'required' %><br>
       <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :code do %>
-      <%= f.label :code, class: 'required' %><br />
+      <%= f.label :code, class: 'required' %><br>
       <%= f.text_field :code, class: 'fullwidth' %>
     <% end %>
 
diff --git a/backend/app/views/spree/admin/adjustments/_form.html.erb b/backend/app/views/spree/admin/adjustments/_form.html.erb
index 56e15864560..eaffbfc9246 100644
--- a/backend/app/views/spree/admin/adjustments/_form.html.erb
+++ b/backend/app/views/spree/admin/adjustments/_form.html.erb
@@ -19,7 +19,7 @@
 
     <div class="col-3">
       <%= f.field_container :label do %>
-        <%= f.label :adjustment_reason_id %><br/>
+        <%= f.label :adjustment_reason_id %><br>
         <%= f.collection_select(:adjustment_reason_id, reasons_for(@adjustment), :id, :name, {include_blank: true}, {"data-placeholder" => t('spree.select_a_reason'), class: 'custom-select fullwidth'}) %>
       <% end %>
     </div>
diff --git a/backend/app/views/spree/admin/adjustments/index.html.erb b/backend/app/views/spree/admin/adjustments/index.html.erb
index f75ede7ead2..48c56c62f01 100644
--- a/backend/app/views/spree/admin/adjustments/index.html.erb
+++ b/backend/app/views/spree/admin/adjustments/index.html.erb
@@ -18,6 +18,6 @@
     <%= button_tag t('spree.add_coupon_code'), id: "add_coupon_code", class: 'btn btn-primary' %>
   </div>
 <% end %>
-<%= javascript_tag do -%>
+<script>
   var order_number = '<%= @order.number %>';
-<% end -%>
+</script>
diff --git a/backend/app/views/spree/admin/adjustments/new.html.erb b/backend/app/views/spree/admin/adjustments/new.html.erb
index 8823a9f6499..1c9bf3131fb 100644
--- a/backend/app/views/spree/admin/adjustments/new.html.erb
+++ b/backend/app/views/spree/admin/adjustments/new.html.erb
@@ -3,7 +3,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_path(@order)) %>
 <% admin_breadcrumb(t('spree.new_adjustment')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/cancellations/index.html.erb b/backend/app/views/spree/admin/cancellations/index.html.erb
index f15f9c1c54e..faf81b25e3f 100644
--- a/backend/app/views/spree/admin/cancellations/index.html.erb
+++ b/backend/app/views/spree/admin/cancellations/index.html.erb
@@ -4,12 +4,12 @@
 
 <table class="stock-contents index">
   <colgroup>
-    <col style="width: 10%;" />
-    <col style="width: 35%;" />
-    <col style="width: 10%;" />
-    <col style="width: 15%;" />
-    <col style="width: 20%;" />
-    <col style="width: 10%;" />
+    <col style="width: 10%;">
+    <col style="width: 35%;">
+    <col style="width: 10%;">
+    <col style="width: 15%;">
+    <col style="width: 20%;">
+    <col style="width: 10%;">
   </colgroup>
 
   <thead>
diff --git a/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb b/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb
index 7375fe3e572..cb4460bf273 100644
--- a/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb
+++ b/backend/app/views/spree/admin/customer_returns/_return_item_decision.html.erb
@@ -8,7 +8,7 @@
       <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
       <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:acceptance_status_errors) %></th>
       <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:reception_status) %></th>
-      <% unless return_items.all?(&:received?)%>
+      <% unless return_items.all?(&:received?) %>
         <th class="wrap-text"><%= Spree::ReturnItem.human_attribute_name(:item_received?) %></th>
       <% end %>
       <% if show_decision %>
diff --git a/backend/app/views/spree/admin/customer_returns/new.html.erb b/backend/app/views/spree/admin/customer_returns/new.html.erb
index 46d08eebded..8c84c0b5240 100644
--- a/backend/app/views/spree/admin/customer_returns/new.html.erb
+++ b/backend/app/views/spree/admin/customer_returns/new.html.erb
@@ -3,7 +3,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order)) %>
 <% admin_breadcrumb(t('spree.new_customer_return')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/images/_image_row.html.erb b/backend/app/views/spree/admin/images/_image_row.html.erb
index d421c41f638..2b92012fc14 100644
--- a/backend/app/views/spree/admin/images/_image_row.html.erb
+++ b/backend/app/views/spree/admin/images/_image_row.html.erb
@@ -1,5 +1,4 @@
 <tr id="<%= spree_dom_id image %>" data-hook="images_row">
-
   <td>
     <% if can?(:update_positions, Spree::Image) %>
       <span class="handle"></span>
@@ -28,7 +27,7 @@
         <%= f.select :viewable_id, options_for_select(@variants, image.viewable_id), {}, class: 'select2 fullwidth', autocomplete: "off" %>
       <% end %>
     </td>
-  <% end # @product.has_variants? %>
+  <% end %>
 
   <td>
     <%= fields_for image do |f| %>
diff --git a/backend/app/views/spree/admin/images/edit.html.erb b/backend/app/views/spree/admin/images/edit.html.erb
index 9cefc632e3a..bd9e48811b3 100644
--- a/backend/app/views/spree/admin/images/edit.html.erb
+++ b/backend/app/views/spree/admin/images/edit.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Image), admin_product_images_path(@product)) %>
 <% admin_breadcrumb(@image.filename) %>
 
-
 <% content_for :page_actions do %>
   <li><%= link_to t('spree.back_to_images_list'), admin_product_images_url(@product), class: 'btn btn-primary' %></li>
 <% end %>
diff --git a/backend/app/views/spree/admin/images/index.html.erb b/backend/app/views/spree/admin/images/index.html.erb
index cbde4e00d2b..f20e49a5996 100644
--- a/backend/app/views/spree/admin/images/index.html.erb
+++ b/backend/app/views/spree/admin/images/index.html.erb
@@ -2,7 +2,6 @@
 
 <% admin_breadcrumb(plural_resource_name(Spree::Image)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Image) %>
     <li>
diff --git a/backend/app/views/spree/admin/option_types/_form.html.erb b/backend/app/views/spree/admin/option_types/_form.html.erb
index 3bb4e4ba934..02d7aff2fd1 100644
--- a/backend/app/views/spree/admin/option_types/_form.html.erb
+++ b/backend/app/views/spree/admin/option_types/_form.html.erb
@@ -1,7 +1,7 @@
 <div data-hook="admin_option_type_form_fields" class="align-center row">
   <div class="col-6">
     <%= f.field_container :name do %>
-      <%= f.label :name, class: 'required' %><br />
+      <%= f.label :name, class: 'required' %><br>
       <%= f.text_field :name, class: "fullwidth" %>
       <%= f.error_message_on :name %>
     <% end %>
@@ -9,7 +9,7 @@
 
   <div class="col-6">
     <%= f.field_container :presentation do %>
-      <%= f.label :presentation, class: 'required' %><br />
+      <%= f.label :presentation, class: 'required' %><br>
       <%= f.text_field :presentation, class: "fullwidth" %>
       <%= f.error_message_on :presentation %>
     <% end %>
diff --git a/backend/app/views/spree/admin/option_types/_option_value_fields.html.erb b/backend/app/views/spree/admin/option_types/_option_value_fields.html.erb
index 7fad0c35ee3..a210546fa45 100644
--- a/backend/app/views/spree/admin/option_types/_option_value_fields.html.erb
+++ b/backend/app/views/spree/admin/option_types/_option_value_fields.html.erb
@@ -1,4 +1,4 @@
-<tr class="option_value fields" id="spree_<%= dom_id(f.object) %>"  data-hook="option_value">
+<tr class="option_value fields" id="spree_<%= dom_id(f.object) %>" data-hook="option_value">
   <td>
     <% if f.object.persisted? %>
       <span class="handle"></span>
diff --git a/backend/app/views/spree/admin/option_types/edit.html.erb b/backend/app/views/spree/admin/option_types/edit.html.erb
index 69001b6c5e1..1431df514df 100644
--- a/backend/app/views/spree/admin/option_types/edit.html.erb
+++ b/backend/app/views/spree/admin/option_types/edit.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::OptionType), spree.admin_option_types_path) %>
 <% admin_breadcrumb(@option_type.name) %>
 
-
 <% content_for :page_actions do %>
   <li>
     <span id="new_add_option_value" data-hook>
diff --git a/backend/app/views/spree/admin/option_types/index.html.erb b/backend/app/views/spree/admin/option_types/index.html.erb
index d89cf3bc8fc..0ae7ab47ae6 100644
--- a/backend/app/views/spree/admin/option_types/index.html.erb
+++ b/backend/app/views/spree/admin/option_types/index.html.erb
@@ -1,7 +1,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
 <% admin_breadcrumb(plural_resource_name(Spree::OptionType)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::OptionType) %>
     <li id="new_ot_link">
diff --git a/backend/app/views/spree/admin/orders/_adjustments.html.erb b/backend/app/views/spree/admin/orders/_adjustments.html.erb
index c84400f72d5..10e587d635a 100644
--- a/backend/app/views/spree/admin/orders/_adjustments.html.erb
+++ b/backend/app/views/spree/admin/orders/_adjustments.html.erb
@@ -3,8 +3,8 @@
   <table>
     <thead>
       <tr>
-        <th><%= Spree::Adjustment.human_attribute_name(:name)%></th>
-        <th><%= Spree::Adjustment.human_attribute_name(:amount)%></th>
+        <th><%= Spree::Adjustment.human_attribute_name(:name) %></th>
+        <th><%= Spree::Adjustment.human_attribute_name(:amount) %></th>
       </tr>
     </thead>
     <tbody data-hook="order_details_adjustments">
diff --git a/backend/app/views/spree/admin/orders/_carton.html.erb b/backend/app/views/spree/admin/orders/_carton.html.erb
index e1e0fe3fe65..27b63ce97e8 100644
--- a/backend/app/views/spree/admin/orders/_carton.html.erb
+++ b/backend/app/views/spree/admin/orders/_carton.html.erb
@@ -12,11 +12,11 @@
 
   <table class="stock-contents carton index" data-hook="stock-contents">
     <colgroup>
-      <col style="width: 10%;" />
-      <col style="width: 45%;" />
-      <col style="width: 15%;" />
-      <col style="width: 15%;" />
-      <col style="width: 15%;" />
+      <col style="width: 10%;">
+      <col style="width: 45%;">
+      <col style="width: 15%;">
+      <col style="width: 15%;">
+      <col style="width: 15%;">
     </colgroup>
 
     <thead>
diff --git a/backend/app/views/spree/admin/orders/_form.html.erb b/backend/app/views/spree/admin/orders/_form.html.erb
index b51b02eaf6e..48b6ea59853 100644
--- a/backend/app/views/spree/admin/orders/_form.html.erb
+++ b/backend/app/views/spree/admin/orders/_form.html.erb
@@ -8,12 +8,12 @@
 
   <%= render "spree/admin/orders/order_details", { order: order } %>
 
-  <%= javascript_tag do -%>
+  <script>
     var order_number = '<%= @order.number %>';
     var shipments = [];
 
     <% @order.shipments.each do |shipment| %>
             shipments.push(<%== shipment.as_json(root: false, only: [:id, :tracking, :number, :state, :stock_location_id], include: [:inventory_units, :stock_location]).to_json %>);
     <% end %>
-  <% end -%>
+  </script>
 </div>
diff --git a/backend/app/views/spree/admin/orders/_line_items.html.erb b/backend/app/views/spree/admin/orders/_line_items.html.erb
index 6ed30cca0e7..17fec802fea 100644
--- a/backend/app/views/spree/admin/orders/_line_items.html.erb
+++ b/backend/app/views/spree/admin/orders/_line_items.html.erb
@@ -1,11 +1,11 @@
 <table class="line-items index" data-hook="line-items">
   <colgroup>
-    <col style="width: 10%;" />
-    <col style="width: 45%;" />
-    <col style="width: 10%;" />
-    <col style="width: 10%;" />
-    <col style="width: 10%;" />
-    <col style="width: 15%;" />
+    <col style="width: 10%;">
+    <col style="width: 45%;">
+    <col style="width: 10%;">
+    <col style="width: 10%;">
+    <col style="width: 10%;">
+    <col style="width: 15%;">
   </colgroup>
 
   <thead>
diff --git a/backend/app/views/spree/admin/orders/_risk_analysis.html.erb b/backend/app/views/spree/admin/orders/_risk_analysis.html.erb
index d4c81936e5e..cdfbe77fe2c 100644
--- a/backend/app/views/spree/admin/orders/_risk_analysis.html.erb
+++ b/backend/app/views/spree/admin/orders/_risk_analysis.html.erb
@@ -2,10 +2,10 @@
   <legend><%= "#{t('spree.risk_analysis')}: #{t('spree.not') unless @order.is_risky?} #{t('spree.risky')}" %></legend>
   <table>
     <thead>
-      <th><%= t('spree.risk')%></th>
-      <th><%= t('spree.status')%></th>
+      <th><%= t('spree.risk') %></th>
+      <th><%= t('spree.status') %></th>
     </thead>
-    <tbody id="risk-analysis" data-hook="order_details_adjustments"  class="with-border">
+    <tbody id="risk-analysis" data-hook="order_details_adjustments" class="with-border">
       <tr class="">
         <td><strong>
           <%= t('spree.failed_payment_attempts') %>:
diff --git a/backend/app/views/spree/admin/orders/_shipment.html.erb b/backend/app/views/spree/admin/orders/_shipment.html.erb
index 5ddf1ab8273..f843a0d25e5 100644
--- a/backend/app/views/spree/admin/orders/_shipment.html.erb
+++ b/backend/app/views/spree/admin/orders/_shipment.html.erb
@@ -27,12 +27,12 @@
 
   <table class="stock-contents shipment index" data-hook="stock-contents">
     <colgroup>
-      <col style="width: 17.5%;" />
-      <col style="width: 30%;" />
-      <col style="width: 12.5%;" />
-      <col style="width: 15%;" />
-      <col style="width: 15%;" />
-      <col style="width: 10%;" />
+      <col style="width: 17.5%;">
+      <col style="width: 30%;">
+      <col style="width: 12.5%;">
+      <col style="width: 15%;">
+      <col style="width: 15%;">
+      <col style="width: 10%;">
     </colgroup>
 
     <thead>
diff --git a/backend/app/views/spree/admin/orders/cart.html.erb b/backend/app/views/spree/admin/orders/cart.html.erb
index 86a7de540d6..06f02b5fa8f 100644
--- a/backend/app/views/spree/admin/orders/cart.html.erb
+++ b/backend/app/views/spree/admin/orders/cart.html.erb
@@ -11,7 +11,6 @@
 
 <% admin_breadcrumb(t('spree.cart')) %>
 
-
 <div data-hook="admin_order_edit_header">
   <%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
 </div>
diff --git a/backend/app/views/spree/admin/orders/confirm.html.erb b/backend/app/views/spree/admin/orders/confirm.html.erb
index 35a52574b77..17e9c168421 100644
--- a/backend/app/views/spree/admin/orders/confirm.html.erb
+++ b/backend/app/views/spree/admin/orders/confirm.html.erb
@@ -2,7 +2,6 @@
 
 <% admin_breadcrumb(t('spree.confirm_order')) %>
 
-
 <%= render partial: 'spree/admin/orders/confirm/customer_details', locals: {order: @order} %>
 
 <% if Spree::Order.checkout_step_names.include?(:delivery) %>
diff --git a/backend/app/views/spree/admin/orders/confirm/_customer_details.html.erb b/backend/app/views/spree/admin/orders/confirm/_customer_details.html.erb
index 2192d837a3e..71005ad5ebb 100644
--- a/backend/app/views/spree/admin/orders/confirm/_customer_details.html.erb
+++ b/backend/app/views/spree/admin/orders/confirm/_customer_details.html.erb
@@ -1,6 +1,6 @@
 <fieldset class="no-border-bottom" data-hook="customer_details_total">
   <legend><%= t('spree.customer') %></legend>
-  <div class="customer"><%= order.user.try(:email) %></div><br/>
+  <div class="customer"><%= order.user.try(:email) %></div><br>
 </fieldset>
 
 <fieldset class="no-border-bottom no-border-top">
diff --git a/backend/app/views/spree/admin/orders/confirm_advance.html.erb b/backend/app/views/spree/admin/orders/confirm_advance.html.erb
index 2441c4bc2c2..60a2fa9f380 100644
--- a/backend/app/views/spree/admin/orders/confirm_advance.html.erb
+++ b/backend/app/views/spree/admin/orders/confirm_advance.html.erb
@@ -2,9 +2,8 @@
 
 <% admin_breadcrumb(t('spree.confirm_order')) %>
 
-
 <div class="form-buttons filter-actions actions" data-hook="complete-order-button">
-  <div><%= t('spree.order_please_refresh') %></div><br/>
+  <div><%= t('spree.order_please_refresh') %></div><br>
   <%= button_to [:advance, :admin, @order], { class: 'button', method: 'put' } do %>
     <%= t('spree.order_refresh_totals') %>
   <% end %>
diff --git a/backend/app/views/spree/admin/orders/customer_details/edit.html.erb b/backend/app/views/spree/admin/orders/customer_details/edit.html.erb
index b1c3e25c989..e772dbfe262 100644
--- a/backend/app/views/spree/admin/orders/customer_details/edit.html.erb
+++ b/backend/app/views/spree/admin/orders/customer_details/edit.html.erb
@@ -2,7 +2,6 @@
 
 <% admin_breadcrumb(t('spree.customer_details')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/orders/customer_details/show.html.erb b/backend/app/views/spree/admin/orders/customer_details/show.html.erb
index a08add11902..903fd41cb2b 100644
--- a/backend/app/views/spree/admin/orders/customer_details/show.html.erb
+++ b/backend/app/views/spree/admin/orders/customer_details/show.html.erb
@@ -2,12 +2,10 @@
 
 <% admin_breadcrumb(t('spree.customer_details')) %>
 
-
 <% content_for :page_actions do %>
   <li><%= link_to t('spree.back_to_orders_list'), admin_orders_path, class: 'btn btn-primary' %></li>
 <% end %>
 
-
 <main class="col-5">
   <section>
     <%= content_tag :h4, t('spree.account') %>
diff --git a/backend/app/views/spree/admin/orders/index.html.erb b/backend/app/views/spree/admin/orders/index.html.erb
index d6c060b6ae4..18750fb2401 100644
--- a/backend/app/views/spree/admin/orders/index.html.erb
+++ b/backend/app/views/spree/admin/orders/index.html.erb
@@ -2,7 +2,6 @@
 
 <% admin_breadcrumb(plural_resource_name(Spree::Order)) %>
 
-
 <% content_for :page_actions do %>
   <li>
     <%= link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order', class: 'btn btn-primary' %>
@@ -158,7 +157,7 @@
           </span>
         </td>
         <td>
-          <% if order.payment_state  %>
+          <% if order.payment_state %>
             <span class="pill pill-<%= order.payment_state %>">
               <%= t(order.payment_state, scope: 'spree.payment_states') %>
             </span>
diff --git a/backend/app/views/spree/admin/payment_methods/index.html.erb b/backend/app/views/spree/admin/payment_methods/index.html.erb
index be6a657591f..26b68d65d95 100644
--- a/backend/app/views/spree/admin/payment_methods/index.html.erb
+++ b/backend/app/views/spree/admin/payment_methods/index.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(plural_resource_name(Spree::Payment)) %>
 <% admin_breadcrumb(plural_resource_name(Spree::PaymentMethod)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::PaymentMethod) %>
     <li>
@@ -36,7 +35,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @payment_methods.each do |method|%>
+      <% @payment_methods.each do |method| %>
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
           <td><span class="handle"></span></td>
           <td><%= method.name %></td>
@@ -53,7 +52,7 @@
               <%= link_to_edit method.becomes(Spree::PaymentMethod), no_text: true %>
             <% end %>
             <% if can?(:destroy, method.becomes(Spree::PaymentMethod)) %>
-              <%= link_to_delete method.becomes(Spree::PaymentMethod), no_text: true  %>
+              <%= link_to_delete method.becomes(Spree::PaymentMethod), no_text: true %>
             <% end %>
           </td>
         </tr>
diff --git a/backend/app/views/spree/admin/payment_methods/new.html.erb b/backend/app/views/spree/admin/payment_methods/new.html.erb
index ff3da9f77b8..62df088d880 100644
--- a/backend/app/views/spree/admin/payment_methods/new.html.erb
+++ b/backend/app/views/spree/admin/payment_methods/new.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::PaymentMethod), spree.admin_payment_methods_path) %>
 <% admin_breadcrumb(t('spree.new_payment_method')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/payments/_form.html.erb b/backend/app/views/spree/admin/payments/_form.html.erb
index e659043b738..d669d4c9bd4 100644
--- a/backend/app/views/spree/admin/payments/_form.html.erb
+++ b/backend/app/views/spree/admin/payments/_form.html.erb
@@ -26,7 +26,7 @@
 
           <div class="payment-methods" id="payment_method_<%= method.id %>" data-payment-method-id="<%= method.id %>">
             <% if method.source_required? %>
-              <br />
+              <br>
               <%= render partial: "spree/admin/payments/source_forms/#{method.partial_name}",
                          locals: { payment_method: method, previous_cards: method.reusable_sources(@order) } %>
             <% end %>
diff --git a/backend/app/views/spree/admin/payments/_list.html.erb b/backend/app/views/spree/admin/payments/_list.html.erb
index 2e808410793..d4fb62bf0ea 100644
--- a/backend/app/views/spree/admin/payments/_list.html.erb
+++ b/backend/app/views/spree/admin/payments/_list.html.erb
@@ -1,12 +1,12 @@
 <table class="index table-responsive" id='payments' data-order-id='<%= @order.number %>'>
   <colgroup>
-    <col style="width: 15%"/>
-    <col style="width: 15%"/>
-    <col style="width: 15%"/>
-    <col style="width: 10%"/>
-    <col style="width: 10%"/>
-    <col style="width: 20%"/>
-    <col style="width: 15%"/>
+    <col style="width: 15%">
+    <col style="width: 15%">
+    <col style="width: 15%">
+    <col style="width: 10%">
+    <col style="width: 10%">
+    <col style="width: 20%">
+    <col style="width: 15%">
   </colgroup>
   <thead>
     <tr data-hook="payments_header">
diff --git a/backend/app/views/spree/admin/payments/_log_entries.html.erb b/backend/app/views/spree/admin/payments/_log_entries.html.erb
index 55899d1596c..48567e58001 100644
--- a/backend/app/views/spree/admin/payments/_log_entries.html.erb
+++ b/backend/app/views/spree/admin/payments/_log_entries.html.erb
@@ -1,8 +1,8 @@
 <table class='index' id='listing_log_entries'>
   <colgroup>
-    <col style="width: 30%" />
-    <col style="width: 60%" />
-    <col style="width: 10%" />
+    <col style="width: 30%">
+    <col style="width: 60%">
+    <col style="width: 10%">
   </colgroup>
   <thead>
     <tr>
diff --git a/backend/app/views/spree/admin/payments/credit.html.erb b/backend/app/views/spree/admin/payments/credit.html.erb
index 43d27437f63..e4189ac92d4 100644
--- a/backend/app/views/spree/admin/payments/credit.html.erb
+++ b/backend/app/views/spree/admin/payments/credit.html.erb
@@ -3,7 +3,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
 <% admin_breadcrumb(Spree::Refund.model_name.human) %>
 
-
 <%= form_tag do %>
   <h3><%= Spree::Refund.model_name.human %></h3>
   <fieldset data-hook="credit">
diff --git a/backend/app/views/spree/admin/payments/new.html.erb b/backend/app/views/spree/admin/payments/new.html.erb
index 73240680744..6b4bd01f22c 100644
--- a/backend/app/views/spree/admin/payments/new.html.erb
+++ b/backend/app/views/spree/admin/payments/new.html.erb
@@ -3,7 +3,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
 <% admin_breadcrumb(t('spree.new_payment')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erb b/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erb
index ece09fa975a..fa996aae94a 100644
--- a/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erb
+++ b/backend/app/views/spree/admin/payments/source_forms/_gateway.html.erb
@@ -4,7 +4,7 @@
   <% if previous_cards.any? %>
     <div class="field" data-hook="previous_cards">
       <% previous_cards.each do |card| %>
-        <label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br /></label>
+        <label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br></label>
       <% end %>
       <label><%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= t('spree.use_new_cc') %></label>
     </div>
diff --git a/backend/app/views/spree/admin/payments/source_views/_store_credit.html.erb b/backend/app/views/spree/admin/payments/source_views/_store_credit.html.erb
index 0e910c51279..c8a3db03afb 100644
--- a/backend/app/views/spree/admin/payments/source_views/_store_credit.html.erb
+++ b/backend/app/views/spree/admin/payments/source_views/_store_credit.html.erb
@@ -5,7 +5,7 @@
     <div class="col-4">
       <dl>
         <dt><%= Spree::StoreCreditCategory.model_name.human %>:</dt>
-        <dd><%= payment.source.category.name%></dd>
+        <dd><%= payment.source.category.name %></dd>
 
         <dt><%= Spree::StoreCredit.human_attribute_name(:memo) %>:</dt>
         <dd><%= payment.source.memo %></dd>
diff --git a/backend/app/views/spree/admin/products/_form.html.erb b/backend/app/views/spree/admin/products/_form.html.erb
index 3a106761ccf..fd1fe3a7e13 100644
--- a/backend/app/views/spree/admin/products/_form.html.erb
+++ b/backend/app/views/spree/admin/products/_form.html.erb
@@ -31,7 +31,7 @@
       <div class="mt-4">
         <div data-hook="admin_product_form_taxons">
           <%= f.field_container :taxons do %>
-            <%= f.label :taxon_ids, plural_resource_name(Spree::Taxon) %><br />
+            <%= f.label :taxon_ids, plural_resource_name(Spree::Taxon) %><br>
             <%= f.hidden_field :taxon_ids, value: @product.taxon_ids.join(',') %>
           <% end %>
         </div>
diff --git a/backend/app/views/spree/admin/products/index.html.erb b/backend/app/views/spree/admin/products/index.html.erb
index b9b87f41fcf..95e171e4d8b 100644
--- a/backend/app/views/spree/admin/products/index.html.erb
+++ b/backend/app/views/spree/admin/products/index.html.erb
@@ -16,7 +16,7 @@
   <div data-hook="admin_products_sidebar">
     <%= search_form_for [:admin, @search] do |f| %>
         <%- locals = {f: f} %>
-        <div class="row" data-hook="admin_products_index_search" >
+        <div class="row" data-hook="admin_products_index_search">
           <div class="col-6">
             <div class="field">
               <%= f.label :name_cont, Spree::Product.human_attribute_name(:name) %>
diff --git a/backend/app/views/spree/admin/promotion_categories/edit.html.erb b/backend/app/views/spree/admin/promotion_categories/edit.html.erb
index 17e2840ea94..49627e3751e 100644
--- a/backend/app/views/spree/admin/promotion_categories/edit.html.erb
+++ b/backend/app/views/spree/admin/promotion_categories/edit.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %>
 <% admin_breadcrumb(@promotion_category.name) %>
 
-
 <%= form_for @promotion_category, url: object_url, method: :put do |f| %>
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
diff --git a/backend/app/views/spree/admin/promotion_categories/index.html.erb b/backend/app/views/spree/admin/promotion_categories/index.html.erb
index 97d6c3dea2c..ed12a80b31f 100644
--- a/backend/app/views/spree/admin/promotion_categories/index.html.erb
+++ b/backend/app/views/spree/admin/promotion_categories/index.html.erb
@@ -1,7 +1,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
 <% admin_breadcrumb(plural_resource_name(Spree::PromotionCategory)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::PromotionCategory) %>
     <li>
diff --git a/backend/app/views/spree/admin/promotion_categories/new.html.erb b/backend/app/views/spree/admin/promotion_categories/new.html.erb
index b1e25f73e92..ac56c17ee3f 100644
--- a/backend/app/views/spree/admin/promotion_categories/new.html.erb
+++ b/backend/app/views/spree/admin/promotion_categories/new.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %>
 <% admin_breadcrumb(t('spree.new_promotion_category')) %>
 
-
 <%= form_for :promotion_category, url: collection_url do |f| %>
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
diff --git a/backend/app/views/spree/admin/promotions/_actions.html.erb b/backend/app/views/spree/admin/promotions/_actions.html.erb
index d4afe5f0434..302accb666e 100644
--- a/backend/app/views/spree/admin/promotions/_actions.html.erb
+++ b/backend/app/views/spree/admin/promotions/_actions.html.erb
@@ -6,7 +6,7 @@
       <legend align="center"><%= t('spree.promotion_actions') %></legend>
       <% if can?(:update, @promotion) %>
         <div class="field">
-          <%= label_tag :action_type, t('spree.adjustment_type')%>
+          <%= label_tag :action_type, t('spree.adjustment_type') %>
           <%= admin_hint t('spree.adjustment_type'), t(:promotions, scope: [:spree, :hints, "spree/calculator"]) %>
           <%= select_tag 'action_type', options, include_blank: t(:choose_promotion_action, scope: 'spree'), class: 'custom-select fullwidth', required: true %>
         </div>
diff --git a/backend/app/views/spree/admin/promotions/_form.html.erb b/backend/app/views/spree/admin/promotions/_form.html.erb
index 3507af88a96..87a5bfabd7b 100644
--- a/backend/app/views/spree/admin/promotions/_form.html.erb
+++ b/backend/app/views/spree/admin/promotions/_form.html.erb
@@ -10,7 +10,7 @@
           <% end %>
 
           <%= f.field_container :description do %>
-            <%= f.label :description %><br />
+            <%= f.label :description %><br>
             <%= f.text_area :description, rows: 7, class: 'fullwidth' %>
             <span class="info">
               <%= t('spree.character_limit') %>
@@ -18,7 +18,7 @@
           <% end %>
 
           <%= f.field_container :category do %>
-            <%= f.label :promotion_category_id, Spree::PromotionCategory.model_name.human %><br />
+            <%= f.label :promotion_category_id, Spree::PromotionCategory.model_name.human %><br>
             <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: t('spree.match_choices.none') }, { class: 'custom-select fullwidth' }) %>
           <% end %>
         </div>
@@ -27,7 +27,7 @@
 
     <div id="expiry_fields" class="col-3">
       <%= f.field_container :overall_usage_limit do %>
-        <%= f.label :usage_limit %><br />
+        <%= f.label :usage_limit %><br>
         <%= f.number_field :usage_limit, min: 0, class: 'fullwidth' %><br>
         <span class="info">
           <%= t('spree.current_promotion_usage', count: @promotion.usage_count) %>
@@ -36,7 +36,7 @@
 
       <% if @promotion.persisted? %>
         <%= f.field_container :per_code_usage_limit do %>
-          <%= f.label :per_code_usage_limit %><br />
+          <%= f.label :per_code_usage_limit %><br>
           <%= f.number_field :per_code_usage_limit, min: 0, class: 'fullwidth' %><br>
         <% end %>
       <% end %>
diff --git a/backend/app/views/spree/admin/promotions/_rules.html.erb b/backend/app/views/spree/admin/promotions/_rules.html.erb
index 978b2d7c32d..cfcb0ad2e5d 100644
--- a/backend/app/views/spree/admin/promotions/_rules.html.erb
+++ b/backend/app/views/spree/admin/promotions/_rules.html.erb
@@ -1,4 +1,4 @@
-<fieldset id="rule_fields" class ="no-border-bottom no-border-top">
+<fieldset id="rule_fields" class="no-border-bottom no-border-top">
 
   <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), remote: true, id: 'new_product_rule_form' do %>
     <fieldset>
@@ -16,7 +16,6 @@
     </fieldset>
   <% end %>
 
-
     <%= form_for @promotion, url: object_url, method: :put do |f| %>
       <fieldset class="no-border-top">
         <% if Spree::Config.allow_promotions_any_match_policy %>
diff --git a/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb b/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb
index 1cbfa649cea..2fb57a79ac7 100644
--- a/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb
+++ b/backend/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb
@@ -1,2 +1,2 @@
 <%= render partial: 'spree/admin/promotions/actions/promotion_calculators_with_custom_fields',
-           locals: { calculators: @calculators, promotion_action: promotion_action, param_prefix: param_prefix } %>
\ No newline at end of file
+           locals: { calculators: @calculators, promotion_action: promotion_action, param_prefix: param_prefix } %>
diff --git a/backend/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb b/backend/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb
index e2e962b3ff0..1e022a40119 100644
--- a/backend/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb
+++ b/backend/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb
@@ -7,5 +7,4 @@
 <%= render "spree/admin/promotions/actions/promotion_calculators_with_custom_fields",
   calculators: Rails.application.config.spree.calculators.promotion_actions_create_quantity_adjustments,
   promotion_action: promotion_action,
-  param_prefix: param_prefix
-%>
+  param_prefix: param_prefix %>
diff --git a/backend/app/views/spree/admin/promotions/index.html.erb b/backend/app/views/spree/admin/promotions/index.html.erb
index e1508d4be77..9465cfcc9b0 100644
--- a/backend/app/views/spree/admin/promotions/index.html.erb
+++ b/backend/app/views/spree/admin/promotions/index.html.erb
@@ -63,7 +63,6 @@
   </div>
 <% end %>
 
-
 <%= paginate @promotions, theme: "solidus_admin" %>
 
 <% if @promotions.length > 0 %>
diff --git a/backend/app/views/spree/admin/properties/_form.html.erb b/backend/app/views/spree/admin/properties/_form.html.erb
index 85491ac12e7..e9ea168534d 100644
--- a/backend/app/views/spree/admin/properties/_form.html.erb
+++ b/backend/app/views/spree/admin/properties/_form.html.erb
@@ -1,14 +1,14 @@
 <div data-hook="admin_property_form" class="align-center row">
   <div class="col-6">
     <%= f.field_container :name do %>
-      <%= f.label :name, class: 'required' %><br />
+      <%= f.label :name, class: 'required' %><br>
       <%= f.text_field :name, class: 'fullwidth' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
   <div class="col-6">
     <%= f.field_container :presentation do %>
-      <%= f.label :presentation, class: 'required' %><br />
+      <%= f.label :presentation, class: 'required' %><br>
       <%= f.text_field :presentation, class: 'fullwidth' %>
       <%= f.error_message_on :presentation %>
     <% end %>
diff --git a/backend/app/views/spree/admin/properties/edit.html.erb b/backend/app/views/spree/admin/properties/edit.html.erb
index 6ccfd51dcf3..7414a69d292 100644
--- a/backend/app/views/spree/admin/properties/edit.html.erb
+++ b/backend/app/views/spree/admin/properties/edit.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Property), spree.admin_properties_path) %>
 <% admin_breadcrumb(@property.name) %>
 
-
 <%= render partial: 'spree/shared/error_messages', locals: { target: @property } %>
 
 <%= form_for [:admin, @property] do |f| %>
diff --git a/backend/app/views/spree/admin/properties/filtered.html.erb b/backend/app/views/spree/admin/properties/filtered.html.erb
index fbb31cb5c96..8cff3b15dde 100644
--- a/backend/app/views/spree/admin/properties/filtered.html.erb
+++ b/backend/app/views/spree/admin/properties/filtered.html.erb
@@ -1 +1 @@
-<%= auto_complete_result @properties, :name %>
\ No newline at end of file
+<%= auto_complete_result @properties, :name %>
diff --git a/backend/app/views/spree/admin/properties/index.html.erb b/backend/app/views/spree/admin/properties/index.html.erb
index 133235ff9ba..8338cfb8349 100644
--- a/backend/app/views/spree/admin/properties/index.html.erb
+++ b/backend/app/views/spree/admin/properties/index.html.erb
@@ -1,7 +1,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
 <% admin_breadcrumb(plural_resource_name(Spree::Property)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Property) %>
     <li id="new_property_link">
diff --git a/backend/app/views/spree/admin/refund_reasons/index.html.erb b/backend/app/views/spree/admin/refund_reasons/index.html.erb
index 14eabf2faaa..ff04c19115f 100644
--- a/backend/app/views/spree/admin/refund_reasons/index.html.erb
+++ b/backend/app/views/spree/admin/refund_reasons/index.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::RefundReason)) %>
 
-
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::RefundReason) %>
@@ -18,9 +17,9 @@
 <% if @collection.any? %>
   <table class="index" id='listing_named_types' data-hook>
     <colgroup>
-      <col style="width: 65%" />
-      <col style="width: 20%" />
-      <col style="width: 15%" />
+      <col style="width: 65%">
+      <col style="width: 20%">
+      <col style="width: 15%">
     </colgroup>
     <thead>
       <tr data-hook="named_types_header">
diff --git a/backend/app/views/spree/admin/refund_reasons/new.html.erb b/backend/app/views/spree/admin/refund_reasons/new.html.erb
index 0ae7637196a..6c41c8104e9 100644
--- a/backend/app/views/spree/admin/refund_reasons/new.html.erb
+++ b/backend/app/views/spree/admin/refund_reasons/new.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::RefundReason), spree.admin_refund_reasons_path) %>
 <% admin_breadcrumb(t('spree.new_refund_reason')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/refund_reasons/shared/_form.html.erb b/backend/app/views/spree/admin/refund_reasons/shared/_form.html.erb
index 2a74e87384c..597b5fd3122 100644
--- a/backend/app/views/spree/admin/refund_reasons/shared/_form.html.erb
+++ b/backend/app/views/spree/admin/refund_reasons/shared/_form.html.erb
@@ -1,12 +1,12 @@
 <div data-hook="admin_named_type_form_fields" class="row">
   <div class="col-3">
     <%= f.field_container :name do %>
-      <%= f.label :name, class: 'required' %><br />
+      <%= f.label :name, class: 'required' %><br>
       <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :code do %>
-      <%= f.label :code, class: 'required' %><br />
+      <%= f.label :code, class: 'required' %><br>
       <%= f.text_field :code, class: 'fullwidth' %>
 
     <% end %>
diff --git a/backend/app/views/spree/admin/refunds/edit.html.erb b/backend/app/views/spree/admin/refunds/edit.html.erb
index a51b9062612..172a2fed5f7 100644
--- a/backend/app/views/spree/admin/refunds/edit.html.erb
+++ b/backend/app/views/spree/admin/refunds/edit.html.erb
@@ -9,13 +9,13 @@
     <div data-hook="admin_refund_form_fields" class="row">
       <div class="col-3">
         <div class="field">
-          <%= f.label :amount %><br/>
+          <%= f.label :amount %><br>
           <%= @refund.display_amount %>
         </div>
       </div>
       <div class="col-3">
         <div class="field">
-          <%= f.label :refund_reason_id %><br/>
+          <%= f.label :refund_reason_id %><br>
           <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'custom-select fullwidth'}) %>
         </div>
       </div>
diff --git a/backend/app/views/spree/admin/refunds/new.html.erb b/backend/app/views/spree/admin/refunds/new.html.erb
index 5a299032417..3e53bd112ab 100644
--- a/backend/app/views/spree/admin/refunds/new.html.erb
+++ b/backend/app/views/spree/admin/refunds/new.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(link_to "#{Spree::Payment.model_name.human} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment)) %>
 <% admin_breadcrumb(t('spree.new_refund')) %>
 
-
 <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
   <fieldset class="no-border-top">
     <div data-hook="admin_refund_form_fields" class="row">
@@ -16,19 +15,19 @@
       </div>
       <div class="col-3">
         <div class="field">
-          <label><%= t('spree.credit_allowed') %></label><br/>
+          <label><%= t('spree.credit_allowed') %></label><br>
           <%= Spree::Money.new(@refund.payment.credit_allowed) %>
         </div>
       </div>
       <div class="col-3">
         <div class="field">
-          <%= f.label :amount %><br/>
+          <%= f.label :amount %><br>
           <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :amount, currency: @refund.currency, required: true %>
         </div>
       </div>
       <div class="col-3">
         <div class="field">
-          <%= f.label :refund_reason_id %><br/>
+          <%= f.label :refund_reason_id %><br>
           <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {prompt: t("spree.choose_reason")}, {class: 'custom-select fullwidth'}) %>
         </div>
       </div>
diff --git a/backend/app/views/spree/admin/reimbursement_types/index.html.erb b/backend/app/views/spree/admin/reimbursement_types/index.html.erb
index 0499e67d09d..38991f108ac 100644
--- a/backend/app/views/spree/admin/reimbursement_types/index.html.erb
+++ b/backend/app/views/spree/admin/reimbursement_types/index.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::ReimbursementType)) %>
 
-
 <table class="index" id='listing_reimbursement_types' data-hook>
   <thead>
     <tr data-hook="reimbursement_types_header">
diff --git a/backend/app/views/spree/admin/reimbursements/edit.html.erb b/backend/app/views/spree/admin/reimbursements/edit.html.erb
index 13b6f573f01..7cfac46b1f2 100644
--- a/backend/app/views/spree/admin/reimbursements/edit.html.erb
+++ b/backend/app/views/spree/admin/reimbursements/edit.html.erb
@@ -2,7 +2,6 @@
 
 <% admin_breadcrumb("#{t('spree.editing_reimbursement')} #{@reimbursement.number}") %>
 
-
 <% content_for :page_actions do %>
   <li><%= link_to t('spree.back_to_customer_return'), url_for([:edit, :admin, @order, @reimbursement.customer_return]), class: 'btn btn-primary' %></li>
 <% end %>
@@ -67,7 +66,7 @@
       <%= t('spree.update') %>
     <% end %>
   </div>
-  <br/>
+  <br>
 <% end %>
 
 <fieldset>
diff --git a/backend/app/views/spree/admin/reimbursements/show.html.erb b/backend/app/views/spree/admin/reimbursements/show.html.erb
index 7033ef32e59..d540e427a17 100644
--- a/backend/app/views/spree/admin/reimbursements/show.html.erb
+++ b/backend/app/views/spree/admin/reimbursements/show.html.erb
@@ -2,7 +2,6 @@
 
 <% admin_breadcrumb("#{Spree::Reimbursement.model_name.human} #{@reimbursement.number}") %>
 
-
 <% content_for :page_actions do %>
   <li><%= link_to t('spree.back_to_customer_return'), url_for([:edit, :admin, @order, @reimbursement.customer_return]), class: 'btn btn-primary' %></li>
 <% end %>
diff --git a/backend/app/views/spree/admin/return_authorizations/edit.html.erb b/backend/app/views/spree/admin/return_authorizations/edit.html.erb
index d75c18956c8..576b0e8854f 100644
--- a/backend/app/views/spree/admin/return_authorizations/edit.html.erb
+++ b/backend/app/views/spree/admin/return_authorizations/edit.html.erb
@@ -22,14 +22,14 @@
 <%= render partial: 'spree/shared/error_messages', locals: { target: @return_authorization } %>
 
 <div data-hook="return-authorization-form-wrapper">
-	<%= form_for [:admin, @order, @return_authorization] do |f| %>
-	  <fieldset class="no-border-top">
-	    <%= render partial: 'form', locals: { f: f } %>
+  <%= form_for [:admin, @order, @return_authorization] do |f| %>
+    <fieldset class="no-border-top">
+      <%= render partial: 'form', locals: { f: f } %>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
         <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
         <%= link_to t('spree.actions.cancel'), admin_order_return_authorizations_url(@order), class: 'btn btn-primary' %>
       </div>
     </fieldset>
-	<% end %>
+  <% end %>
 </div>
diff --git a/backend/app/views/spree/admin/return_authorizations/index.html.erb b/backend/app/views/spree/admin/return_authorizations/index.html.erb
index 6384fccd113..f02db7a4160 100644
--- a/backend/app/views/spree/admin/return_authorizations/index.html.erb
+++ b/backend/app/views/spree/admin/return_authorizations/index.html.erb
@@ -12,7 +12,6 @@
 
 <% admin_breadcrumb(plural_resource_name(Spree::ReturnAuthorization)) %>
 
-
 <% if @order.shipments.any?(&:shipped?) || @order.return_authorizations.any? %>
   <table class="index">
     <thead data-hook="rma_header">
diff --git a/backend/app/views/spree/admin/return_authorizations/new.html.erb b/backend/app/views/spree/admin/return_authorizations/new.html.erb
index 1a6a92acc09..6986ec0451e 100644
--- a/backend/app/views/spree/admin/return_authorizations/new.html.erb
+++ b/backend/app/views/spree/admin/return_authorizations/new.html.erb
@@ -3,7 +3,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ReturnAuthorization), spree.admin_order_return_authorizations_url) %>
 <% admin_breadcrumb(t('spree.new_return_authorization')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/shared/_head.html.erb b/backend/app/views/spree/admin/shared/_head.html.erb
index e6684f57b57..a36b4a4fbfc 100644
--- a/backend/app/views/spree/admin/shared/_head.html.erb
+++ b/backend/app/views/spree/admin/shared/_head.html.erb
@@ -1,4 +1,4 @@
-<meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
 <meta name="turbolinks-cache-control" content="no-cache">
 
 <%= csrf_meta_tags %>
@@ -31,18 +31,18 @@
     }
   </style>
 
-  <%= javascript_tag do %>
+  <script>
     Spree.ready(function(){
       $('.translation_missing').tooltip();
     });
-  <% end %>
+  </script>
 <%- end %>
 
 <%= render "spree/admin/shared/js_locale_data" %>
 
-<%= javascript_tag do -%>
+<script>
   Spree.api_key = "<%= spree_current_user.try(:spree_api_key) %>";
   Spree.env = "<%= Rails.env %>";
-<% end %>
+</script>
 
 <%= yield :head %>
diff --git a/backend/app/views/spree/admin/shared/_js_locale_data.html.erb b/backend/app/views/spree/admin/shared/_js_locale_data.html.erb
index f9fe2079bbf..b92b6ca38c2 100644
--- a/backend/app/views/spree/admin/shared/_js_locale_data.html.erb
+++ b/backend/app/views/spree/admin/shared/_js_locale_data.html.erb
@@ -11,7 +11,7 @@
         currency_delimiter:     I18n.t('number.currency.format.delimiter'),
         activerecord:           I18n.t('activerecord')
     }))
-%>;
+  %>;
 
   Spree.currencyInfo = <%==
     JSON.dump(
diff --git a/backend/app/views/spree/admin/shared/_order_summary.html.erb b/backend/app/views/spree/admin/shared/_order_summary.html.erb
index e7f964ecf03..d72a0b91153 100644
--- a/backend/app/views/spree/admin/shared/_order_summary.html.erb
+++ b/backend/app/views/spree/admin/shared/_order_summary.html.erb
@@ -15,7 +15,7 @@
     <dt data-hook='admin_order_tab_subtotal_title'><%= Spree::Order.human_attribute_name(:item_total) %>:</dt>
     <dd id='item_total'><%= @order.display_item_total.to_html %></dd>
 
-    <% if checkout_steps.include?("delivery")  %>
+    <% if checkout_steps.include?("delivery") %>
       <dt class="order-shipment_total <%= "hidden" if @order.ship_total.zero? %>" data-hook='admin_order_tab_ship_total_title'><%= Spree::Order.human_attribute_name(:shipment_total) %>:</dt>
       <dd class="order-shipment_total <%= "hidden" if @order.ship_total.zero? %>" id='ship_total'><%= @order.display_ship_total.to_html %></dd>
     <% end %>
diff --git a/backend/app/views/spree/admin/shared/_order_tabs.html.erb b/backend/app/views/spree/admin/shared/_order_tabs.html.erb
index 9d9ed031562..3b1d5fbf8c0 100644
--- a/backend/app/views/spree/admin/shared/_order_tabs.html.erb
+++ b/backend/app/views/spree/admin/shared/_order_tabs.html.erb
@@ -1,7 +1,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Order), spree.admin_orders_path) %>
 <% admin_breadcrumb(link_to @order.number, spree.edit_admin_order_path(@order)) %>
 
-
 <% content_for :sidebar_title do %>
   <%= t('spree.order_information') %>
 <% end %>
diff --git a/backend/app/views/spree/admin/shared/named_types/_edit.html.erb b/backend/app/views/spree/admin/shared/named_types/_edit.html.erb
index 1ae05040095..0b571ebb54c 100644
--- a/backend/app/views/spree/admin/shared/named_types/_edit.html.erb
+++ b/backend/app/views/spree/admin/shared/named_types/_edit.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(index_link) %>
 <% admin_breadcrumb(@object.name) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/shared/named_types/_form.html.erb b/backend/app/views/spree/admin/shared/named_types/_form.html.erb
index da9c14d37bc..8d4b825426d 100644
--- a/backend/app/views/spree/admin/shared/named_types/_form.html.erb
+++ b/backend/app/views/spree/admin/shared/named_types/_form.html.erb
@@ -1,7 +1,7 @@
 <div data-hook="admin_named_type_form_fields" class="row">
   <div class="col-4">
     <%= f.field_container :name do %>
-      <%= f.label :name, class: 'required' %><br />
+      <%= f.label :name, class: 'required' %><br>
       <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
     <div class="checkbox">
diff --git a/backend/app/views/spree/admin/shared/named_types/_index.html.erb b/backend/app/views/spree/admin/shared/named_types/_index.html.erb
index 33a99ef4628..476fd3a792c 100644
--- a/backend/app/views/spree/admin/shared/named_types/_index.html.erb
+++ b/backend/app/views/spree/admin/shared/named_types/_index.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(sub_tab) %>
 <% admin_breadcrumb(page_title) %>
 
-
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::ReturnReason) %>
@@ -18,9 +17,9 @@
 <% if @collection.any? %>
   <table class="index" id='listing_named_types' data-hook>
     <colgroup>
-      <col style="width: 65%" />
-      <col style="width: 20%" />
-      <col style="width: 15%" />
+      <col style="width: 65%">
+      <col style="width: 20%">
+      <col style="width: 15%">
     </colgroup>
     <thead>
       <tr data-hook="named_types_header">
diff --git a/backend/app/views/spree/admin/shared/named_types/_new.html.erb b/backend/app/views/spree/admin/shared/named_types/_new.html.erb
index aac52481cea..c0c54d15a48 100644
--- a/backend/app/views/spree/admin/shared/named_types/_new.html.erb
+++ b/backend/app/views/spree/admin/shared/named_types/_new.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(index_link) %>
 <% admin_breadcrumb(new_object) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/shipping_categories/edit.html.erb b/backend/app/views/spree/admin/shipping_categories/edit.html.erb
index cf1ec2cf79e..4ba88a219a4 100644
--- a/backend/app/views/spree/admin/shipping_categories/edit.html.erb
+++ b/backend/app/views/spree/admin/shipping_categories/edit.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path) %>
 <% admin_breadcrumb(t('spree.editing_shipping_category')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/shipping_categories/index.html.erb b/backend/app/views/spree/admin/shipping_categories/index.html.erb
index b8d0cf9003e..5c3469f1566 100644
--- a/backend/app/views/spree/admin/shipping_categories/index.html.erb
+++ b/backend/app/views/spree/admin/shipping_categories/index.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::ShippingCategory)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::ShippingCategory) %>
     <li>
@@ -26,7 +25,7 @@
     </tr>
   </thead>
   <tbody>
-    <% @shipping_categories.each do |shipping_category|%>
+    <% @shipping_categories.each do |shipping_category| %>
     <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
       <td><%= shipping_category.name %></td>
       <td class="actions">
diff --git a/backend/app/views/spree/admin/shipping_categories/new.html.erb b/backend/app/views/spree/admin/shipping_categories/new.html.erb
index e493bab138d..418f54d54ee 100644
--- a/backend/app/views/spree/admin/shipping_categories/new.html.erb
+++ b/backend/app/views/spree/admin/shipping_categories/new.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path) %>
 <% admin_breadcrumb(t('spree.new_shipping_category')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/shipping_methods/edit.html.erb b/backend/app/views/spree/admin/shipping_methods/edit.html.erb
index e017bc085fb..7c4124c9f4b 100644
--- a/backend/app/views/spree/admin/shipping_methods/edit.html.erb
+++ b/backend/app/views/spree/admin/shipping_methods/edit.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path) %>
 <% admin_breadcrumb(@shipping_method.name) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/shipping_methods/index.html.erb b/backend/app/views/spree/admin/shipping_methods/index.html.erb
index 670d08e1ca3..9bdc511dcd5 100644
--- a/backend/app/views/spree/admin/shipping_methods/index.html.erb
+++ b/backend/app/views/spree/admin/shipping_methods/index.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::ShippingMethod)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::ShippingMethod) %>
     <li>
@@ -32,7 +31,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
+      <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method| %>
         <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows">
           <td><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
           <td><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
diff --git a/backend/app/views/spree/admin/shipping_methods/new.html.erb b/backend/app/views/spree/admin/shipping_methods/new.html.erb
index fa390dd6079..e8c19126ad4 100644
--- a/backend/app/views/spree/admin/shipping_methods/new.html.erb
+++ b/backend/app/views/spree/admin/shipping_methods/new.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path) %>
 <% admin_breadcrumb(t('spree.new_shipping_method')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/stock_items/_stock_management.html.erb b/backend/app/views/spree/admin/stock_items/_stock_management.html.erb
index 4c23890d801..69378d8a07e 100644
--- a/backend/app/views/spree/admin/stock_items/_stock_management.html.erb
+++ b/backend/app/views/spree/admin/stock_items/_stock_management.html.erb
@@ -64,11 +64,11 @@
         <td class="stock-location-items-cell" colspan="5">
           <table class="stock-location-items-table">
             <colgroup>
-              <col style="width: 25%" />
-              <col style="width: 20%" />
-              <col style="width: 20%" />
-              <col style="width: 20%" />
-              <col style="width: 15%" />
+              <col style="width: 25%">
+              <col style="width: 20%">
+              <col style="width: 20%">
+              <col style="width: 20%">
+              <col style="width: 15%">
             </colgroup>
             <% variant.stock_items.each do |item| %>
               <% if @stock_item_stock_locations.include?(item.stock_location) %>
diff --git a/backend/app/views/spree/admin/stock_locations/_form.html.erb b/backend/app/views/spree/admin/stock_locations/_form.html.erb
index 2a13e2ed00b..e8c07f52205 100644
--- a/backend/app/views/spree/admin/stock_locations/_form.html.erb
+++ b/backend/app/views/spree/admin/stock_locations/_form.html.erb
@@ -4,7 +4,7 @@
       <legend><%= t('.general') %></legend>
 
       <%= f.field_container :name do %>
-        <%= f.label :name, class: 'required' %><br />
+        <%= f.label :name, class: 'required' %><br>
         <%= f.text_field :name, class: 'fullwidth', required: true %>
       <% end %>
 
diff --git a/backend/app/views/spree/admin/stock_locations/edit.html.erb b/backend/app/views/spree/admin/stock_locations/edit.html.erb
index 86b63e6ffcd..f0b8bf7e34b 100644
--- a/backend/app/views/spree/admin/stock_locations/edit.html.erb
+++ b/backend/app/views/spree/admin/stock_locations/edit.html.erb
@@ -5,12 +5,11 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
 <% admin_breadcrumb(@stock_location.name) %>
 
-
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <% if can?(:show, Spree::StockMovement) %>
       <li>
-        <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(@stock_location.id), class: 'btn btn-primary'  %>
+        <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(@stock_location.id), class: 'btn btn-primary' %>
       </li>
     <% end %>
   </ul>
diff --git a/backend/app/views/spree/admin/stock_locations/index.html.erb b/backend/app/views/spree/admin/stock_locations/index.html.erb
index fe529235539..c962e0b1506 100644
--- a/backend/app/views/spree/admin/stock_locations/index.html.erb
+++ b/backend/app/views/spree/admin/stock_locations/index.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::StockLocation)) %>
 
-
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::StockLocation) %>
@@ -20,10 +19,10 @@
   <table class="index sortable" id='listing_stock_locations' data-hook data-sortable-link="<%= update_positions_admin_stock_locations_url %>">
     <colgroup>
       <col style="width: 10%">
-      <col style="width: 30%" />
-      <col style="width: 15%" />
-      <col style="width: 30%" />
-      <col style="width: 15%" />
+      <col style="width: 30%">
+      <col style="width: 15%">
+      <col style="width: 30%">
+      <col style="width: 15%">
     </colgroup>
     <thead>
       <tr data-hook="stock_locations_header">
@@ -35,10 +34,11 @@
       </tr>
     </thead>
     <tbody>
-      <% @stock_locations.each do |stock_location|
-           @edit_url = edit_admin_stock_location_path(stock_location)
-           @delete_url = admin_stock_location_path(stock_location)
-      %>
+      <% @stock_locations.each do |stock_location| %>
+        <%
+          @edit_url = edit_admin_stock_location_path(stock_location)
+          @delete_url = admin_stock_location_path(stock_location)
+        %>
         <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row">
           <td>
             <% if can?(:update_positions, Spree::StockLocation) %>
diff --git a/backend/app/views/spree/admin/stock_locations/new.html.erb b/backend/app/views/spree/admin/stock_locations/new.html.erb
index 2d75a452b0e..4b15be56cb6 100644
--- a/backend/app/views/spree/admin/stock_locations/new.html.erb
+++ b/backend/app/views/spree/admin/stock_locations/new.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
 <% admin_breadcrumb(t('spree.new_stock_location')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/stock_movements/index.html.erb b/backend/app/views/spree/admin/stock_movements/index.html.erb
index f88822a715a..97c8a048fb0 100644
--- a/backend/app/views/spree/admin/stock_movements/index.html.erb
+++ b/backend/app/views/spree/admin/stock_movements/index.html.erb
@@ -17,14 +17,11 @@
 <% end %>
 
 <% content_for :table_filter do %>
-  <%=
-    search_form_for(
-      [:admin, @search],
-      url: admin_stock_location_stock_movements_path(
-        params[:stock_location_id]
-    )) do |f|
-  %>
-    <div class ="row">
+  <%= search_form_for(
+    [:admin, @search],
+    url: admin_stock_location_stock_movements_path(params[:stock_location_id])
+  ) do |f| %>
+    <div class="row">
       <div class="field-block col-12 col-md-6 col-lg-4 col-xl-3">
         <div class="field">
           <%= label_tag :q_variant_sku_eq, "#{t('spree.variant')} #{t('spree.sku')}" %>
@@ -50,17 +47,15 @@
   </colgroup>
   <thead>
     <tr data-hook="admin_stock_movements_index_headers">
-      <th><%= Spree::StockMovement.human_attribute_name(:variant) %>
+      <th><%= Spree::StockMovement.human_attribute_name(:variant) %></th>
       <th><%= Spree::StockMovement.human_attribute_name(:quantity) %></th>
       <th><%= Spree::StockMovement.human_attribute_name(:originated_by) %></th>
     </tr>
   </thead>
   <tbody>
-    <% @stock_movements.each do |stock_movement|%>
+    <% @stock_movements.each do |stock_movement| %>
       <tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows">
-        <td>
-          <%= display_variant(stock_movement) %>
-        </td>
+        <td><%= display_variant(stock_movement) %></td>
         <td><%= stock_movement.quantity %></td>
         <td><%= pretty_originator(stock_movement) %></td>
       </tr>
diff --git a/backend/app/views/spree/admin/store_credit_reasons/index.html.erb b/backend/app/views/spree/admin/store_credit_reasons/index.html.erb
index d57aeba62db..4bde517911f 100644
--- a/backend/app/views/spree/admin/store_credit_reasons/index.html.erb
+++ b/backend/app/views/spree/admin/store_credit_reasons/index.html.erb
@@ -17,9 +17,9 @@
 <% if @collection.any? %>
   <table class='index' id='listing_store_credit_reasons'>
     <colgroup>
-      <col style='width: 65%' />
-      <col style='width: 20%' />
-      <col style='width: 15%' />
+      <col style='width: 65%'>
+      <col style='width: 20%'>
+      <col style='width: 15%'>
     </colgroup>
     <thead>
       <tr data-hook='store_credit_reasons_header'>
diff --git a/backend/app/views/spree/admin/store_credit_reasons/shared/_form.html.erb b/backend/app/views/spree/admin/store_credit_reasons/shared/_form.html.erb
index 35094676278..e71f6603d6a 100644
--- a/backend/app/views/spree/admin/store_credit_reasons/shared/_form.html.erb
+++ b/backend/app/views/spree/admin/store_credit_reasons/shared/_form.html.erb
@@ -1,7 +1,7 @@
 <div data-hook='admin_named_type_form_fields' class='row'>
   <div class='col-3'>
     <%= f.field_container :name do %>
-      <%= f.label :name, class: 'required' %><br />
+      <%= f.label :name, class: 'required' %><br>
       <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
 
diff --git a/backend/app/views/spree/admin/store_credits/edit_amount.html.erb b/backend/app/views/spree/admin/store_credits/edit_amount.html.erb
index 90dd5c58afd..b3ce218b0fb 100644
--- a/backend/app/views/spree/admin/store_credits/edit_amount.html.erb
+++ b/backend/app/views/spree/admin/store_credits/edit_amount.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, admin_user_store_credit_path(@user, @store_credit)) %>
 <% admin_breadcrumb(t('spree.edit')) %>
 
-
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
@@ -16,7 +15,7 @@
     <div data-hook="admin_store_credit_form_fields" class="row">
       <div class="col-6">
         <%= f.field_container :amount do %>
-          <%= f.label :amount, class: 'required' %><br />
+          <%= f.label :amount, class: 'required' %><br>
           <%= render "spree/admin/shared/number_with_currency", f: f,
             amount_attr: :amount, currency: @store_credit.currency, required: true %>
           <%= f.error_message_on :amount %>
diff --git a/backend/app/views/spree/admin/store_credits/edit_validity.html.erb b/backend/app/views/spree/admin/store_credits/edit_validity.html.erb
index 1eba73e9e99..806a0fac0bb 100644
--- a/backend/app/views/spree/admin/store_credits/edit_validity.html.erb
+++ b/backend/app/views/spree/admin/store_credits/edit_validity.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, admin_user_store_credit_path(@user, @store_credit)) %>
 <% admin_breadcrumb(t('spree.edit')) %>
 
-
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
diff --git a/backend/app/views/spree/admin/store_credits/index.html.erb b/backend/app/views/spree/admin/store_credits/index.html.erb
index 6a6d03a0c99..b049ba32d4d 100644
--- a/backend/app/views/spree/admin/store_credits/index.html.erb
+++ b/backend/app/views/spree/admin/store_credits/index.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
 <% admin_breadcrumb(Spree::StoreCredit.model_name.human) %>
 
-
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
diff --git a/backend/app/views/spree/admin/store_credits/new.html.erb b/backend/app/views/spree/admin/store_credits/new.html.erb
index 57f06287373..60b9dce6ee6 100644
--- a/backend/app/views/spree/admin/store_credits/new.html.erb
+++ b/backend/app/views/spree/admin/store_credits/new.html.erb
@@ -3,7 +3,6 @@
 <% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, spree.admin_user_store_credits_path(@user)) %>
 <% admin_breadcrumb(t('spree.new_store_credit')) %>
 
-
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
diff --git a/backend/app/views/spree/admin/store_credits/show.html.erb b/backend/app/views/spree/admin/store_credits/show.html.erb
index 12fb72910df..4a6e60caf18 100644
--- a/backend/app/views/spree/admin/store_credits/show.html.erb
+++ b/backend/app/views/spree/admin/store_credits/show.html.erb
@@ -3,7 +3,6 @@
 <% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, spree.admin_user_store_credits_path(@user)) %>
 <% admin_breadcrumb(@store_credit.display_amount.to_html) %>
 
-
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
@@ -17,9 +16,9 @@
 
 <table id='sc-detail-table'>
   <colgroup>
-    <col style="width: 20%;" />
-    <col style="width: 65%;" />
-    <col style="width: 15%;" />
+    <col style="width: 20%;">
+    <col style="width: 65%;">
+    <col style="width: 15%;">
   </colgroup>
   <tr>
     <td>
@@ -69,13 +68,13 @@
   <legend align='center'><%= t('spree.admin.store_credits.history') %></legend>
   <table>
     <colgroup>
-      <col style="width: 20%;" />
-      <col style="width: 10%;" />
-      <col style="width: 10%;" />
-      <col style="width: 20%;" />
-      <col style="width: 10%;" />
-      <col style="width: 10%;" />
-      <col style="width: 20%;" />
+      <col style="width: 20%;">
+      <col style="width: 10%;">
+      <col style="width: 10%;">
+      <col style="width: 20%;">
+      <col style="width: 10%;">
+      <col style="width: 10%;">
+      <col style="width: 20%;">
     </colgroup>
     <thead>
       <tr>
diff --git a/backend/app/views/spree/admin/stores/_form.html.erb b/backend/app/views/spree/admin/stores/_form.html.erb
index fa0761db113..e85c908154a 100644
--- a/backend/app/views/spree/admin/stores/_form.html.erb
+++ b/backend/app/views/spree/admin/stores/_form.html.erb
@@ -15,32 +15,32 @@
 
     <%= f.field_container :seo_title do %>
       <%= f.label :seo_title %>
-      <%= f.text_field :seo_title, class: 'fullwidth'  %>
+      <%= f.text_field :seo_title, class: 'fullwidth' %>
       <%= f.error_message_on :seo_title %>
     <% end %>
 
     <%= f.field_container :meta_keywords do %>
       <%= f.label :meta_keywords %>
-      <%= f.text_field :meta_keywords, class: 'fullwidth'  %>
+      <%= f.text_field :meta_keywords, class: 'fullwidth' %>
       <%= f.error_message_on :meta_keywords %>
     <% end %>
 
     <%= f.field_container :meta_description do %>
       <%= f.label :meta_description %>
-      <%= f.text_area :meta_description, class: 'fullwidth'  %>
+      <%= f.text_area :meta_description, class: 'fullwidth' %>
       <%= f.error_message_on :meta_description %>
     <% end %>
   </div>
   <div class="col-12 col-md-6">
     <%= f.field_container :url do %>
       <%= f.label :url, class: 'required' %>
-      <%= f.text_field :url, required: true, class: 'fullwidth'  %>
+      <%= f.text_field :url, required: true, class: 'fullwidth' %>
       <%= f.error_message_on :url %>
     <% end %>
 
     <%= f.field_container :mail_from_address do %>
       <%= f.label :mail_from_address, class: 'required' %>
-      <%= f.text_field :mail_from_address, required: true, class: 'fullwidth'  %>
+      <%= f.text_field :mail_from_address, required: true, class: 'fullwidth' %>
       <%= f.error_message_on :mail_from_address %>
     <% end %>
 
diff --git a/backend/app/views/spree/admin/style_guide/topics/components/_modals.html.erb b/backend/app/views/spree/admin/style_guide/topics/components/_modals.html.erb
index 49bc6d8966a..0768179c376 100644
--- a/backend/app/views/spree/admin/style_guide/topics/components/_modals.html.erb
+++ b/backend/app/views/spree/admin/style_guide/topics/components/_modals.html.erb
@@ -19,21 +19,19 @@
   </li>
 </ul>
 
-<%- snippet = capture do %>
-  <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#your-target">
-    Launch demo modal
-  </button>
-
-  &lt;%= render(
-    "spree/admin/shared/modal",
-    target: "your-target",
-    title: "Your Title",
-    content: "The modal's content, could be another partial"
-  ) %&gt;
-<%- end %>
-
 <div class="style-guide-code half">
-  <pre><code class="language-html"><%= escape_once snippet %></code></pre>
+  <pre><code class="language-html"><%= %{
+    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#your-target">
+      Launch demo modal
+    </button>
+
+    \<\%= render(
+      "spree/admin/shared/modal",
+      target: "your-target",
+      title: "Your Title",
+      content: "The modal's content, could be another partial"
+    ) \%\>
+  }.strip_heredoc %></code></pre>
 </div>
 
 <div class="style-guide-result half">
diff --git a/backend/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb b/backend/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb
index b5a5f367474..85402262e98 100644
--- a/backend/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb
+++ b/backend/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb
@@ -71,7 +71,6 @@
   </form>
 <%- end %>
 
-
 <div class="style-guide-result">
   <%= snippet %>
 </div>
diff --git a/backend/app/views/spree/admin/style_guide/topics/forms/_helper_text.html.erb b/backend/app/views/spree/admin/style_guide/topics/forms/_helper_text.html.erb
index 1a6045fdcc5..888b7f54a56 100644
--- a/backend/app/views/spree/admin/style_guide/topics/forms/_helper_text.html.erb
+++ b/backend/app/views/spree/admin/style_guide/topics/forms/_helper_text.html.erb
@@ -5,9 +5,3 @@
   <li>Don't display placeholder text inside text fields and boxes.</li>
   <li>Display a progress/loading message or graphic if it takes a long time to submit a form.</li>
 </ul>
-
-
-
-
-
-
diff --git a/backend/app/views/spree/admin/style_guide/topics/forms/_inputs.html.erb b/backend/app/views/spree/admin/style_guide/topics/forms/_inputs.html.erb
index ab51c0b991d..dd81e8a8fcb 100644
--- a/backend/app/views/spree/admin/style_guide/topics/forms/_inputs.html.erb
+++ b/backend/app/views/spree/admin/style_guide/topics/forms/_inputs.html.erb
@@ -28,7 +28,7 @@
     <th>2/3 column<br>(main content area)</th>
     <th>1/3 column<br>(secondary content area)</th>
     <th>1/2 column<br>(main content, small screen)</th>
-    <th>1 column<br>(main & secondary content, small screen)
+    <th>1 column<br>(main &amp; secondary content, small screen)</th>
   </tr>
   <tr>
     <td>text field - 'normal'</td>
diff --git a/backend/app/views/spree/admin/style_guide/topics/layout/_full_width_table_layout.html.erb b/backend/app/views/spree/admin/style_guide/topics/layout/_full_width_table_layout.html.erb
index 37acd0c8529..456ec6ef9b9 100644
--- a/backend/app/views/spree/admin/style_guide/topics/layout/_full_width_table_layout.html.erb
+++ b/backend/app/views/spree/admin/style_guide/topics/layout/_full_width_table_layout.html.erb
@@ -4,7 +4,3 @@
   <li>Use this for forms that have minimal fields and have many equal priority items in them.</li>
   <li>Try to use this form layout first before using the next one.</li>
 </ul>
-
-
-
-
diff --git a/backend/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb b/backend/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb
index 5dd45c22f87..2413dc2cae2 100644
--- a/backend/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb
+++ b/backend/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb
@@ -7,7 +7,7 @@
     type = $(this).data('flashType');
 
     if (!$('.flash.' + type).is('*')) {
-      flash = $("<div class='flash'>")
+      flash = $("<div class='flash'></div>")
         .text(type)
         .addClass(type)
         .appendTo('.js-flash-wrapper')
diff --git a/backend/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb b/backend/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb
index f0cb09ac50e..77ea06616bd 100644
--- a/backend/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb
+++ b/backend/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb
@@ -14,9 +14,9 @@
 <div class="style-guide-code">
   <pre><code class="language-html"><%= escape_once snippet %></code></pre>
 </div>
-<br/>
+<br>
 <%- info_tooltip = capture do %>
-  <a title="Some info." class="fa fa-info-circle with-tip"  href="#"></a>
+  <a title="Some info." class="fa fa-info-circle with-tip" href="#"></a>
 <%- end %>
 <table class="with-actions-borders">
   <thead>
diff --git a/backend/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb b/backend/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb
index 13bd7b37bba..e767dc1d123 100644
--- a/backend/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb
+++ b/backend/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb
@@ -54,7 +54,6 @@ colors = [
     used_for: 'Warnings actions.'
   }
 ]
-
 %>
 
 <div class="color-variables">
diff --git a/backend/app/views/spree/admin/style_guide/topics/typography/_lists.html.erb b/backend/app/views/spree/admin/style_guide/topics/typography/_lists.html.erb
index c3635d7e71f..f3e3b9978b0 100644
--- a/backend/app/views/spree/admin/style_guide/topics/typography/_lists.html.erb
+++ b/backend/app/views/spree/admin/style_guide/topics/typography/_lists.html.erb
@@ -22,4 +22,4 @@
   <dd>List</dd>
   <dt>Term</dt>
   <dd>Description</dd>
-</ul>
+</dl>
diff --git a/backend/app/views/spree/admin/tax_categories/edit.html.erb b/backend/app/views/spree/admin/tax_categories/edit.html.erb
index 4c02fe513c8..9615290aac4 100644
--- a/backend/app/views/spree/admin/tax_categories/edit.html.erb
+++ b/backend/app/views/spree/admin/tax_categories/edit.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path) %>
 <% admin_breadcrumb(@tax_category.name) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/tax_categories/index.html.erb b/backend/app/views/spree/admin/tax_categories/index.html.erb
index c52f54e7a86..225b12787aa 100644
--- a/backend/app/views/spree/admin/tax_categories/index.html.erb
+++ b/backend/app/views/spree/admin/tax_categories/index.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::TaxCategory)) %>
 
-
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::TaxCategory) %>
@@ -18,11 +17,11 @@
 <% if @tax_categories.any? %>
 <table class="index" id='listing_tax_categories' data-hook>
   <colgroup>
-    <col style="width: 20%" />
-    <col style="width: 10%" />
-    <col style="width: 40%" />
-    <col style="width: 15%" />
-    <col style="width: 15%" />
+    <col style="width: 20%">
+    <col style="width: 10%">
+    <col style="width: 40%">
+    <col style="width: 15%">
+    <col style="width: 15%">
   </colgroup>
   <thead>
     <tr data-hook="tax_header">
@@ -34,10 +33,11 @@
     </tr>
   </thead>
   <tbody>
-    <% @tax_categories.each do |tax_category|
-         @edit_url = edit_admin_tax_category_path(tax_category)
-         @delete_url = admin_tax_category_path(tax_category)
-    %>
+    <% @tax_categories.each do |tax_category| %>
+      <%
+        @edit_url = edit_admin_tax_category_path(tax_category)
+        @delete_url = admin_tax_category_path(tax_category)
+      %>
       <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
         <td><%= tax_category.name %></td>
         <td><%= tax_category.tax_code %></td>
@@ -50,6 +50,7 @@
           <% if can?(:destroy, tax_category) %>
             <%= link_to_delete tax_category, no_text: true %>
           <% end %>
+        </td>
       </tr>
     <% end %>
   </tbody>
diff --git a/backend/app/views/spree/admin/tax_categories/new.html.erb b/backend/app/views/spree/admin/tax_categories/new.html.erb
index b0050c18508..537911b7b5a 100644
--- a/backend/app/views/spree/admin/tax_categories/new.html.erb
+++ b/backend/app/views/spree/admin/tax_categories/new.html.erb
@@ -5,11 +5,9 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path) %>
 <% admin_breadcrumb(t('spree.new_tax_category')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
-
 <%= render partial: 'spree/shared/error_messages', locals: { target: @tax_category } %>
 
 <%= form_for [:admin, @tax_category] do |f| %>
diff --git a/backend/app/views/spree/admin/tax_rates/_form.html.erb b/backend/app/views/spree/admin/tax_rates/_form.html.erb
index 32225a447d9..5fdaab8a6ea 100644
--- a/backend/app/views/spree/admin/tax_rates/_form.html.erb
+++ b/backend/app/views/spree/admin/tax_rates/_form.html.erb
@@ -11,7 +11,7 @@
           <div data-hook="rate" class="field">
             <%= f.label :amount %>
             <%= f.text_field :amount, class: 'fullwidth' %>
-            <br/><span class="info"><%= t('spree.tax_rate_amount_explanation') %></span>
+            <br><span class="info"><%= t('spree.tax_rate_amount_explanation') %></span>
           </div>
           <div data-hook="included" class="field">
             <label>
diff --git a/backend/app/views/spree/admin/tax_rates/edit.html.erb b/backend/app/views/spree/admin/tax_rates/edit.html.erb
index f1b35e10086..819e990e879 100644
--- a/backend/app/views/spree/admin/tax_rates/edit.html.erb
+++ b/backend/app/views/spree/admin/tax_rates/edit.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path) %>
 <% admin_breadcrumb(@tax_rate.name) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/tax_rates/index.html.erb b/backend/app/views/spree/admin/tax_rates/index.html.erb
index 78ca863e6f5..84c679e5685 100644
--- a/backend/app/views/spree/admin/tax_rates/index.html.erb
+++ b/backend/app/views/spree/admin/tax_rates/index.html.erb
@@ -4,7 +4,6 @@
 <% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::TaxRate)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::TaxRate) %>
     <li>
@@ -19,7 +18,7 @@
 
 <% content_for :table_filter do %>
   <%= search_form_for [:admin, @search], url: spree.admin_tax_rates_path do |f| %>
-    <div class= "row">
+    <div class="row">
       <div class="col-md-6">
         <div class="field">
           <%= f.label :zone_id_eq, Spree::Zone.model_name.human %>
@@ -68,10 +67,10 @@
       </tr>
     </thead>
     <tbody>
-      <% @tax_rates.each do |tax_rate|%>
+      <% @tax_rates.each do |tax_rate| %>
       <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">
-        <td><%=tax_rate.zone.try(:name) || t('spree.not_available') %></td>
-        <td><%=tax_rate.name %></td>
+        <td><%= tax_rate.zone.try(:name) || t('spree.not_available') %></td>
+        <td><%= tax_rate.name %></td>
         <td>
           <% if tax_rate.tax_categories.any? %>
             <%= tax_rate.tax_categories.map(&:name).join(", ") %>
@@ -79,11 +78,11 @@
             <%= t('spree.not_available') %>
           <% end %>
         </td>
-        <td><%=tax_rate.amount %></td>
-        <td><%=tax_rate.included_in_price? ? t('spree.say_yes') : t('spree.say_no') %></td>
-        <td><%=tax_rate.show_rate_in_label? ? t('spree.say_yes') : t('spree.say_no') %></td>
-        <td><%=tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
-        <td><%=tax_rate.calculator && tax_rate.calculator.class.model_name.human %></td>
+        <td><%= tax_rate.amount %></td>
+        <td><%= tax_rate.included_in_price? ? t('spree.say_yes') : t('spree.say_no') %></td>
+        <td><%= tax_rate.show_rate_in_label? ? t('spree.say_yes') : t('spree.say_no') %></td>
+        <td><%= tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
+        <td><%= tax_rate.calculator && tax_rate.calculator.class.model_name.human %></td>
         <td class="actions">
           <% if can?(:update, tax_rate) %>
             <%= link_to_edit tax_rate, no_text: true %>
diff --git a/backend/app/views/spree/admin/tax_rates/new.html.erb b/backend/app/views/spree/admin/tax_rates/new.html.erb
index e0ac4fec2d6..822a3d2f87c 100644
--- a/backend/app/views/spree/admin/tax_rates/new.html.erb
+++ b/backend/app/views/spree/admin/tax_rates/new.html.erb
@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path) %>
 <% admin_breadcrumb(t('spree.new_tax_rate')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/taxonomies/_form.html.erb b/backend/app/views/spree/admin/taxonomies/_form.html.erb
index 0ee1fad4d07..811fa930f97 100644
--- a/backend/app/views/spree/admin/taxonomies/_form.html.erb
+++ b/backend/app/views/spree/admin/taxonomies/_form.html.erb
@@ -1,6 +1,6 @@
 <div data-hook="admin_inside_taxonomy_form" class="field align-center">
   <%= f.field_container :name do %>
-    <%= f.label :name, class: 'required' %><br />
+    <%= f.label :name, class: 'required' %><br>
     <%= error_message_on :taxonomy, :name, class: 'fullwidth title' %>
     <%= text_field :taxonomy, :name %>
   <% end %>
diff --git a/backend/app/views/spree/admin/taxonomies/edit.html.erb b/backend/app/views/spree/admin/taxonomies/edit.html.erb
index d82c3fcc05a..e85cd586c24 100644
--- a/backend/app/views/spree/admin/taxonomies/edit.html.erb
+++ b/backend/app/views/spree/admin/taxonomies/edit.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Taxonomy), spree.admin_taxonomies_path) %>
 <% admin_breadcrumb(@taxonomy.name) %>
 
-
 <% content_for :page_actions do %>
   <li>
     <%= link_to t('spree.add_taxon'), spree.admin_taxonomies_path, class: 'add-taxon-button btn btn-primary' %>
@@ -18,6 +17,5 @@
     </div>
   </fieldset>
 
-
   <div id="taxonomy_tree" class="tree" data-taxonomy-id="<%= @taxonomy.id %>"></div>
 <% end %>
diff --git a/backend/app/views/spree/admin/taxonomies/index.html.erb b/backend/app/views/spree/admin/taxonomies/index.html.erb
index 565440f5b11..87d2f045132 100644
--- a/backend/app/views/spree/admin/taxonomies/index.html.erb
+++ b/backend/app/views/spree/admin/taxonomies/index.html.erb
@@ -1,7 +1,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
 <% admin_breadcrumb(plural_resource_name(Spree::Taxonomy)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Taxonomy) %>
     <li>
diff --git a/backend/app/views/spree/admin/taxonomies/new.html.erb b/backend/app/views/spree/admin/taxonomies/new.html.erb
index 35d962561e2..35678d916bd 100644
--- a/backend/app/views/spree/admin/taxonomies/new.html.erb
+++ b/backend/app/views/spree/admin/taxonomies/new.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Taxonomy), spree.admin_taxonomies_path) %>
 <% admin_breadcrumb(t('spree.new_taxonomy')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/taxons/_form.html.erb b/backend/app/views/spree/admin/taxons/_form.html.erb
index 49081e812f0..a7575cf667d 100644
--- a/backend/app/views/spree/admin/taxons/_form.html.erb
+++ b/backend/app/views/spree/admin/taxons/_form.html.erb
@@ -1,13 +1,13 @@
 <div data-hook="admin_inside_taxon_form" class="row">
   <div class="col-5">
     <%= f.field_container :name do %>
-      <%= f.label :name, class: 'required' %><br />
+      <%= f.label :name, class: 'required' %><br>
       <%= text_field :taxon, :name, class: 'fullwidth' %>
       <%= error_message_on :taxon, :name, class: 'fullwidth title' %>
     <% end %>
 
     <%= f.field_container :permalink_part do %>
-      <%= label_tag :permalink_part, Spree::Taxon.human_attribute_name(:permalink), class: 'required' %><br />
+      <%= label_tag :permalink_part, Spree::Taxon.human_attribute_name(:permalink), class: 'required' %><br>
       <div class="input-group">
         <% if @taxon.parent %>
           <div class="input-group-prepend">
@@ -16,7 +16,7 @@
             </span>
           </div>
         <% end %>
-        <%= text_field_tag :permalink_part, @permalink_part, class: 'fullwidth form-control' %><br />
+        <%= text_field_tag :permalink_part, @permalink_part, class: 'fullwidth form-control' %><br>
       </div>
     <% end %>
 
@@ -38,24 +38,24 @@
 
   <div class="col-5">
     <%= f.field_container :description do %>
-      <%= f.label :description %><br />
+      <%= f.label :description %><br>
       <%= f.text_area :description, class: 'fullwidth', rows: 6 %>
     <% end %>
   </div>
 
   <div class="col-10">
     <%= f.field_container :meta_title do %>
-      <%= f.label :meta_title %><br />
+      <%= f.label :meta_title %><br>
       <%= f.text_field :meta_title, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :meta_description do %>
-      <%= f.label :meta_description %><br />
+      <%= f.label :meta_description %><br>
       <%= f.text_field :meta_description, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :meta_keywords do %>
-      <%= f.label :meta_keywords %><br />
+      <%= f.label :meta_keywords %><br>
       <%= f.text_field :meta_keywords, class: 'fullwidth' %>
     <% end %>
   </div>
diff --git a/backend/app/views/spree/admin/taxons/edit.html.erb b/backend/app/views/spree/admin/taxons/edit.html.erb
index 5e059818248..9009533ed3b 100644
--- a/backend/app/views/spree/admin/taxons/edit.html.erb
+++ b/backend/app/views/spree/admin/taxons/edit.html.erb
@@ -1,6 +1,5 @@
 <% admin_breadcrumb(t('spree.taxon_edit')) %>
 
-
 <% content_for :page_actions do %>
   <li>
     <%= link_to t('spree.back_to_taxonomies_list'), spree.admin_taxonomies_path, class: 'btn btn-default' %>
diff --git a/backend/app/views/spree/admin/taxons/index.html.erb b/backend/app/views/spree/admin/taxons/index.html.erb
index 9e3b87d2492..0c9cf18036e 100644
--- a/backend/app/views/spree/admin/taxons/index.html.erb
+++ b/backend/app/views/spree/admin/taxons/index.html.erb
@@ -7,7 +7,7 @@
   </legend>
 
   <div data-hook="admin_orders_index_search" class="col-4">
-    <input type='text' id='taxon_id' />
+    <input type='text' id='taxon_id'>
   </div>
 </fieldset>
 
diff --git a/backend/app/views/spree/admin/users/_form.html.erb b/backend/app/views/spree/admin/users/_form.html.erb
index 64d79b1f6e0..760d62a516c 100644
--- a/backend/app/views/spree/admin/users/_form.html.erb
+++ b/backend/app/views/spree/admin/users/_form.html.erb
@@ -68,7 +68,6 @@
         <%= f.error_message_on :password %>
       <% end %>
 
-
       <% if f.object.respond_to?(:password_confirmation) %>
         <%= f.field_container :password do %>
           <%= f.label :password_confirmation %>
diff --git a/backend/app/views/spree/admin/users/_tabs.html.erb b/backend/app/views/spree/admin/users/_tabs.html.erb
index b9d5a4050ae..f48bffdd305 100644
--- a/backend/app/views/spree/admin/users/_tabs.html.erb
+++ b/backend/app/views/spree/admin/users/_tabs.html.erb
@@ -1,26 +1,26 @@
 <% content_for :tabs do %>
   <nav>
     <ul class='tabs' data-hook="admin_user_tab_options">
-      <li<%== ' class="active"' if current == :account %>>
+      <li class="<%= 'active' if current == :account %>">
         <%= link_to t("spree.admin.user.account"), spree.edit_admin_user_path(@user) %>
       </li>
       <% if can?(:addresses, @user) %>
-        <li<%== ' class="active"' if current == :address %>>
+        <li class="<%= 'active' if current == :address %>">
           <%= link_to t("spree.admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:orders, @user) %>
-        <li<%== ' class="active"' if current == :orders %>>
+        <li class="<%= 'active' if current == :orders %>">
           <%= link_to t("spree.admin.user.order_history"), spree.orders_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:items, @user) %>
-        <li<%== ' class="active"' if current == :items %>>
+        <li class="<%= 'active' if current == :items %>">
           <%= link_to t("spree.admin.user.items"), spree.items_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:show, @user.store_credits.new) %>
-        <li<%== ' class="active"' if current == :store_credits %>>
+        <li class="<%= 'active' if current == :store_credits %>">
           <%= link_to t("spree.admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
         </li>
       <% end %>
diff --git a/backend/app/views/spree/admin/users/addresses.html.erb b/backend/app/views/spree/admin/users/addresses.html.erb
index 3265a6fd7cb..75547a318b7 100644
--- a/backend/app/views/spree/admin/users/addresses.html.erb
+++ b/backend/app/views/spree/admin/users/addresses.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
 <% admin_breadcrumb(plural_resource_name(Spree::Address)) %>
 
-
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :address %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
diff --git a/backend/app/views/spree/admin/users/index.html.erb b/backend/app/views/spree/admin/users/index.html.erb
index 7ff0c9f2946..23818ae0a91 100644
--- a/backend/app/views/spree/admin/users/index.html.erb
+++ b/backend/app/views/spree/admin/users/index.html.erb
@@ -78,9 +78,9 @@
     </tr>
   </thead>
   <tbody>
-    <% @users.each do |user|%>
+    <% @users.each do |user| %>
       <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
-        <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
+        <td class='user_email'><%= link_to user.email, edit_admin_user_url(user) %></td>
         <td><%= user.spree_roles.map(&:name).to_sentence %></td>
         <td class="align-center"><%= link_to user.order_count, spree.orders_admin_user_path(user) %></td>
         <td class="align-center"><%= link_to user.display_lifetime_value, spree.items_admin_user_path(user) %></td>
diff --git a/backend/app/views/spree/admin/users/items.html.erb b/backend/app/views/spree/admin/users/items.html.erb
index 4eab112855b..81eaec51b41 100644
--- a/backend/app/views/spree/admin/users/items.html.erb
+++ b/backend/app/views/spree/admin/users/items.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
 <% admin_breadcrumb(t('spree.admin.user.items_purchased')) %>
 
-
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :items %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
@@ -16,13 +15,13 @@
     <%# TODO add search interface %>
     <table class="stock-contents index" id="listing_items" data-hook="stock-contents">
       <colgroup>
-        <col style="width: 10%;" />
-        <col style="width: 10%;" />
-        <col style="width: 30%;" />
-        <col style="width: 8%;" />
-        <col style="width: 8%;" />
-        <col style="width: 10%;" />
-        <col style="width: 14%;" />
+        <col style="width: 10%;">
+        <col style="width: 10%;">
+        <col style="width: 30%;">
+        <col style="width: 8%;">
+        <col style="width: 8%;">
+        <col style="width: 10%;">
+        <col style="width: 14%;">
       </colgroup>
 
       <thead>
@@ -69,6 +68,7 @@
             </tr>
           <% end %>
         <% end %>
+      </tbody>
     </table>
   <% else %>
     <div class="no-objects-found">
diff --git a/backend/app/views/spree/admin/users/orders.html.erb b/backend/app/views/spree/admin/users/orders.html.erb
index 1bdc0f7d2fa..5eaeebfcdaa 100644
--- a/backend/app/views/spree/admin/users/orders.html.erb
+++ b/backend/app/views/spree/admin/users/orders.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
 <% admin_breadcrumb(t('spree.admin.user.order_history')) %>
 
-
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :orders %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
@@ -50,7 +49,7 @@
             </span>
           </td>
           <td>
-            <% if order.payment_state  %>
+            <% if order.payment_state %>
               <span class="pill pill-<%= order.payment_state %>">
                 <%= t(order.payment_state, scope: 'spree.payment_states') %>
               </span>
diff --git a/backend/app/views/spree/admin/variants/_form.html.erb b/backend/app/views/spree/admin/variants/_form.html.erb
index 721ea0dbda5..b7cfd91e74e 100644
--- a/backend/app/views/spree/admin/variants/_form.html.erb
+++ b/backend/app/views/spree/admin/variants/_form.html.erb
@@ -111,6 +111,4 @@
   </fieldset>
 </div>
 
-
-
 <div class="clear"></div>
diff --git a/backend/app/views/spree/admin/variants/_table.html.erb b/backend/app/views/spree/admin/variants/_table.html.erb
index 078dbfc7582..a65862ce30d 100644
--- a/backend/app/views/spree/admin/variants/_table.html.erb
+++ b/backend/app/views/spree/admin/variants/_table.html.erb
@@ -2,11 +2,11 @@
 
 <table class="index sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
   <colgroup>
-    <col style="width: 5%" />
-    <col style="width: 35%" />
-    <col style="width: 20%" />
-    <col style="width: 25%" />
-    <col style="width: 15%" />
+    <col style="width: 5%">
+    <col style="width: 35%">
+    <col style="width: 20%">
+    <col style="width: 25%">
+    <col style="width: 15%">
   </colgroup>
   <thead data-hook="variants_header">
     <tr>
diff --git a/backend/app/views/spree/admin/variants/edit.html.erb b/backend/app/views/spree/admin/variants/edit.html.erb
index 604b2577fbc..a27debffcd8 100644
--- a/backend/app/views/spree/admin/variants/edit.html.erb
+++ b/backend/app/views/spree/admin/variants/edit.html.erb
@@ -3,10 +3,8 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Variant), admin_product_variants_path(@product)) %>
 <% admin_breadcrumb(@variant.options_text) %>
 
-
 <%= render partial: 'spree/shared/error_messages', locals: { target: @variant } %>
 
-
 <%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset>
     <legend><%= t('.edit_variant') %></legend>
diff --git a/backend/app/views/spree/admin/variants/index.html.erb b/backend/app/views/spree/admin/variants/index.html.erb
index 7eaea5379d3..6abc67f8281 100644
--- a/backend/app/views/spree/admin/variants/index.html.erb
+++ b/backend/app/views/spree/admin/variants/index.html.erb
@@ -22,7 +22,7 @@
     <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
       <%= t('spree.to_add_variants_you_must_first_define') %>
       <% if can?(:show, Spree::OptionType) %>
-        <%= link_to plural_resource_name(Spree::OptionType), admin_option_types_path%>
+        <%= link_to plural_resource_name(Spree::OptionType), admin_option_types_path %>
       <% else %>
         <%= plural_resource_name(Spree::OptionType) %>
       <% end %>
diff --git a/backend/app/views/spree/admin/zones/_form.html.erb b/backend/app/views/spree/admin/zones/_form.html.erb
index 90d928d39de..9caea5a544d 100644
--- a/backend/app/views/spree/admin/zones/_form.html.erb
+++ b/backend/app/views/spree/admin/zones/_form.html.erb
@@ -3,15 +3,15 @@
 
     <div data-hook="admin_zone_form_fields">
       <fieldset class="no-border-bottom">
-        <legend align="center"><%= t('spree.general_settings')%></legend>
+        <legend align="center"><%= t('spree.general_settings') %></legend>
 
         <%= zone_form.field_container :name do %>
-          <%= zone_form.label :name %><br />
+          <%= zone_form.label :name %><br>
           <%= zone_form.text_field :name, class: 'fullwidth' %>
         <% end %>
 
         <%= zone_form.field_container :description do %>
-          <%= zone_form.label :description %><br />
+          <%= zone_form.label :description %><br>
           <%= zone_form.text_field :description, class: 'fullwidth' %>
         <% end %>
 
@@ -37,7 +37,7 @@
   </div>
   <div class="col-5">
 
-    <%= render partial: 'state_members', locals: { zone_form: zone_form }%>
+    <%= render partial: 'state_members', locals: { zone_form: zone_form } %>
     <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
   </div>
 
diff --git a/backend/app/views/spree/admin/zones/edit.html.erb b/backend/app/views/spree/admin/zones/edit.html.erb
index f8a9948b5b7..2988f7f5f48 100644
--- a/backend/app/views/spree/admin/zones/edit.html.erb
+++ b/backend/app/views/spree/admin/zones/edit.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Zone), spree.admin_zones_path) %>
 <% admin_breadcrumb(@zone.name) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/admin/zones/index.html.erb b/backend/app/views/spree/admin/zones/index.html.erb
index eb646eb8300..75d5a35e6b1 100644
--- a/backend/app/views/spree/admin/zones/index.html.erb
+++ b/backend/app/views/spree/admin/zones/index.html.erb
@@ -14,10 +14,10 @@
 <% if @zones.any? %>
   <table class="index" id='listing_zones' data-hook>
     <colgroup>
-      <col style="width: 30%" />
-      <col style="width: 40%" />
-      <col style="width: 15%" />
-      <col style="width: 15%" />
+      <col style="width: 30%">
+      <col style="width: 40%">
+      <col style="width: 15%">
+      <col style="width: 15%">
     </colgroup>
     <thead>
       <tr data-hook="zones_header">
diff --git a/backend/app/views/spree/admin/zones/new.html.erb b/backend/app/views/spree/admin/zones/new.html.erb
index 0c4365d2d7b..f10f6062ff3 100644
--- a/backend/app/views/spree/admin/zones/new.html.erb
+++ b/backend/app/views/spree/admin/zones/new.html.erb
@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Zone), spree.admin_zones_path) %>
 <% admin_breadcrumb(t('spree.new_zone')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
diff --git a/backend/app/views/spree/layouts/admin_style_guide.html.erb b/backend/app/views/spree/layouts/admin_style_guide.html.erb
index 020abd780a4..a208d4710e0 100644
--- a/backend/app/views/spree/layouts/admin_style_guide.html.erb
+++ b/backend/app/views/spree/layouts/admin_style_guide.html.erb
@@ -1,7 +1,7 @@
 <!doctype html>
 <html lang="<%= I18n.locale %>">
   <head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
     <title>Solidus Style Guide</title>
 
     <%= stylesheet_link_tag "spree/backend/all", data: {turbolinks_track: 'reload'} %>
diff --git a/core/app/views/layouts/spree/base_mailer.html.erb b/core/app/views/layouts/spree/base_mailer.html.erb
index 21ec88ea0b1..a620bf691bd 100644
--- a/core/app/views/layouts/spree/base_mailer.html.erb
+++ b/core/app/views/layouts/spree/base_mailer.html.erb
@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<meta name="viewport" content="width=device-width"/>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<meta name="viewport" content="width=device-width">
 	<style>
 /**********************************************
 * Ink v1.0.5 - Copyright 2013 ZURB Inc        *
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 99532f1de72..e6546cfc44f 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -1105,7 +1105,7 @@ en:
     cannot_rebuild_shipments_order_completed: Cannot rebuild shipments for a completed order.
     cannot_rebuild_shipments_shipments_not_pending: Cannot rebuild shipments for an order with non-pending shipments.
     cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.
-    cannot_update_email: You do not have access to update this user's email address. <br />Please contact a superuser if you need to perform this action.
+    cannot_update_email: You do not have access to update this user's email address. <br>Please contact a superuser if you need to perform this action.
     capture: Capture
     capture_events: Capture events
     card_code: Card Code
@@ -1612,43 +1612,43 @@ en:
         shipping_methods: This is used to calculate the shipping rates on a per order or per package rate.
         tax_rates: The "Default Tax" calculator is used for both sales tax (United States-style taxes) and value-added tax (VAT). Typically this calculator should be the only tax calculator required by your store. "Flat Fee" can be used for any taxes that require a flat fee be charged to the customer.
       spree/price:
-        country: 'This determines in what country the price is valid.<br/>Default: Any Country'
+        country: 'This determines in what country the price is valid.<br>Default: Any Country'
         master_variant: Changing master variant prices will not change variant prices below, but will be used to populate all new variants
         options: These options are used to create variants in the variants table. They can be changed in the variants tab
       spree/product:
         available_on: This sets the availability date for the product. If this value is not set, or it is set to a date in the future, then the product is not available on the storefront.
         discontinue_on: This sets the discontinue date for the product. If this value is set to a date, then the product is not available on the storefront from that day on anymore.
-        promotionable: 'This determines whether or not promotions can apply to this product.<br/>Default: Checked'
-        shipping_category: 'This determines what kind of shipping this product requires.<br/> Default: Default'
-        tax_category: 'This determines what kind of taxation is applied to this product.<br/> Default: %{default_tax_category}'
+        promotionable: 'This determines whether or not promotions can apply to this product.<br>Default: Checked'
+        shipping_category: 'This determines what kind of shipping this product requires.<br> Default: Default'
+        tax_category: 'This determines what kind of taxation is applied to this product.<br> Default: %{default_tax_category}'
       spree/promotion:
-        expires_at: This determines when the promotion expires. <br/> If no value is specified, the promotion will never expire.
+        expires_at: This determines when the promotion expires. <br> If no value is specified, the promotion will never expire.
         promo_code_will_be_disabled: Selecting this option, promo codes will be disabled for this promotion because all its rules / actions will be applied automatically to all orders.
-        starts_at: This determines when the promotion can be applied to orders. <br/> If no value is specified, the promotion will be immediately available.
+        starts_at: This determines when the promotion can be applied to orders. <br> If no value is specified, the promotion will be immediately available.
       spree/shipping_method:
         available_to_all: Uncheck to select specific stock locations this shipping method will be available in.
       spree/stock_location:
-        active: 'This determines whether stock from this location can be used when building packages.<br/> Default: Checked'
-        backorderable_default: 'When checked, stock items in this location will default to allowing backorders.<br/> Default: Unchecked'
-        check_stock_on_transfer: 'When checked, inventory levels will be checked when performing stock transfers.<br/> Default: Checked'
-        fulfillable: 'When unchecked, this indicates that items in this location don''t require actual fulfilment. Stock will not be checked when shipping and emails will not be sent.<br/> Default: Checked'
-        propagate_all_variants: 'When checked, this will create a stock item for each variant in this stock location.<br/> Default: Checked'
-        restock_inventory: 'When checked, returned inventory can be added back to this location''s stock levels.<br/> Default: checked'
+        active: 'This determines whether stock from this location can be used when building packages.<br> Default: Checked'
+        backorderable_default: 'When checked, stock items in this location will default to allowing backorders.<br> Default: Unchecked'
+        check_stock_on_transfer: 'When checked, inventory levels will be checked when performing stock transfers.<br> Default: Checked'
+        fulfillable: 'When unchecked, this indicates that items in this location don''t require actual fulfilment. Stock will not be checked when shipping and emails will not be sent.<br> Default: Checked'
+        propagate_all_variants: 'When checked, this will create a stock item for each variant in this stock location.<br> Default: Checked'
+        restock_inventory: 'When checked, returned inventory can be added back to this location''s stock levels.<br> Default: checked'
       spree/store:
         available_locales: This determines which locales are available for your customers to choose from in the storefront.
-        cart_tax_country_iso: 'This determines which country is used for taxes on carts (orders which don''t yet have an address).<br/> Default: None.'
+        cart_tax_country_iso: 'This determines which country is used for taxes on carts (orders which don''t yet have an address).<br> Default: None.'
         code: An identifier for your store. Developers may need this value if you operate multiple storefronts.
       spree/tax_category:
         is_default: When checked, this tax category will be selected by default when creating new products or variants.
       spree/tax_rate:
         tax_rate_level: Item-level taxes will be applied as adjustments on line items and shipments. Order-level taxes will create an adjustment on the order. Care should be taken when chosing order-level adjustments as they aren't considered in refunds or in discounts. The default is item-level.
-        validity_period: This determines the validity period within which the tax rate is valid and will be applied to eligible items. <br /> If no start date value is specified, the tax rate will be immediately available. <br /> If no expiration date value is specified, the tax rate will never expire
+        validity_period: This determines the validity period within which the tax rate is valid and will be applied to eligible items. <br> If no start date value is specified, the tax rate will be immediately available. <br> If no expiration date value is specified, the tax rate will never expire
       spree/variant:
         deleted: Deleted Variant
         deleted_explanation: This variant was deleted on %{date}.
         deleted_explanation_with_replacement: This variant was deleted on %{date}. It has since been replaced by another with the same SKU.
-        shipping_category: 'This determines what kind of shipping this variant requires.<br/> Default: Use shipping category of the product associated with this variant'
-        tax_category: 'This determines what kind of taxation is applied to this variant.<br/> Default: Use tax category of the product associated with this variant'
+        shipping_category: 'This determines what kind of shipping this variant requires.<br> Default: Use shipping category of the product associated with this variant'
+        tax_category: 'This determines what kind of taxation is applied to this variant.<br> Default: Use tax category of the product associated with this variant'
     home: Home
     i18n:
       available_locales: Available Locales