diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb
index 5c18f1e..5d547c2 100644
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
@@ -16,7 +16,7 @@ class JobsController < ApplicationController
     respond_to do |format|
       if @job.save
         flash[:notice] = "Job was successfully created."
-        broadcast_create_job job: @job
+        broadcast_create_job
         format.html { redirect_to jobs_url }
       else
         format.html { render :new, status: :unprocessable_entity }
@@ -28,12 +28,13 @@ class JobsController < ApplicationController
     @job = Job.find(params[:id])
     if @job.canceled!
       flash[:notice] = "Job successfully canceled"
+      @status_changed = true
     else
       flash[:alert] = "Job could not be canceled"
     end
 
     respond_to do |format|
-      broadcast_update_job(job: @job, status_changed: true)
+      broadcast_update_job
       format.turbo_stream
       format.html { redirect_to jobs_url }
     end
@@ -41,39 +42,40 @@ class JobsController < ApplicationController
 
   private
 
-  def broadcast_update_status_cards(job:)
+  def broadcast_update_status_cards_and_start_next_job_button
     # FIXME: Duplicate code, see operator/jobs_controller, move to the model
-    openjobs = Job.open.order(:created_at)
+    openjobs = Job.open.order(:status_changed_at)
     printingjobs = Job.printing.order(:status_changed_at)
     pickupjobs = Job.pickup.order(:status_changed_at)
     paidjobs = Job.paid.status_changed_today.order(:status_changed_at)
     canceledjobs = Job.canceled.status_changed_today.order(:status_changed_at)
-    Turbo::StreamsChannel.broadcast_remove_to "operator_jobs", target: job
     Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "openjobs_status_card", partial: "operator/jobs/job_status_card", locals: { jobs: openjobs, status: :open }
     Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "printingjobs_status_card", partial: "operator/jobs/job_status_card", locals: { jobs: printingjobs, status: :printing }
     Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "pickupjobs_status_card", partial: "operator/jobs/job_status_card", locals: { jobs: pickupjobs, status: :pickup }
     Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "paidjobs_status_card", partial: "operator/jobs/job_status_card", locals: { jobs: paidjobs, status: :paid }
     Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "canceledjobs_status_card", partial: "operator/jobs/job_status_card", locals: { jobs: canceledjobs, status: :canceled }
+    Turbo::StreamsChannel.broadcast_replace_to "operator_jobs", target: "start_next_job_btn", partial: "operator/jobs/start_next_job_btn", locals: { jobs: openjobs }
   end
 
-  def broadcast_create_job(job:)
-    Turbo::StreamsChannel.broadcast_prepend_later_to "jobs", target: :jobs, partial: "jobs/job_tr", locals: { job: job }
-    Turbo::StreamsChannel.broadcast_prepend_later_to "operator_jobs", target: :openjobs, partial: "operator/jobs/job_tr", locals: { job: job }
-    broadcast_update_status_cards job: job
+  def broadcast_create_job
+    Turbo::StreamsChannel.broadcast_prepend_later_to "jobs", target: :jobs, partial: "jobs/job_tr", locals: { job: @job }
+    Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :openjobs, partial: "operator/jobs/job_tr", locals: { job: @job }
+    broadcast_update_status_cards_and_start_next_job_button
   end
 
