diff --git a/resources/views/livewire/project/application/configuration.blade.php b/resources/views/livewire/project/application/configuration.blade.php
index 59899584f..dae96831d 100644
--- a/resources/views/livewire/project/application/configuration.blade.php
+++ b/resources/views/livewire/project/application/configuration.blade.php
@@ -18,7 +18,9 @@
                     href="#">Environment
                     Variables</a>
             @endif
-
+            <a :class="activeTab === 'scheduled-tasks' && 'text-white'"
+            @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'" href="#">Scheduled Tasks
+        </a>
             @if ($application->git_based())
                 <a :class="activeTab === 'source' && 'text-white'"
                     @click.prevent="activeTab = 'source'; window.location.hash = 'source'" href="#">Source</a>
@@ -54,9 +56,7 @@
                     href="#">Resource Limits
                 </a>
             @endif
-            <a :class="activeTab === 'scheduled-tasks' && 'text-white'"
-                @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'" href="#">Scheduled Tasks
-            </a>
+
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger Zone
             </a>
diff --git a/resources/views/livewire/project/shared/scheduled-task/executions.blade.php b/resources/views/livewire/project/shared/scheduled-task/executions.blade.php
index 9f0fd9208..9e8d82db5 100644
--- a/resources/views/livewire/project/shared/scheduled-task/executions.blade.php
+++ b/resources/views/livewire/project/shared/scheduled-task/executions.blade.php
@@ -1,25 +1,30 @@
 <div class="flex flex-col-reverse gap-2">
     @forelse($executions as $execution)
-            <a class="flex flex-col box" wire:click="selectTask({{ data_get($execution, 'id') }})"
-                @class([
-                    'border-green-500' => data_get($execution, 'status') === 'success',
-                    'border-red-500' => data_get($execution, 'status') === 'failed',
-                ])>
-                @if (data_get($execution, 'status') === 'running')
+        @if (data_get($execution, 'id') == $selectedKey)
+            <div class="p-2">
+                @if (data_get($execution, 'message'))
+                    <div>
+                        <pre>{{ data_get($execution, 'message') }}</pre>
+                    </div>
+                @else
+                    <div>No output was recorded for this execution.</div>
+                @endif
+            </div>
+        @endif
+        <a wire:click="selectTask({{ data_get($execution, 'id') }})" @class([
+            'flex flex-col border-l border-dashed transition-colors box-without-bg bg-coolgray-100 hover:bg-coolgray-100',
+            'bg-coolgray-200 text-white hover:bg-coolgray-200' =>
+                data_get($execution, 'id') == $selectedKey,
+            'border-green-500' => data_get($execution, 'status') === 'success',
+            'border-red-500' => data_get($execution, 'status') === 'failed',
+        ])>
+            @if (data_get($execution, 'status') === 'running')
                 <div class="absolute top-2 right-2">
                     <x-loading />
                 </div>
-                @endif
-                <div>Status: {{ data_get($execution, 'status') }}</div>
-                <div>Started At: {{ data_get($execution, 'created_at') }}</div>
-                @if (data_get($execution, 'id') == $selectedKey)
-                    @if (data_get($execution, 'message'))
-                        <div>Output: <pre>{{ data_get($execution, 'message') }}</pre></div>
-                    @else
-                        <div>No output was recorded for this execution.</div>
-                    @endif
-                @endif
-            </a>
+            @endif
+            <div>Status: {{ data_get($execution, 'status') }}</div>
+            <div>Started At: {{ data_get($execution, 'created_at') }}</div>
         </a>
     @empty
         <div>No executions found.</div>
diff --git a/resources/views/livewire/project/shared/scheduled-task/show.blade.php b/resources/views/livewire/project/shared/scheduled-task/show.blade.php
index cbeb971b1..95b7dbc6d 100644
--- a/resources/views/livewire/project/shared/scheduled-task/show.blade.php
+++ b/resources/views/livewire/project/shared/scheduled-task/show.blade.php
@@ -8,13 +8,13 @@
 
     <h1>Scheduled Task</h1>
     @if ($type === 'application')
-    <livewire:project.application.heading :application="$resource" />
+        <livewire:project.application.heading :application="$resource" />
     @elseif ($type === 'service')
-    <livewire:project.service.navbar :service="$resource" :parameters="$parameters" />
+        <livewire:project.service.navbar :service="$resource" :parameters="$parameters" />
     @endif
 
-    <form wire:submit="submit">
-        <div class="flex flex-col gap-2 pb-10">
+    <form wire:submit="submit" class="w-full">
+        <div class="flex flex-col gap-2 pb-4">
             <div class="flex items-end gap-2 pt-4">
                 <h2>Scheduled Task</h2>
                 <x-forms.button type="submit">
@@ -27,16 +27,17 @@
 
             </div>
         </div>
-
-        <x-forms.input placeholder="Run cron" id="task.name" label="Name" required />
-        <x-forms.input placeholder="php artisan schedule:run" id="task.command" label="Command" required />
-        <x-forms.input placeholder="0 0 * * * or daily" id="task.frequency" label="Frequency" required />
-        <x-forms.input placeholder="php" id="task.container" label="Container name" />
+        <div class="flex w-full gap-2">
+            <x-forms.input placeholder="Name" id="task.name" label="Name" required />
+            <x-forms.input placeholder="php artisan schedule:run" id="task.command" label="Command" required />
+            <x-forms.input placeholder="0 0 * * * or daily" id="task.frequency" label="Frequency" required />
+            <x-forms.input placeholder="php" helper="You can leave it empty if your resource only have one container."
+                id="task.container" label="Container name" />
+        </div>
     </form>
 
-    <div class="pt-10">
+    <div class="pt-4">
         <h3 class="py-4">Recent executions</h3>
-        <livewire:project.shared.scheduled-task.executions key="{{ $task->id }}" selectedKey=""
-            :executions="$task->executions->take(-20)" />
+        <livewire:project.shared.scheduled-task.executions key="{{ $task->id }}" selectedKey="" :executions="$task->executions->take(-20)" />
     </div>
 </div>