diff --git a/app/Http/Controllers/ApplicationController.php b/app/Http/Controllers/ApplicationController.php
new file mode 100644
index 000000000..ca7c4b659
--- /dev/null
+++ b/app/Http/Controllers/ApplicationController.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Spatie\Activitylog\Models\Activity;
+
+class ApplicationController extends Controller
+{
+    public function configuration()
+    {
+        $project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('home');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('home');
+        }
+        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
+        if (!$application) {
+            return redirect()->route('home');
+        }
+        return view('project.applications.configuration', ['application' => $application]);
+    }
+    public function deployments()
+    {
+        $project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('home');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('home');
+        }
+        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
+        if (!$application) {
+            return redirect()->route('home');
+        }
+        return view('project.applications.deployments', ['application' => $application, 'deployments' => $application->deployments()]);
+    }
+
+    public function deployment()
+    {
+        $deployment_uuid = request()->route('deployment_uuid');
+
+        $project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('home');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('home');
+        }
+        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
+        if (!$application) {
+            return redirect()->route('home');
+        }
+        $activity = Activity::where('properties->deployment_uuid', '=', $deployment_uuid)->first();
+
+        return view('project.applications.deployment', [
+            'application' => $application,
+            'activity' => $activity,
+            'deployment_uuid' => $deployment_uuid,
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 1bcb848f7..17cbdf8e3 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -29,7 +29,7 @@ class ProjectController extends Controller
         return view('project.resources', ['project' => $project, 'environment' => $environment]);
     }
 
-    public function application()
+    public function application_configuration()
     {
         $project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
@@ -43,10 +43,26 @@ class ProjectController extends Controller
         if (!$application) {
             return redirect()->route('home');
         }
-        return view('project.application', ['application' => $application, 'deployments' => $application->deployments()]);
+        return view('project.applications.configuration', ['application' => $application]);
+    }
+    public function application_deployments()
+    {
+        $project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('home');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('home');
+        }
+        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
+        if (!$application) {
+            return redirect()->route('home');
+        }
+        return view('project.applications.deployments', ['application' => $application, 'deployments' => $application->deployments()]);
     }
 
-    public function deployment()
+    public function application_deployment()
     {
         $deployment_uuid = request()->route('deployment_uuid');
 
@@ -64,7 +80,8 @@ class ProjectController extends Controller
         }
         $activity = Activity::where('properties->deployment_uuid', '=', $deployment_uuid)->first();
 
