diff --git a/resources/views/livewire/project/application/deployments.blade.php b/resources/views/livewire/project/application/deployments.blade.php
index 18f5c6375..1801af81d 100644
--- a/resources/views/livewire/project/application/deployments.blade.php
+++ b/resources/views/livewire/project/application/deployments.blade.php
@@ -23,82 +23,79 @@
                 data_get($deployment, 'status') === 'error',
             'border-success hover:bg-success' =>
                 data_get($deployment, 'status') === 'finished',
-        ]) @if (data_get($deployment, 'status') !== 'cancelled by system' && data_get($deployment, 'status') !== 'queued')
-            href="{{ $current_url . '/' . data_get($deployment, 'deployment_uuid') }}"
-    @endif
-    class="hover:no-underline">
-    <div class="flex flex-col justify-start">
-        <div>
-            {{ $deployment->created_at }} UTC
-            <span class=" text-warning">></span>
-            {{ $deployment->status }}
-            @if (data_get($deployment, 'pull_request_id'))
-                <span class=" text-warning">></span>
-                Pull Request #{{ data_get($deployment, 'pull_request_id') }}
-                @if (data_get($deployment, 'is_webhook'))
-                    (Webhook)
+        ]) href="{{ $current_url . '/' . data_get($deployment, 'deployment_uuid') }}"
+            class="hover:no-underline">
+            <div class="flex flex-col justify-start">
+                <div class="flex gap-1">
+                    {{ $deployment->created_at }} UTC
+                    <span class=" text-warning">></span>
+                    {{ $deployment->status }}
+                </div>
+                @if (data_get($deployment, 'pull_request_id'))
+                    <div>
+                        <span class=" text-warning">></span>
+                        Pull Request #{{ data_get($deployment, 'pull_request_id') }}
+                        @if (data_get($deployment, 'is_webhook'))
+                            (Webhook)
+                        @endif
+                        Webhook (SHA
+                        @if (data_get($deployment, 'commit'))
+                            {{ data_get($deployment, 'commit') }})
+                        @else
+                            HEAD)
+                        @endif
+                    </div>
                 @endif
-            @elseif (data_get($deployment, 'is_webhook'))
-                <span class=" text-warning">></span>
-        </div>
-        Webhook (sha
-        @if (data_get($deployment, 'commit'))
-            {{ data_get($deployment, 'commit') }})
-        @else
-            HEAD)
-        @endif
-        @endif
-    </div>
+            </div>
 
-    <div class="flex flex-col" x-data="elapsedTime('{{ $deployment->deployment_uuid }}', '{{ $deployment->status }}', '{{ $deployment->created_at }}', '{{ $deployment->updated_at }}')">
-        <div>
-            @if ($deployment->status !== 'in_progress')
-                Finished <span x-text="measure_since_started()">0s</span> in
-            @else
-                Running for
-            @endif
-            <span class="font-bold" x-text="measure_finished_time()">0s</span>
-        </div>
-    </div>
-</div>
-</a>
-@empty
-<div class="">No deployments found</div>
-@endforelse
-<script src="https://cdn.jsdelivr.net/npm/dayjs@1/dayjs.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/dayjs@1/plugin/utc.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/dayjs@1/plugin/relativeTime.js"></script>
-<script>
-    document.addEventListener('alpine:init', () => {
-        let timers = {};
+            <div class="flex flex-col" x-data="elapsedTime('{{ $deployment->deployment_uuid }}', '{{ $deployment->status }}', '{{ $deployment->created_at }}', '{{ $deployment->updated_at }}')">
+                <div>
+                    @if ($deployment->status !== 'in_progress')
+                        Finished <span x-text="measure_since_started()">0s</span> in
+                    @else
+                        Running for
+                    @endif
+                    <span class="font-bold" x-text="measure_finished_time()">0s</span>
+                </div>
+            </div>
+        </a>
+    @empty
+        <div class="">No deployments found</div>
+    @endforelse
+    <script src="https://cdn.jsdelivr.net/npm/dayjs@1/dayjs.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/dayjs@1/plugin/utc.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/dayjs@1/plugin/relativeTime.js"></script>
+    <script>
+        document.addEventListener('alpine:init', () => {
+            let timers = {};
 
-        dayjs.extend(window.dayjs_plugin_utc);
-        dayjs.extend(window.dayjs_plugin_relativeTime);
+            dayjs.extend(window.dayjs_plugin_utc);
+            dayjs.extend(window.dayjs_plugin_relativeTime);
 
-        Alpine.data('elapsedTime', (uuid, status, created_at, updated_at) => ({
-            finished_time: 'calculating...',
-            started_time: 'calculating...',
-            init() {
-                if (timers[uuid]) {
-                    clearInterval(timers[uuid]);
+            Alpine.data('elapsedTime', (uuid, status, created_at, updated_at) => ({
+                finished_time: 'calculating...',
+                started_time: 'calculating...',
+                init() {
+                    if (timers[uuid]) {
+                        clearInterval(timers[uuid]);
+                    }
+                    if (status === 'in_progress') {
+                        timers[uuid] = setInterval(() => {
+                            this.finished_time = dayjs().diff(dayjs.utc(created_at),
+                                'second') + 's'
+                        }, 1000);
+                    } else {
+                        let seconds = dayjs.utc(updated_at).diff(dayjs.utc(created_at), 'second')
+                        this.finished_time = seconds + 's';
+                    }
+                },
+                measure_finished_time() {
+                    return this.finished_time;
+                },
+                measure_since_started() {
+                    return dayjs.utc(created_at).fromNow();
                 }
-                if (status === 'in_progress') {
-                    timers[uuid] = setInterval(() => {
-                        this.finished_time = dayjs().diff(dayjs.utc(created_at),
-                            'second') + 's'
-                    }, 1000);
-                } else {
-                    let seconds = dayjs.utc(updated_at).diff(dayjs.utc(created_at), 'second')
-                    this.finished_time = seconds + 's';
-                }
-            },
-            measure_finished_time() {
-                return this.finished_time;
-            },
-            measure_since_started() {
-                return dayjs.utc(created_at).fromNow();
-            }
-        }))
-    })
-</script>
+            }))
+        })
+    </script>
 </div>