diff --git a/app/views/admin/progress_bars/_form.html.erb b/app/components/admin/progress_bars/form_component.html.erb
similarity index 81%
rename from app/views/admin/progress_bars/_form.html.erb
rename to app/components/admin/progress_bars/form_component.html.erb
index 0a479245f..f86e107d9 100644
--- a/app/views/admin/progress_bars/_form.html.erb
+++ b/app/components/admin/progress_bars/form_component.html.erb
@@ -1,6 +1,6 @@
-<%= render "shared/globalize_locales", resource: @progress_bar %>
+<%= render "shared/globalize_locales", resource: progress_bar %>
 
-<%= translatable_form_for @progress_bar, url: admin_polymorphic_path(@progress_bar) do |f| %>
+<%= translatable_form_for progress_bar, url: admin_polymorphic_path(progress_bar) do |f| %>
 
   <div class="row">
     <div class="small-12 medium-6 column">
@@ -16,7 +16,6 @@
     <% end %>
   </div>
 
-  <% progress_options = { min: ProgressBar::RANGE.min, max: ProgressBar::RANGE.max, step: 1 } %>
   <div class="row">
     <div class="small-12 medium-6 large-2 column">
       <%= f.label :percentage %>
diff --git a/app/components/admin/progress_bars/form_component.rb b/app/components/admin/progress_bars/form_component.rb
new file mode 100644
index 000000000..a93f6c0fb
--- /dev/null
+++ b/app/components/admin/progress_bars/form_component.rb
@@ -0,0 +1,15 @@
+class Admin::ProgressBars::FormComponent < ApplicationComponent
+  include TranslatableFormHelper
+  include GlobalizeHelper
+  attr_reader :progress_bar
+
+  def initialize(progress_bar)
+    @progress_bar = progress_bar
+  end
+
+  private
+
+    def progress_options
+      { min: ProgressBar::RANGE.min, max: ProgressBar::RANGE.max, step: 1 }
+    end
+end
diff --git a/app/views/admin/progress_bars/edit.html.erb b/app/views/admin/progress_bars/edit.html.erb
index 21dd27d9a..c7f280a63 100644
--- a/app/views/admin/progress_bars/edit.html.erb
+++ b/app/views/admin/progress_bars/edit.html.erb
@@ -12,4 +12,4 @@
 
 <h2><%= bar_title %></h2>
 
-<%= render "form" %>
+<%= render Admin::ProgressBars::FormComponent.new(@progress_bar) %>
diff --git a/app/views/admin/progress_bars/new.html.erb b/app/views/admin/progress_bars/new.html.erb
index 8c379ac3a..81c76b920 100644
--- a/app/views/admin/progress_bars/new.html.erb
+++ b/app/views/admin/progress_bars/new.html.erb
@@ -6,4 +6,4 @@
 
 <h2><%= t("admin.progress_bars.new.creating") %></h2>
 
-<%= render "form" %>
+<%= render Admin::ProgressBars::FormComponent.new(@progress_bar) %>