-        return view('project.deployment', [
+        return view('project.applications.deployment', [
+            'application' => $application,
             'activity' => $activity,
             'deployment_uuid' => $deployment_uuid,
         ]);
diff --git a/app/Http/Livewire/Application/Destination.php b/app/Http/Livewire/Application/Destination.php
new file mode 100644
index 000000000..a630941cc
--- /dev/null
+++ b/app/Http/Livewire/Application/Destination.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Livewire\Application;
+
+use Livewire\Component;
+
+class Destination extends Component
+{
+    public $destination;
+}
diff --git a/app/Http/Livewire/Application/General.php b/app/Http/Livewire/Application/General.php
new file mode 100644
index 000000000..41d4cbb62
--- /dev/null
+++ b/app/Http/Livewire/Application/General.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Livewire\Application;
+
+use App\Models\Application;
+use Livewire\Component;
+
+class General extends Component
+{
+    public string $applicationId;
+
+    public Application $application;
+    public string $name;
+    public string|null $fqdn;
+    public string $git_repository;
+    public string $git_branch;
+    public string|null $git_commit_sha;
+    public string $build_pack;
+
+    protected $rules = [
+        'application.name' => 'required|min:6',
+        'application.fqdn' => 'nullable',
+        'application.git_repository' => 'required',
+        'application.git_branch' => 'required',
+        'application.git_commit_sha' => 'nullable',
+        'application.build_pack' => 'required',
+        'application.base_directory' => 'required',
+        'application.publish_directory' => 'nullable',
+        'application.environment.name' => 'required',
+        'application.destination.network' => 'required',
+    ];
+
+    public function mount()
+    {
+        $this->application = Application::find($this->applicationId)->with('destination')->first();
+    }
+    public function submit()
+    {
+        $this->validate();
+        $this->application->save();
+    }
+}
diff --git a/app/Http/Livewire/Application/Secrets.php b/app/Http/Livewire/Application/Secrets.php
new file mode 100644
index 000000000..c94e0e4a4
--- /dev/null
+++ b/app/Http/Livewire/Application/Secrets.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Http\Livewire\Application;
+
+use Livewire\Component;
+
+class Secrets extends Component
+{
+    public function render()
+    {
+        return view('livewire.application.secrets');
+    }
+}
diff --git a/app/Http/Livewire/Application/Source.php b/app/Http/Livewire/Application/Source.php
new file mode 100644
index 000000000..f4981846b
--- /dev/null
+++ b/app/Http/Livewire/Application/Source.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Livewire\Application;
+
+use App\Models\Application;
+use Livewire\Component;
+
+class Source extends Component
+{
+    public $applicationId;
+    public Application $application;
+
+    protected $rules = [
+        'application.git_repository' => 'required',
+        'application.git_branch' => 'required',
+        'application.git_commit_sha' => 'nullable',
+    ];
+    public function mount()
+    {
+        $this->application = Application::find($this->applicationId)->first();
+    }
+}
diff --git a/app/Http/Livewire/ApplicationForm.php b/app/Http/Livewire/ApplicationForm.php
deleted file mode 100644
index dc1d2d572..000000000
--- a/app/Http/Livewire/ApplicationForm.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Http\Livewire;
-
-use App\Models\Application;
-use Livewire\Component;
-
-class ApplicationForm extends Component
-{
-    protected Application $application;
-    public string $applicationId;
-    public string $name;
-    public string|null $fqdn;
-    public string $git_repository;
-    public string $git_branch;
-    public string|null $git_commit_sha;
-
-    protected $rules = [
-        'name' => 'required|min:6'
-    ];
-    public function mount()
-    {
-        $this->application = Application::find($this->applicationId);
-        $this->fill([
-            'name' => $this->application->name,
-            'fqdn' => $this->application->fqdn,
-            'git_repository' => $this->application->git_repository,
-            'git_branch' => $this->application->git_branch,
-            'git_commit_sha' => $this->application->git_commit_sha,
-        ]);
-    }
-    public function submit()
-    {
-        $this->validate();
-        dd($this->name);
-    }
-}
diff --git a/app/Http/Livewire/CheckUpdate.php b/app/Http/Livewire/CheckUpdate.php
index 17b83387e..964c360f0 100644
--- a/app/Http/Livewire/CheckUpdate.php
+++ b/app/Http/Livewire/CheckUpdate.php
@@ -22,8 +22,4 @@ class CheckUpdate extends Component
         $this->currentVersion = config('coolify.version');
         version_compare($this->currentVersion, $this->latestVersion, '<') ? $this->updateAvailable = true : $this->updateAvailable = false;
     }
-    public function render()
-    {
-        return view('livewire.check-update');
-    }
 }
diff --git a/app/Http/Livewire/DeployApplication.php b/app/Http/Livewire/DeployApplication.php
index 8531ed7db..c1adcbcee 100644
--- a/app/Http/Livewire/DeployApplication.php
+++ b/app/Http/Livewire/DeployApplication.php
@@ -4,6 +4,7 @@ namespace App\Http\Livewire;
 
 use App\Jobs\DeployApplicationJob;
 use App\Models\Application;
+use Illuminate\Support\Facades\Route;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -14,36 +15,31 @@ class DeployApplication extends Component
     public $status;
     public Application $application;
     public $destination;
+    public array $parameters;
 
     protected string $deployment_uuid;
     protected array $command = [];
     protected $source;
 
-    public function mount($applicationId)
+    public function mount()
     {
-        $this->application = Application::find($applicationId)->first();
+        $this->parameters = Route::current()->parameters();
+        $this->application = Application::find($this->applicationId)->first();
         $this->destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
     }
 
-    public function render()
-    {
-        return view('livewire.deploy-application');
-    }
-
-
     public function start()
     {
         // Create Deployment ID
         $this->deployment_uuid = new Cuid2(7);
+        $this->parameters['deployment_uuid'] = $this->deployment_uuid;
 
         dispatch(new DeployApplicationJob(
             deployment_uuid: $this->deployment_uuid,
             application_uuid: $this->application->uuid,
         ));
 
-        $currentUrl = url()->previous();
-        $deploymentUrl = "$currentUrl/deployment/$this->deployment_uuid";
-        return redirect($deploymentUrl);
+        return redirect()->route('project.applications.deployment', $this->parameters);
     }
 
     public function stop()