-  def broadcast_update_job(job:, status_changed: false)
-    Turbo::StreamsChannel.broadcast_replace_later_to "jobs", target: job, partial: "jobs/job_tr", locals: { job: }
-    if status_changed 
-      broadcast_update_status_cards job: job
-      case job.status.to_sym
-      when :canceled, :paid then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :paidcanceledjobs, partial: "operator/jobs/job_tr", locals: { job: job }
-      when :open then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :openjobs, partial: "operator/jobs/job_tr", locals: { job: job }
-      when :printing then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :printingjobs, partial: "operator/jobs/job_tr", locals: { job: job }
-      when :pickup then Turbo::StreamsChannel.broadcast_append_later_to  "operator_jobs", target:  :pickupjobs, partial:  "operator/jobs/job_tr", locals: { job: job }
+  def broadcast_update_job
+    Turbo::StreamsChannel.broadcast_replace_later_to "jobs", target: @job, partial: "jobs/job_tr", locals: { job: @job}
+    Turbo::StreamsChannel.broadcast_remove_to "operator_jobs", target: @job
+    if @status_changed
+      broadcast_update_status_cards_and_start_next_job_button
+      case @job.status.to_sym
+      when :canceled, :paid then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :paidcanceledjobs, partial: "operator/jobs/job_tr", locals: { job: @job }
+      when :open then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :openjobs, partial: "operator/jobs/job_tr", locals: { job: @job }
+      when :printing then Turbo::StreamsChannel.broadcast_append_later_to "operator_jobs", target: :printingjobs, partial: "operator/jobs/job_tr", locals: { job: @job }
+      when :pickup then Turbo::StreamsChannel.broadcast_append_later_to  "operator_jobs", target:  :pickupjobs, partial:  "operator/jobs/job_tr", locals: { job: @job }
       end
     else
-      Turbo::StreamsChannel.broadcast_replace_later_to "operator_jobs", target: job, partial: "operator/jobs/job_tr", locals: { job: job }
+      Turbo::StreamsChannel.broadcast_replace_later_to "operator_jobs", target: job, partial: "operator/jobs/job_tr", locals: { job: @job }
     end
   end
 
diff --git a/app/controllers/operator/jobs_controller.rb b/app/controllers/operator/jobs_controller.rb
index 6393734..92e06b8 100644
--- a/app/controllers/operator/jobs_controller.rb
+++ b/app/controllers/operator/jobs_controller.rb
@@ -41,10 +41,18 @@ class Operator::JobsController < ApplicationController
 
   # PATCH/PUT /jobs/1 or /jobs/1.json
   def update
+    # FIXME: Move to the model (orderstuff)
+    @openjobs = Job.open.order(:created_at)
+    @printingjobs = Job.printing.order(:status_changed_at)
+    @pickupjobs = Job.pickup.order(:status_changed_at)
+    @paidjobs = Job.paid.status_changed_today.order(:status_changed_at)
+    @canceledjobs = Job.canceled.status_changed_today.order(:status_changed_at)
+    @job.assign_attributes(job_params)
+    @status_changed = @job.status_changed?
     respond_to do |format|
-      if @job.update(job_params)
+      if @job.save
         broadcast_update_job
-        # format.turbo_stream
+        format.turbo_stream
         format.html { redirect_to operator_jobs_url, notice: "Job was successfully updated." }
       else
         format.html { render :edit, status: :unprocessable_entity }
@@ -67,11 +75,13 @@ class Operator::JobsController < ApplicationController
       flash[:notice] = "Job was successfully updated"
     else
       flash[:alert] = "Job could not be updated"
+      # NOTE: Discard changes that could not be saved so turbo_stream renders the correct values
+      @job.reload
     end
 
     respond_to do |format|
       broadcast_update_job
-      # format.turbo_stream
+      format.turbo_stream { render turbo_stream: turbo_stream.replace(@job, partial: "operator/jobs/job_tr", locals: { job: @job }) }
       format.html { redirect_to operator_jobs_url }
     end
   end
@@ -81,11 +91,13 @@ class Operator::JobsController < ApplicationController
       flash[:notice] = "Job was successfully updated"
     else
       flash[:alert] = "Job could not be updated"
+      # NOTE: Discard changes that could not be saved so turbo_stream renders the correct values
+      @job.reload
     end
 
     respond_to do |format|
       broadcast_update_job
-      # format.turbo_stream
+      format.turbo_stream { render turbo_stream: turbo_stream.replace(@job, partial: "operator/jobs/job_tr", locals: { job: @job }) }
       format.html { redirect_to operator_jobs_url }
     end
   end
