diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb
index ae4c9de5..5d2e52be 100644
--- a/app/controllers/orders_controller.rb
+++ b/app/controllers/orders_controller.rb
@@ -42,12 +42,12 @@ class OrdersController < ApplicationController
     @order= Order.find(params[:id])
 
     if params[:view]    # Articles-list will be replaced
-      partial = case params[:view]
-        when 'normal' then "articles"
-        when 'groups'then 'shared/articles_by_groups'
-        when 'articles'then 'shared/articles_by_articles'
-      end
-      render :partial => partial, :locals => {:order => @order} if partial
+      @partial = case params[:view]
+                   when 'normal' then "articles"
+                   when 'groups'then 'shared/articles_by_groups'
+                   when 'articles'then 'shared/articles_by_articles'
+                 end
+      render :layout => false
     end
   end
 
diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb
index de115ce7..5f9deb04 100644
--- a/app/helpers/orders_helper.rb
+++ b/app/helpers/orders_helper.rb
@@ -1,9 +1,7 @@
 module OrdersHelper
 
   def update_articles_link(order, text, view)
-    link_to_remote text, :url => order_path(order, :view => view),
-      :update => 'articles', :before => "Element.show('loader')", :success => "Element.hide('loader')",
-      :method => :get
+    link_to text, order_path(order, :view => view), :remote => true
   end
 
   def link_to_pdf(order, action)
diff --git a/app/views/orders/show.haml b/app/views/orders/show.html.haml
similarity index 100%
rename from app/views/orders/show.haml
rename to app/views/orders/show.html.haml
diff --git a/app/views/orders/show.js.erb b/app/views/orders/show.js.erb
new file mode 100644
index 00000000..4ed51162
--- /dev/null
+++ b/app/views/orders/show.js.erb
@@ -0,0 +1 @@
+$('#articles').html('<%= escape_javascript(render(:partial => @partial, :locals => {:order => @order})) %>');
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4b8adb23..bc0bbd5f 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -287,6 +287,9 @@ de:
         last_name: "Nachname"
       order_comment:
         text: 'Kommentar'
+      order:
+        starts: "Läuft vom"
+        ends: "Endet am"
 
     hints:
       tax: 'In Prozent, Standard sind 7,0'