diff --git a/app/Http/Livewire/PollActivity.php b/app/Http/Livewire/PollActivity.php
index da8ed5252..b10fc8da6 100644
--- a/app/Http/Livewire/PollActivity.php
+++ b/app/Http/Livewire/PollActivity.php
@@ -24,9 +24,4 @@ class PollActivity extends Component
             $this->isKeepAliveOn = false;
         }
     }
-
-    public function render()
-    {
-        return view('livewire.poll-activity');
-    }
 }
diff --git a/app/Http/Livewire/PollDeployment.php b/app/Http/Livewire/PollDeployment.php
new file mode 100644
index 000000000..d58cf4f24
--- /dev/null
+++ b/app/Http/Livewire/PollDeployment.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use Livewire\Component;
+use Spatie\Activitylog\Models\Activity;
+
+class PollDeployment extends Component
+{
+    public string $deployment_uuid;
+    public string $created_at;
+    public string $status;
+    public function polling()
+    {
+        $activity = Activity::where('properties->deployment_uuid', '=', $this->deployment_uuid)->first();
+        $this->created_at = $activity->created_at;
+        $this->status = data_get($activity, 'properties.status');
+    }
+}
diff --git a/app/Http/Livewire/RunCommand.php b/app/Http/Livewire/RunCommand.php
index 5bb84a56f..9eaa2bbd1 100755
--- a/app/Http/Livewire/RunCommand.php
+++ b/app/Http/Livewire/RunCommand.php
@@ -27,10 +27,6 @@ class RunCommand extends Component
         $this->servers = Server::all();
         $this->server = $this->servers[0]->uuid;
     }
-    public function render()
-    {
-        return view('livewire.run-command');
-    }
 
     public function runCommand()
     {
diff --git a/app/Http/Livewire/SwitchTeam.php b/app/Http/Livewire/SwitchTeam.php
index edb68852a..089ccf76b 100644
--- a/app/Http/Livewire/SwitchTeam.php
+++ b/app/Http/Livewire/SwitchTeam.php
@@ -19,8 +19,4 @@ class SwitchTeam extends Component
         session(['currentTeam' => $team_to_switch_to]);
         return redirect(request()->header('Referer'));
     }
-    public function render()
-    {
-        return view('livewire.switch-team');
-    }
 }