diff --git a/app/models/job.rb b/app/models/job.rb
index cb69f48..b800e55 100644
--- a/app/models/job.rb
+++ b/app/models/job.rb
@@ -55,7 +55,7 @@ class Job < ApplicationRecord
       .or(Job.where(status: %i[paid canceled])
       .where("status_changed_at >= ?", Time.now.beginning_of_day))
       # .in_status_order
-      .order(created_at: :desc)
+      .order(created_at: :asc)
       # .order(:costumer_firstname, :costumer_lastname)
       .with_attached_pdf # scope from activestorage for .includes(pdf_attachment: :blob)
     # .references(:pdf_attachment, :blob) # creates big join table
diff --git a/app/views/jobs/_job_tr.html.erb b/app/views/jobs/_job_tr.html.erb
index 4ccc9f4..bfbf983 100644
--- a/app/views/jobs/_job_tr.html.erb
+++ b/app/views/jobs/_job_tr.html.erb
@@ -43,7 +43,7 @@
       <%= job.costum_qm_plan.round(2) %> m²
     </span>
   </td>
-  <td class="p-2 py-3 text-right">
+  <td class="w-24 p-2 py-3 text-right">
     <span class="badge">
       <%= job.cost.round(2) %> €
     </span>
diff --git a/app/views/operator/jobs/_job_tr.html.erb b/app/views/operator/jobs/_job_tr.html.erb
index 180334b..f641ada 100644
--- a/app/views/operator/jobs/_job_tr.html.erb
+++ b/app/views/operator/jobs/_job_tr.html.erb
@@ -47,7 +47,7 @@
       <%= job.costum_qm_plan.round(2) %> m²
     </span>
   </td>
-  <td class="p-2 py-3 text-right">
+  <td class="w-24 p-2 py-3 text-right">
     <span class="badge">
       <%= job.cost.round(2) %> €
     </span>
diff --git a/app/views/operator/jobs/_start_next_job_btn.html.erb b/app/views/operator/jobs/_start_next_job_btn.html.erb
new file mode 100644
index 0000000..16ee36f
--- /dev/null
+++ b/app/views/operator/jobs/_start_next_job_btn.html.erb
@@ -0,0 +1,15 @@
+<div id="start_next_job_btn">
+  <% if jobs.any? %>
+    <%= button_to icon("printer", 
+      class: "icon icon-nohover size-6 mr-2", 
+      title: "Drucken") + "Start next job (" + jobs.count.to_s + ")", operator_job_path(jobs.first), 
+      params:  { :job => { status: :printing} }, 
+      method: :patch, 
+      form_class: "btn bg-green-400 text-black" %>
+  <% else %>
+    <span class="flex items-center bg-gray-300 bg-opacity-80 btn hover:bg-opacity-80 text-hsrm-gray-light">
+      <%= icon("printer", class: "icon icon-nohover size-6 mr-2", title: "") %>
+      Start next job
+    </span>
+  <% end %>
+</div>
diff --git a/app/views/operator/jobs/index.html.erb b/app/views/operator/jobs/index.html.erb
index fa49d2a..e3d3080 100644
--- a/app/views/operator/jobs/index.html.erb
+++ b/app/views/operator/jobs/index.html.erb
@@ -3,30 +3,18 @@
 <div class="grid gap-4 grids-cols-2">
 </div>
 <div class="flex space-x-4 justify-items-center">
