diff --git a/bower.json b/bower.json
index ded74c8..cad5023 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "strolch-wc-inspector",
   "description": "Strolch WebComponent Inspector",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "authors": ["Robert von Burg"],
   "keywords": [
     "strolch",
diff --git a/strolch-wc-inspector-behavior.html b/strolch-wc-inspector-behavior.html
index 36764f1..6ca25c2 100644
--- a/strolch-wc-inspector-behavior.html
+++ b/strolch-wc-inspector-behavior.html
@@ -27,6 +27,9 @@
 
             return s;
         },
+        isEqual: function (o1, o2) {
+            return o1 == o2;
+        },
         isEmptyArray: function (arr) {
             return arr == null || arr.length == 0;
         },
diff --git a/strolch-wc-jobs.html b/strolch-wc-jobs.html
index 758097d..da91b69 100644
--- a/strolch-wc-jobs.html
+++ b/strolch-wc-jobs.html
@@ -72,10 +72,11 @@
                         <div class="g-2"><b>Name</b></div>
                         <div class="g-1"><b>Realm</b></div>
                         <div class="g-1"><b>Mode</b></div>
-                        <div class="g-1"><b>Delay</b></div>
+                        <div class="g-1"><b>Running</b></div>
                         <div class="g-1"><b>Executions</b></div>
-                        <div class="g-2"><b>Last Execution</b></div>
-                        <div class="g-2"><b>Next Execution</b></div>
+                        <div class="g-1"><b>Initial / Recurring Delay</b></div>
+                        <div class="g-1"><b>Last / Total Duration</b></div>
+                        <div class="g-2"><b>Last / Next Execution</b></div>
                         <div class="g-2"></div>
                     </div>
 
@@ -87,16 +88,28 @@
                             <div class="g-2 g-auto-middle">[[item.name]]</div>
                             <div class="g-1 g-auto-middle">[[item.realm]]</div>
                             <div class="g-1 g-auto-middle">[[item.mode]]</div>
+                            <div class="g-1 g-auto-middle">[[item.running]]</div>
+                            <div class="g-1 g-auto-middle">[[item.nrOfExecutions]]</div>
                             <div class="g-1 g-auto-middle">[[item.initialDelay]] [[item.initialDelayTimeUnit]] <br />
                                                            [[item.delay]] [[item.delayTimeUnit]]
                             </div>
-                            <div class="g-1 g-auto-middle">[[item.nrOfExecutions]]</div>
-                            <div class="g-2 g-auto-middle">[[toLocalDateTime(item.lastExecution)]]</div>
-                            <div class="g-2 g-auto-middle">[[toLocalDateTime(item.nextExecution)]]</div>
+                            <div class="g-1 g-auto-middle">[[item.lastDuration]] <br /> [[item.totalDuration]]</div>
+                            <div class="g-2 g-auto-middle">[[toLocalDateTime(item.lastExecution)]] <br />
+                                                           [[toLocalDateTime(item.nextExecution)]]
+                            </div>
 
                             <div class="g-2 g-auto-middle">
-                                <paper-icon-button icon="cancel" title="Cancel" on-tap="cancel"></paper-icon-button>
-                                <paper-icon-button icon="alarm" title="Schedule" on-tap="schedule"></paper-icon-button>
+                                <paper-icon-button icon="cancel"
+                                                   title="Cancel"
+                                                   on-tap="cancel"
+                                                   hidden$="[[isEqual(item.mode, 'Manual')]]"></paper-icon-button>
+
+
+                                <paper-icon-button icon="alarm"
+                                                   title="Schedule"
+                                                   on-tap="schedule"
+                                                   hidden$="[[isEqual(item.mode, 'Manual')]]"></paper-icon-button>
+
                                 <paper-icon-button icon="av:play-arrow"
                                                    title="Run now"
                                                    on-tap="runNow"></paper-icon-button>