diff --git a/app/Jobs/DeployApplicationJob.php b/app/Jobs/DeployApplicationJob.php
index f9a6e1a07..ff06a92ea 100644
--- a/app/Jobs/DeployApplicationJob.php
+++ b/app/Jobs/DeployApplicationJob.php
@@ -124,7 +124,7 @@ class DeployApplicationJob implements ShouldQueue
                 $image = explode(':', str_replace('"', '', $image))[1];
                 if ($image == $this->git_commit) {
                     $this->executeNow([
-                        "echo 'Application found locally with the same Git Commit SHA. Starting it...'"
+                        "echo -n 'Application found locally with the same Git Commit SHA. Starting it... '"
                     ]);
                     $this->executeNow([
                         "docker start {$this->application->uuid}"
diff --git a/app/View/Components/Input.php b/app/View/Components/Input.php
index e907fd024..16897aef1 100644
--- a/app/View/Components/Input.php
+++ b/app/View/Components/Input.php
@@ -11,8 +11,12 @@ class Input extends Component
     /**
      * Create a new component instance.
      */
-    public function __construct(public string $name, public bool $required = false)
-    {
+    public function __construct(
+        public string $name,
+        public bool $required = false,
+        public bool $readonly = false,
+        public string|null $label = null,
+    ) {
         //
     }
 
diff --git a/resources/js/app.js b/resources/js/app.js
index e59d6a0ad..401533aec 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -1 +1,2 @@
 import './bootstrap';
+
diff --git a/resources/views/components/applications/layout.blade.php b/resources/views/components/applications/layout.blade.php
new file mode 100644
index 000000000..abc1bbd99
--- /dev/null
+++ b/resources/views/components/applications/layout.blade.php
@@ -0,0 +1,7 @@
+<x-layout>
+    <h1>{{ $title ?? 'NOT SET' }}</h1>
+    <x-applications.navbar :applicationId="$applicationId" />
+    <div>
+    {{ $slot }}
+    </div>
+</x-layout>
diff --git a/resources/views/components/applications/navbar.blade.php b/resources/views/components/applications/navbar.blade.php
new file mode 100644
index 000000000..84112940d
--- /dev/null
+++ b/resources/views/components/applications/navbar.blade.php
@@ -0,0 +1,5 @@
+<nav class="flex gap-4 py-2 bg-gray-100">
+    <a href="{{ route('project.applications.configuration', Route::current()->parameters()) }}">Configuration</a>
+    <a href="{{ route('project.applications.deployments', Route::current()->parameters()) }}">Deployments</a>
+    <livewire:deploy-application :applicationId="$applicationId" />
+</nav>
diff --git a/resources/views/components/input.blade.php b/resources/views/components/input.blade.php
index d1fcbf57c..5abd7953d 100644
--- a/resources/views/components/input.blade.php
+++ b/resources/views/components/input.blade.php
@@ -1,6 +1,16 @@
-<label for={{ $name }}>{{ $name }}</label>
-<input id={{ $name }} wire:model={{ $name }} type="text" name={{ $name }}
-    {{ $required }} />
+<label for={{ $name }}>
+    @if ($label)
+        {{ $label }}
+    @else
+        {{ $name }}
+    @endif
+    @if ($required)
+        *
+    @endif
+</label>
+<input id={{ $name }} wire:model.defer={{ $name }} type="text" name={{ $name }}
+    @if ($required) required @endif
+    @if ($readonly) readOnly=true disabled=true @endif />
 @error($name)
     <span class="text-red-500">{{ $message }}</span>
 @enderror
diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php
index 33431c531..60e6a41a3 100644
--- a/resources/views/components/layout.blade.php
+++ b/resources/views/components/layout.blade.php
@@ -7,6 +7,8 @@
     <title>{{ $title ?? 'Coolify' }}</title>
     <meta name="csrf-token" content="{{ csrf_token() }}">
     @vite(['resources/js/app.js', 'resources/css/app.css'])
+    <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js"></script>
+    <style>[x-cloak] { display: none !important; }</style>
     @livewireStyles
 </head>
 
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 3427f2adc..87d944886 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -1,4 +1,4 @@
-<nav>
+<nav class="flex gap-2 ">
     <div>v{{ config('coolify.version') }}</div>
     @guest
         <a href="/login">Login</a>
@@ -14,6 +14,6 @@
             @csrf
             <button type="submit">Logout</button>
         </form>
-        <livewire:check-update>
+        {{-- <livewire:check-update> --}}
     @endauth
 </nav>
diff --git a/resources/views/livewire/application-form.blade.php b/resources/views/livewire/application-form.blade.php
deleted file mode 100644
index c42b62454..000000000
--- a/resources/views/livewire/application-form.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<div>
-    <form wire:submit.prevent='submit' class="flex flex-col">
-        <x-input name="name" required="true" />
-        <x-input name="fqdn" />
-        <x-input name="git_repository" />
-        <x-input name="git_branch" />
-        <x-input name="git_commit_sha" />
-        <button type="submit">
-            Submit
-        </button>
-    </form>
-</div>
diff --git a/resources/views/livewire/application/destination.blade.php b/resources/views/livewire/application/destination.blade.php
new file mode 100644
index 000000000..6f48b8eec
--- /dev/null
+++ b/resources/views/livewire/application/destination.blade.php
@@ -0,0 +1,3 @@
+<div>
+    <p>{{$destination->name}}</p>
+</div>
diff --git a/resources/views/livewire/application/general.blade.php b/resources/views/livewire/application/general.blade.php
new file mode 100644
index 000000000..573a5ee4b
--- /dev/null
+++ b/resources/views/livewire/application/general.blade.php
@@ -0,0 +1,26 @@
+<div>
+    <form wire:submit.prevent='submit' class="flex flex-col">
+
+        <div class="flex flex-col xl:flex-row gap-2">
+            <div class="flex-col flex w-96">
+                <x-input name="application.name" label="Name" required />
+                <x-input name="application.fqdn" label="FQDN" />
+            </div>
+            <div class="flex-col flex w-96">
+                <x-input name="application.install_command" label="Install Command" />
+                <x-input name="application.build_command" label="Build Command" />
+                <x-input name="application.start_command" label="Start Command" />
+                <x-input name="application.build_pack" label="Build Pack" />
+            </div>
+            <div class="flex-col flex w-96">
+                <x-input name="application.base_directory" label="Base Directory" />
+                <x-input name="application.publish_directory" label="Publish Directory" />
+                <x-input name="application.destination.network" readonly label="Destination Network" />
+            </div>
+
+        </div>
+        <button class="flex mx-auto mt-4" type="submit">
+            Submit
+        </button>
+    </form>
+</div>
diff --git a/resources/views/livewire/application/secrets.blade.php b/resources/views/livewire/application/secrets.blade.php
new file mode 100644
index 000000000..fd5ed6b9b
--- /dev/null
+++ b/resources/views/livewire/application/secrets.blade.php
@@ -0,0 +1,3 @@
+<div>
+    {{-- Nothing in the world is as soft and yielding as water. --}}
+</div>
diff --git a/resources/views/livewire/application/source.blade.php b/resources/views/livewire/application/source.blade.php
new file mode 100644
index 000000000..5af721496
--- /dev/null
+++ b/resources/views/livewire/application/source.blade.php
@@ -0,0 +1,8 @@
+<div>
+    <p>{{ $application->source->name }}</p>
+    <div class="flex-col flex w-96">
+        <x-input name="application.git_repository" label="Git Repository" readonly />
+        <x-input name="application.git_branch" label="Git Branch" readonly />
+        <x-input name="application.git_commit_sha" label="Git Commit SHA" readonly />
+    </div>
+</div>
diff --git a/resources/views/livewire/deploy-application.blade.php b/resources/views/livewire/deploy-application.blade.php
index f10497bc1..99d8271f4 100644
--- a/resources/views/livewire/deploy-application.blade.php
+++ b/resources/views/livewire/deploy-application.blade.php
@@ -5,5 +5,11 @@
         <button wire:click='start'>Start</button>
     @endif
     <button wire:click='kill'>Kill</button>
-    <span wire:poll='pollingStatus'>status: {{ $application->status }}</span>
+    <span wire:poll='pollingStatus'>
+        @if ($application->status === 'running')
+            <span class="text-green-500">{{ $application->status }}</span>
+        @else
+            <span class="text-red-500">{{ $application->status }}</span>
+        @endif
+    </span>
 </div>
diff --git a/resources/views/livewire/poll-deployment.blade.php b/resources/views/livewire/poll-deployment.blade.php
new file mode 100644
index 000000000..89897e128
--- /dev/null
+++ b/resources/views/livewire/poll-deployment.blade.php
@@ -0,0 +1,6 @@
+<div>
+    <a @if ($status === 'in_progress' || $status === 'holding') wire:poll='polling' @endif href="{{ url()->current() }}/{{ $deployment_uuid }}">
+        {{ $created_at }}
+        {{ $deployment_uuid }}</a>
+    {{ $status }}
+</div>
diff --git a/resources/views/project/application.blade.php b/resources/views/project/application.blade.php
deleted file mode 100644
index 679ab14d9..000000000
--- a/resources/views/project/application.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<x-layout>
-    <h1>Application</h1>
-    <livewire:deploy-application :applicationId="$application->id" />
-    <livewire:application-form :applicationId="$application->id" />
-    <div>
-        <h2>Deployments</h2>
-        @foreach ($deployments as $deployment)
-            <p>
-                <a href="{{ url()->current() }}/deployment/{{ data_get($deployment->properties, 'deployment_uuid') }}">
-                    {{ data_get($deployment->properties, 'deployment_uuid') }}</a>
-                {{ data_get($deployment->properties, 'status') }}
-            </p>
-        @endforeach
-    </div>
-</x-layout>
diff --git a/resources/views/project/applications/configuration.blade.php b/resources/views/project/applications/configuration.blade.php
new file mode 100644
index 000000000..72c04977a
--- /dev/null
+++ b/resources/views/project/applications/configuration.blade.php
@@ -0,0 +1,23 @@
+<x-applications.layout :applicationId="$application->id" title="Configurations">
+    <div x-data="{ tab: window.location.hash ? window.location.hash.substring(1) : 'general' }">
+        <div class="flex gap-4">
+            <button @click.prevent="tab = 'general'; window.location.hash = 'general'" href="#">General</button>
+            <button @click.prevent="tab = 'secrets'; window.location.hash = 'secrets'" href="#">Secrets</button>
+            <button @click.prevent="tab = 'source'; window.location.hash = 'source'" href="#">Source</button>
+            <button @click.prevent="tab = 'destination'; window.location.hash = 'destination'" href="#">Destination
+            </button>
+        </div>
+        <div x-cloak x-show="tab === 'general'">
+            <livewire:application.general :applicationId="$application->id" />
+        </div>
+        <div x-cloak x-show="tab === 'secrets'">
+            <livewire:application.secrets :secrets="$application->id" />
+        </div>
+        <div x-cloak x-show="tab === 'source'">
+            <livewire:application.source :applicationId="$application->id" />
+        </div>
+        <div x-cloak x-show="tab === 'destination'">
+            <livewire:application.destination :destination="$application->destination->server" />
+        </div>
+    </div>
+</x-applications.layout>
diff --git a/resources/views/project/applications/deployment.blade.php b/resources/views/project/applications/deployment.blade.php
new file mode 100644
index 000000000..07c148b79
--- /dev/null
+++ b/resources/views/project/applications/deployment.blade.php
@@ -0,0 +1,3 @@
+<x-applications.layout :applicationId="$application->id" title="Deployment">
+    <livewire:poll-activity :activity="$activity" :deployment_uuid="$deployment_uuid" />
+</x-applications.layout>
diff --git a/resources/views/project/applications/deployments.blade.php b/resources/views/project/applications/deployments.blade.php
new file mode 100644
index 000000000..47b7cf34d
--- /dev/null
+++ b/resources/views/project/applications/deployments.blade.php
@@ -0,0 +1,10 @@
+<x-applications.layout :applicationId="$application->id" title="Deployments">
+    <div class="pt-2">
+        @forelse ($deployments as $deployment)
+            <livewire:poll-deployment :deployment_uuid="data_get($deployment->properties, 'deployment_uuid')" :created_at="data_get($deployment, 'created_at')" :status="data_get($deployment->properties, 'status')" />
+
+        @empty
+            <p>No deployments found.</p>
+        @endforelse
+    </div>
+</x-applications.layout>
diff --git a/resources/views/project/deployment.blade.php b/resources/views/project/deployment.blade.php
deleted file mode 100644
index 2f79fdafa..000000000
--- a/resources/views/project/deployment.blade.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<x-layout>
-    <h1>Deployment</h1>
-    <livewire:poll-activity :activity="$activity" :deployment_uuid="$deployment_uuid" />
-</x-layout>
diff --git a/resources/views/project/resources.blade.php b/resources/views/project/resources.blade.php
index cf451b2c5..f3249dfb0 100644
--- a/resources/views/project/resources.blade.php
+++ b/resources/views/project/resources.blade.php
@@ -3,7 +3,7 @@
     <div>
         @foreach ($environment->applications as $application)
             <p>
-                <a href="{{ route('project.application', [$project->uuid, $environment->name, $application->uuid]) }}">
+                <a href="{{ route('project.applications.configuration', [$project->uuid, $environment->name, $application->uuid]) }}">
                     {{ $application->name }}
                 </a>
             </p>
diff --git a/routes/web.php b/routes/web.php
index 6aa837d2d..e949df4af 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Http\Controllers\ApplicationController;
 use App\Http\Controllers\HomeController;
 use App\Http\Controllers\ProjectController;
 use Illuminate\Support\Facades\Route;
@@ -23,8 +24,10 @@ Route::middleware(['auth'])->group(function () {
 
     Route::get('/project/{project_uuid}/{environment_name}', [ProjectController::class, 'resources'])->name('project.resources');
 
-    Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}', [ProjectController::class, 'application'])->name('project.application');
-    Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}/deployment/{deployment_uuid}', [ProjectController::class, 'deployment'])->name('project.deployment');
+    Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}', [ApplicationController::class, 'configuration'])->name('project.applications.configuration');
+    Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}/deployment', [ApplicationController::class, 'deployments'])->name('project.applications.deployments');
+    Route::get('/project/{project_uuid}/{environment_name}/application/{application_uuid}/deployment/{deployment_uuid}', [ApplicationController::class, 'deployment'])->name('project.applications.deployment');
+
 
     // Route::get('/database/{database_uuid}', [ProjectController::class, 'database'])->name('project.database');
     // Route::get('//service/{service_uuid}', [ProjectController::class, 'service'])->name('project.service');