-  <%= render partial: "job_status_card", locals: { jobs:  @openjobs, status: :open } %>
-  <%= render partial: "job_status_card", locals: { jobs:  @printingjobs, status: :printing } %>
-  <%= render partial: "job_status_card", locals: { jobs:  @pickupjobs, status: :pickup } %>
-  <%= render partial: "job_status_card", locals: { jobs:  @paidjobs, status: :paid } %>
-  <%= render partial: "job_status_card", locals: { jobs:  @canceledjobs, status: :canceled } %>
+  <%= render partial: "job_status_card", locals: { jobs: @openjobs, status: :open } %>
+  <%= render partial: "job_status_card", locals: { jobs: @printingjobs, status: :printing } %>
+  <%= render partial: "job_status_card", locals: { jobs: @pickupjobs, status: :pickup } %>
+  <%= render partial: "job_status_card", locals: { jobs: @paidjobs, status: :paid } %>
+  <%= render partial: "job_status_card", locals: { jobs: @canceledjobs, status: :canceled } %>
 </div>
 <div class="w-full">
   <div id="printingjobs-h" class="flex items-center justify-between py-4">
     <h1 class="text-3xl font-bold text-hsrm-gray">
       Printing
     </h1>
-    <% if @openjobs.any? %>
-      <%= button_to icon("printer", 
-      class: "icon icon-nohover size-6 mr-2", 
-      title: "Drucken") + "Start next job (" + @openjobs.count.to_s + ")", operator_job_path(@openjobs.first), 
-      params:  { :job => { status: :printing} }, 
-      method: :patch, 
-      form_class: "btn bg-green-400 text-black" %>
-    <% else %>
-      <span class="flex items-center bg-gray-300 bg-opacity-80 btn hover:bg-opacity-80 text-hsrm-gray-light">
-        <%= icon("printer", class: "icon icon-nohover size-6 mr-2", title: "") %>
-        Start next job
-      </span>
-    <% end %>
+    <%= render partial: 'start_next_job_btn', locals: { jobs: @openjobs } %>
   </div>
   <%# render partial: "job_card", collection: @printingjobs, as: :job %>
   <div class="min-w-full overflow-auto shadow-lg">
diff --git a/app/views/operator/jobs/update.turbo_stream.erb b/app/views/operator/jobs/update.turbo_stream.erb
index 406a77a..03a5e13 100644
--- a/app/views/operator/jobs/update.turbo_stream.erb
+++ b/app/views/operator/jobs/update.turbo_stream.erb
@@ -1 +1,22 @@
 <%= turbo_stream.update "flash", partial: "layouts/flash" %>
+<%# FIXME: change to local variables (find out how.. ;)) %>
+<% if @status_changed %>
+  <%= turbo_stream.remove @job %>
+  <% case @job.status.to_sym %>
+  <% when :canceled, :paid %>
+    <%= turbo_stream.append :paidcanceledjobs, partial: "job_tr", locals: { job: @job} %>
+  <% when :open %>
+    <!-- Update the whole list because the order should be preserved -->
+    <%= turbo_stream.update :openjobs, partial: "job_tr", collection: @openjobs, as: :job %>
+  <% else %>
+    <%= turbo_stream.append "#{@job.status}jobs", partial: "job_tr", locals: { job: @job} %>
+  <% end %>
+  <%= turbo_stream.replace "openjobs_status_card", partial: "job_status_card", locals: { jobs: @openjobs, status: :open } %>
+  <%= turbo_stream.replace "printingjobs_status_card", partial: "job_status_card", locals: { jobs: @printingjobs, status: :printing } %>
+  <%= turbo_stream.replace "pickupjobs_status_card", partial: "job_status_card", locals: { jobs: @pickupjobs, status: :pickup } %>
+  <%= turbo_stream.replace "paidjobs_status_card", partial: "job_status_card", locals: { jobs: @paidjobs, status: :paid } %>
+  <%= turbo_stream.replace "canceledjobs_status_card", partial: "job_status_card", locals: { jobs: @canceledjobs, status: :canceled } %>
+  <%= turbo_stream.replace "start_next_job_btn", partial: "start_next_job_btn", locals: { jobs: @openjobs} %>
+<% else %>
+  <%= turbo_stream.replace @job, partial: "job_tr", locals: { job: @job } %>
+<% end %>