diff --git a/web/views/dashboard.haml b/web/views/dashboard.haml
index f250db5..ad00c1e 100644
--- a/web/views/dashboard.haml
+++ b/web/views/dashboard.haml
@@ -8,24 +8,25 @@
   - @jobs.each do |job|
     %tr
       %td= job.job_id
-      %td= job.last_performed_at || '-'
+      %td= job.last_performed_at || 'Never performed yet'
       %td
-        - if job.healthy == false
-          %a{ href: url("/job/#{job.id}") }
-            %span.red-text{ title: 'There were problems with this job. Follow the link to check the log.' }
-              %i.mdi-alert-warning
-              Error
-        - elsif job.healthy == true
+        - if job.last_performed_at.nil?
+          %span.grey-text.darken-3{ title: 'This job has never been performed yet.' }
+            %i.mdi-device-access-time
+            Pending
+        - elsif job.healthy
           %a{ href: url("/job/#{job.id}") }
             %span.green-text.darken-3{ title: 'This job was performed successfully.' }
               %i.mdi-action-done
               Success
         - else
           %a{ href: url("/job/#{job.id}") }
-            %span.grey-text.darken-3{ title: 'This job has never been performed yet.' }
-              %i.mdi-device-access-time
-              Pending
+            %span.red-text{ title: 'There were problems with this job. Follow the link to check the log.' }
+              %i.mdi-alert-warning
+              Error
+
       %td
-        %a{ href: url("/job/#{job.id}") }
-          Log
-          %span.glyphicon.glyphicon-menu-right
+        - if job.last_performed_at
+          %a{ href: url("/job/#{job.id}") }
+            Log
+            %i.mdi-navigation-chevron-right
diff --git a/web/views/job.haml b/web/views/job.haml
index ae540b2..997a485 100644
--- a/web/views/job.haml
+++ b/web/views/job.haml
@@ -1,4 +1,6 @@
-%a{ href: url('/') } << Back to Home
+%a{ href: url('/') }
+  %i.mdi-navigation-chevron-left
+  Back to Home
 
 %h4 "#{@job.job_id}" Log: