diff --git a/app/controllers/jobs_controller.rb b/app/controllers/jobs_controller.rb
index de15270..a64dae8 100644
--- a/app/controllers/jobs_controller.rb
+++ b/app/controllers/jobs_controller.rb
@@ -1,81 +1,89 @@
 class JobsController < ApplicationController
   before_action :require_logged_in
-  before_action :fetch_host, only: [:new, :edit, :show, :create, :update,
+  before_action :fetch_host, only: [:new, :edit, :show, :create, :update, :destroy,
                                     :toggle_enable, :backup_now]
   before_action :fetch_job, only: [:show, :edit, :update, :destroy, :toggle_enable, :backup_now]
 
   # GET /jobs
   def new
     @job = @host.job_templates.new
     @schedule = @host.schedules.find(params[:schedule_id]) if params[:schedule_id]
   end
 
   # POST /jobs
   def create
     @job = @host.job_templates.new(fetch_params)
     if @job.save
       flash[:success] = 'Job created successfully'
       redirect_to host_path(@host)
     else
       render :new
     end
   end
 
   # GET /jobs/1
   def show; end
 
   # GET /jobs/1/edit
   def edit
     @fileset = @host.filesets.find(params[:fileset_id]) if params[:fileset_id]
     @schedule = @host.schedules.find(params[:schedule_id]) if params[:schedule_id]
   end
 
   # PUT /jobs/1
   def update
     if @job.update_attributes(fetch_params)
       flash[:success] = 'Job updated'
       redirect_to host_job_path(@host, @job)
     else
       render :edit
     end
   end
 
   # DELETE /jobs/1
   def destroy
+    if @job.destroy
+      flash[:success] = 'Job deleted'
+      @host.recalculate
+      redirect_to host_path(@host)
+    else
+      flash[:error] = 'Job not deleted'
+      redirect_to host_job_path(@host, @job)
+    end
   end
 
   # PATCH /hosts/1/jobs/1/enable
   def toggle_enable
     @job.enabled = !@job.enabled
     @job.save
     flash[:success] = @job.enabled? ? 'Job enabled' : 'Job disabled'
 
     redirect_to host_path(@host)
   end
 
   # POST /hosts/1/jobs/1/backup_now
   def backup_now
     if @job.backup_now
       flash[:success] = 'Backup directive was sent to bacula. Backup will be taken in a while'
     else
       flash[:error] = 'Backup was not sent, try again later'
     end
 
     redirect_to client_path(@host.client)
   end
 
   private
 
   def fetch_job
     @job = @host.job_templates.find(params[:id])
   end
 
   def fetch_host
     @host = current_user.hosts.find(params[:host_id])
   end
 
   def fetch_params
     params.require(:job_template).
       permit(:name, :fileset_id, :schedule_id, :client_before_run_file, :client_after_run_file)
   end
 end
diff --git a/app/views/jobs/_job_details.html.erb b/app/views/jobs/_job_details.html.erb
index 68ae627..83db2e0 100644
--- a/app/views/jobs/_job_details.html.erb
+++ b/app/views/jobs/_job_details.html.erb
@@ -1,51 +1,51 @@
-<div class="col-xs-4">
+<div class="col-xs-12">
   <div class="table-responsive">
     <table class="table table-striped table-bordered table-condensed">
       <tr>
         <td><b>Name</b></td>
         <td><%= @job.name %></td>
       </tr>
       <tr>
         <td><b>Type</b></td>
         <td><%= @job.job_type %></td>
       </tr>
       <tr>
         <td><b>Host</b></td>
         <td><%= @host.name %></td>
       </tr>
       <tr>
         <td><b>Fileset</b></td>
         <td><pre><%= @job.fileset.to_bacula_config_array.join("\n") %></pre></td>
       </tr>
       <% if @job.restore? %>
         <tr>
           <td><b>Restore Location</b></td>
           <td><%= @job.restore_location %></td>
         </tr>
       <% else %>
         <tr>
           <td><b>Schedule</b></td>
           <td>
             <pre><%= @job.schedule.to_bacula_config_array.join("\n") %></pre>
           </td>
         </tr>
       <% end %>
       <tr>
         <td><b>Client Run Before Job</b></td>
         <td><%= @job.client_before_run_file %></td>
       </tr>
       <tr>
         <td><b>Client Run After Job</b></td>
         <td><%= @job.client_after_run_file %></td>
       </tr>
       <tr>
         <td><b>Created</b></td>
         <td><%= I18n.l(@job.created_at, format: :long) %></td>
       </tr>
       <tr>
         <td><b>Enabled</b></td>
         <td><%= @job.enabled_human %></td>
       </tr>
     </table>
   </div>
 </div>
diff --git a/app/views/jobs/show.html.erb b/app/views/jobs/show.html.erb
index df05487..806249c 100644
--- a/app/views/jobs/show.html.erb
+++ b/app/views/jobs/show.html.erb
@@ -1,22 +1,32 @@
 <h1>"<%= @job.name %>" Job Template</h1>
 
 <div class="row">
   <div class="col-xs-6">
-    <h3> Job Attributes</h3>
-  </div>
-</div>
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h3> Job Attributes</h3>
+      </div>
 
-<div class="row">
-  <%= render partial: 'job_details' %>
-</div>
+      <div class="row">
+        <%= render partial: 'job_details' %>
+      </div>
 
-<div class="row">
-  <div class="col-xs-2">
-    <%= link_to 'Edit', edit_host_job_path(@host, @job),
-      class: "btn btn-primary", role: "button" %>
-  </div>
-  <div class="col-xs-2">
-    <%= link_to 'Back to host', host_path(@host),
-      class: "btn btn-success", role: "button" %>
+      <div class="row">
+        <div class="col-xs-2">
+          <%= link_to 'Delete', host_job_path(@host, @job),
+            method: :delete, data: { confirm: 'This will delete the job' },
+            class: "btn btn-danger", role: "button" %>
+        </div>
+        <div class="col-xs-2 col-xs-offset-2">
+          <%= link_to 'Edit', edit_host_job_path(@host, @job),
+            class: "btn btn-primary", role: "button" %>
+        </div>
+        <div class="col-xs-2 col-xs-offset-4 right">
+          <%= link_to 'Back to host', host_path(@host),
+            class: "btn btn-success", role: "button" %>
+        </div>
+      </div>
+      <br />
+    </div>
   </div>
 </div>