diff --git a/app/helpers/sci_form_helper.rb b/app/helpers/sci_form_helper.rb
index 4bcf99b30..9a82d9ed3 100644
--- a/app/helpers/sci_form_helper.rb
+++ b/app/helpers/sci_form_helper.rb
@@ -1,5 +1,6 @@
 module SciFormHelper
   class SciFormBuilder < ActionView::Helpers::FormBuilder
+    include SciFormHelper
     # Returns Bootstrap date-time picker of the "datetime" type tailored for accessing a specified datetime attribute (identified by +name+) on an object
     # assigned to the template (identified by +object+). Additional options on the input tag can be passed as a
     # hash with +options+. The supported options are shown in the following examples.
@@ -45,60 +46,6 @@ module SciFormHelper
       res.html_safe
     end
 
-    # Returns Bootstrap button group for choosing a specified enum attribute (identified by +name+) on an object
-    # assigned to the template (identified by +object+). Additional options on the input tag can be passed as a
-    # hash with +options+. The supported options are shown in the following examples.
-    #
-    # ==== Examples
-    #   Specify custom label (otherwise, a humanized version of +name+ is used)
-    #   # => enum_btn_group(:car, :type, label: "Car type")
-    #
-    #   Specify custom button names for enum values (a hash)
-    #   # => enum_btn_groups(:car, :type, btn_names: { diesel: "Diesel car", electric: "Electric car" })
-    #
-    #   Specify custom CSS style on the element
-    #   # => enum_btn_group(:car, :type, style: "background-color: #000; margin-top: 20px;")
-    #
-    #   Specify custom CSS classes on the element
-    #   # => enum_btn_group(:car, :type, class: "class1 class2")
-    def enum_btn_group(name, options = {})
-      id = "#{@object_name}_#{name}"
-      input_name = "#{@object_name}[#{name}]"
-
-      enum_vals = @object.class.send(name.to_s.pluralize)
-      btn_names = enum_vals.keys.collect { |k| [k, k] }.to_h
-      btn_names = options[:btn_names] if options[:btn_names]
-      btn_names = ActiveSupport::HashWithIndifferentAccess.new(btn_names)
-
-      label = name.to_s.humanize
-      label = options[:label] if options[:label]
-
-      style_str = ''
-      style_str = " style='#{options[:style]}'" if options[:style]
-
-      class_str = ''
-      class_str = " #{options[:class]}" if options[:class]
-
-      res = ''
-      res << "<div class='form-group#{class_str}'#{style_str}>"
-      res << "<label for='#{id}'>#{label}</label>"
-      res << '<br>'
-      res << "<div class='btn-group' data-toggle='buttons'>"
-      enum_vals.keys.each do |val|
-        active = @object.send("#{val}?")
-        active_str = active ? ' active' : ''
-        checked_str = active ? " checked='checked'" : ''
-
-        res << "<label class='btn btn-toggle#{active_str}'>"
-        res << "<input type='radio' value='#{val}' name='#{input_name}' id='#{id}_#{val}'#{checked_str}>"
-        res << btn_names[val]
-        res << '</label>'
-      end
-      res << '</div>'
-      res << '</div>'
-      res.html_safe
-    end
-
     # Returns smart <textarea> that dynamically resizes depending on the user
     # input. Also has an option 'single_line: true' to render it as a one-line
     # (imagine <input type="text">) input field that only grows beyond one line
diff --git a/app/views/my_modules/_due_date.html.erb b/app/views/my_modules/_due_date.html.erb
index cd246fef5..a23ba4f52 100644
--- a/app/views/my_modules/_due_date.html.erb
+++ b/app/views/my_modules/_due_date.html.erb
@@ -1,4 +1,4 @@
-<%= form_with model: @my_module, url: my_module_path(@my_module, format: :json), remote: :true do |f| %>
+<%= form_with model: @my_module, url: my_module_path(@my_module, format: :json), data: { remote: :true }, builder: SciFormHelper::SciFormBuilder do |f| %>
   <%= f.datetime_picker :due_date,
                         value: @my_module.due_date,
                         label: t('my_modules.due_date.label'),