diff --git a/app/controllers/admin/order_cycles_controller.rb b/app/controllers/admin/order_cycles_controller.rb
index 05b6cb891d..f8becca16c 100644
--- a/app/controllers/admin/order_cycles_controller.rb
+++ b/app/controllers/admin/order_cycles_controller.rb
@@ -64,7 +64,7 @@ module Admin
       if @order_cycle_form.save
         respond_to do |format|
           flash[:notice] = I18n.t(:order_cycles_update_notice) if params[:reloading] == '1'
-          format.html { redirect_to main_app.edit_admin_order_cycle_path(@order_cycle) }
+          format.html { redirect_back(fallback_location: root_path) }
           format.json { render json: { success: true } }
         end
       else
diff --git a/app/views/admin/order_cycles/_order_cycle_top_buttons.haml b/app/views/admin/order_cycles/_order_cycle_top_buttons.html.haml
similarity index 90%
rename from app/views/admin/order_cycles/_order_cycle_top_buttons.haml
rename to app/views/admin/order_cycles/_order_cycle_top_buttons.html.haml
index 97b14ddf1b..86ca6b2ae4 100644
--- a/app/views/admin/order_cycles/_order_cycle_top_buttons.haml
+++ b/app/views/admin/order_cycles/_order_cycle_top_buttons.html.haml
@@ -16,4 +16,4 @@
       %i.icon-chevron-down
 
 #advanced_settings{ hidden: true }
-  = render partial: "/admin/order_cycles/advanced_settings"
\ No newline at end of file
+  = render partial: "/admin/order_cycles/advanced_settings"
diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml
index 2a781974ca..5c700c5b18 100644
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -1,25 +1,8 @@
+= render partial: "/admin/order_cycles/order_cycle_top_buttons"
 - content_for :page_actions do
-  :javascript
-    function toggleSettings(){
-      if( $('#advanced_settings').is(":visible") ){
-        $('button#toggle_settings i').switchClass("icon-chevron-up","icon-chevron-down")
-      }
-      else {
-        $('button#toggle_settings i').switchClass("icon-chevron-down","icon-chevron-up")
-      }
-      $("#advanced_settings").slideToggle()
-    }
-
   - if can? :notify_producers, @order_cycle
     %li
       = button_to t(:notify_producers), main_app.notify_producers_admin_order_cycle_path, :id => 'admin_notify_producers', :confirm => t(:are_you_sure)
-  %li
-    %button#toggle_settings{ onClick: 'toggleSettings()' }
-      = t('.advanced_settings')
-      %i.icon-chevron-down
-
-#advanced_settings{ hidden: true }
-  = render partial: "/admin/order_cycles/advanced_settings"
 
 - content_for :page_title do
   = t :edit_order_cycle
diff --git a/app/views/admin/order_cycles/incoming.html.haml b/app/views/admin/order_cycles/incoming.html.haml
index 3bc3dd86b3..254119bf24 100644
--- a/app/views/admin/order_cycles/incoming.html.haml
+++ b/app/views/admin/order_cycles/incoming.html.haml
@@ -1,19 +1,4 @@
-- content_for :page_actions do
-  :javascript
-    function toggleSettings(){
-      if( $('#advanced_settings').is(":visible") ){
-        $('button#toggle_settings i').switchClass("icon-chevron-up","icon-chevron-down")
-      }
-      else {
-        $('button#toggle_settings i').switchClass("icon-chevron-down","icon-chevron-up")
-      }
-      $("#advanced_settings").slideToggle()
-    }
-
-  %li
-    %button#toggle_settings{ onClick: 'toggleSettings()' }
-      = t('.advanced_settings')
-      %i.icon-chevron-down
+= render partial: "/admin/order_cycles/order_cycle_top_buttons"
 
 - content_for :page_title do
   = t :edit_order_cycle
diff --git a/app/views/admin/order_cycles/outgoing.html.haml b/app/views/admin/order_cycles/outgoing.html.haml
index 890faa9553..9924e3dae9 100644
--- a/app/views/admin/order_cycles/outgoing.html.haml
+++ b/app/views/admin/order_cycles/outgoing.html.haml
@@ -1,19 +1,4 @@
-- content_for :page_actions do
-  :javascript
-    function toggleSettings(){
-      if( $('#advanced_settings').is(":visible") ){
-        $('button#toggle_settings i').switchClass("icon-chevron-up","icon-chevron-down")
-      }
-      else {
-        $('button#toggle_settings i').switchClass("icon-chevron-down","icon-chevron-up")
-      }
-      $("#advanced_settings").slideToggle()
-    }
-
-  %li
-    %button#toggle_settings{ onClick: 'toggleSettings()' }
-      = t('.advanced_settings')
-      %i.icon-chevron-down
+= render partial: "/admin/order_cycles/order_cycle_top_buttons"
 
 - content_for :page_title do
   = t :edit_order_cycle