diff --git a/app/Http/Livewire/Dashboard.php b/app/Http/Livewire/Dashboard.php
index 7c0505d8a..d411312d5 100644
--- a/app/Http/Livewire/Dashboard.php
+++ b/app/Http/Livewire/Dashboard.php
@@ -9,21 +9,21 @@ use Livewire\Component;
 
 class Dashboard extends Component
 {
-    public int $projects = 0;
-    public int $servers = 0;
+    public $projects = [];
+    public $servers = [];
     public int $s3s = 0;
     public int $resources = 0;
 
     public function mount()
     {
-        $this->servers = Server::ownedByCurrentTeam()->get()->count();
+        $this->servers = Server::ownedByCurrentTeam()->get();
         $this->s3s = S3Storage::ownedByCurrentTeam()->get()->count();
         $projects = Project::ownedByCurrentTeam()->get();
         foreach ($projects as $project) {
             $this->resources += $project->applications->count();
             $this->resources += $project->postgresqls->count();
         }
-        $this->projects = $projects->count();
+        $this->projects = $projects;
     }
     // public function getIptables()
     // {
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index c61f48d65..d5b18aa0f 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -3,7 +3,7 @@
         <span x-data x-init="$wire.emit('error', '{{ session('error') }}')" />
     @endif
     <h1>Dashboard</h1>
-    <div class="subtitle">Something <x-highlighted text="(more)" /> useful will be here.</div>
+    <div class="subtitle">Your self-hosted environment</div>
     @if (request()->query->get('success'))
         <div class="rounded alert alert-success">
             <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
@@ -17,12 +17,12 @@
     <div class="w-full rounded stats stats-vertical lg:stats-horizontal">
         <div class="stat">
             <div class="stat-title">Servers</div>
-            <div class="stat-value">{{ $servers }}</div>
+            <div class="stat-value">{{ $servers->count() }} </div>
         </div>
 
         <div class="stat">
             <div class="stat-title">Projects</div>
-            <div class="stat-value">{{ $projects }}</div>
+            <div class="stat-value">{{ $projects->count() }}</div>
         </div>
 
         <div class="stat">
@@ -35,6 +35,69 @@
             <div class="stat-value">{{ $s3s }}</div>
         </div>
     </div>
-    
-    {{-- <x-forms.button wire:click='getIptables'>Get IPTABLES</x-forms.button> --}}
+    <h3 class="pb-4">Projects</h3>
+    @if ($projects->count() === 1)
+        <div class="grid grid-cols-1 gap-2">
+        @else
+            <div class="grid grid-cols-3 gap-2">
+    @endif
+    @foreach ($projects as $project)
+        <div class="gap-2 border border-transparent cursor-pointer box group" x-data
+            x-on:click="goto('{{ $project->uuid }}')">
+            <a class="flex flex-col flex-1 mx-6 hover:no-underline"
+                href="{{ route('project.resources', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
+                <div class="font-bold text-white">{{ $project->name }}</div>
+                <div class="text-xs group-hover:text-white hover:no-underline">
+                    {{ $project->description }}</div>
+            </a>
+            <a class="mx-4 rounded group-hover:text-white"
+                href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
+                <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning" viewBox="0 0 24 24"
+                    stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                    stroke-linejoin="round">
+                    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                    <path
+                        d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z" />
+                    <path d="M9 12a3 3 0 1 0 6 0a3 3 0 0 0 -6 0" />
+                </svg>
+            </a>
+        </div>
+    @endforeach
+</div>
+<h3 class="py-4">Servers</h3>
+@if ($servers->count() === 1)
+<div class="grid grid-cols-1 gap-2">
+@else
+    <div class="grid grid-cols-3 gap-2">
+@endif
+    @foreach ($servers as $server)
+        <a href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
+            @class([
+                'gap-2 border cursor-pointer box group',
+                'border-transparent' => $server->settings->is_reachable,
+                'border-red-500' => !$server->settings->is_reachable,
+            ])>
+            <div class="flex flex-col mx-6">
+                <div class="font-bold text-white">
+                    {{ $server->name }}
+                </div>
+                <div class="text-xs group-hover:text-white">
+                    {{ $server->description }}</div>
+                <div class="flex gap-1 text-xs text-error">
+                    @if (!$server->settings->is_reachable)
+                        <span>Not reachable</span>
+                    @endif
+                    @if (!$server->settings->is_reachable && !$server->settings->is_usable)
+                        &
+                    @endif
+                    @if (!$server->settings->is_usable)
+                        <span>Not usable by Coolify</span>
+                    @endif
+                </div>
+            </div>
+            <div class="flex-1"></div>
+        </a>
+    @endforeach
+</div>
+{{-- <x-forms.button wire:click='getIptables'>Get IPTABLES</x-forms.button> --}}
 </div>
diff --git a/resources/views/livewire/server/all.blade.php b/resources/views/livewire/server/all.blade.php
index 8ad9c82a3..8195eb2af 100644
--- a/resources/views/livewire/server/all.blade.php
+++ b/resources/views/livewire/server/all.blade.php
@@ -15,7 +15,7 @@
                     'border-red-500' => !$server->settings->is_reachable,
                 ])>
                 <div class="flex flex-col mx-6">
-                    <div class=" group-hover:text-white">
+                    <div class="font-bold text-white">
                         {{ $server->name }}
                     </div>
                     <div class="text-xs group-hover:text-white">
diff --git a/resources/views/project/resources.blade.php b/resources/views/project/resources.blade.php
index 213fa04cd..09faf85f4 100644
--- a/resources/views/project/resources.blade.php
+++ b/resources/views/project/resources.blade.php
@@ -2,11 +2,12 @@
     <div class="flex flex-col">
         <div class="flex items-center gap-2">
             <h1>Resources</h1>
-            <a href="{{ route('project.resources.new', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
-                class="font-normal text-white normal-case border-none rounded hover:no-underline btn btn-primary btn-sm no-animation">+
-                Add</a>
             @if ($environment->can_delete_environment())
                 <livewire:project.delete-environment :environment_id="$environment->id" />
+            @else
+                <a href="{{ route('project.resources.new', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
+                    class="font-normal text-white normal-case border-none rounded hover:no-underline btn btn-primary btn-sm no-animation">+
+                    New</a>
             @endif
         </div>
         <nav class="flex pt-2 pb-10">
@@ -32,7 +33,8 @@
         </nav>
     </div>
     @if ($environment->can_delete_environment())
-        <p>No resources found.</p>
+        <a href="{{ route('project.resources.new', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
+            class="items-center justify-center box">+ Add New Resource</a>
     @endif
     <div class="grid gap-2 lg:grid-cols-2">
         @foreach ($environment->applications->sortBy('name') as $application)
@@ -54,13 +56,13 @@
             </a>
         @endforeach
         @foreach ($environment->services->sortBy('name') as $service)
-        <a class="box group"
-            href="{{ route('project.service', [$project->uuid, $environment->name, $service->uuid]) }}">
-            <div class="flex flex-col mx-6">
-                <div class=" group-hover:text-white">{{ $service->name }}</div>
-                <div class="text-xs text-gray-400 group-hover:text-white">{{ $service->description }}</div>
-            </div>
-        </a>
-    @endforeach
+            <a class="box group"
+                href="{{ route('project.service', [$project->uuid, $environment->name, $service->uuid]) }}">
+                <div class="flex flex-col mx-6">
+                    <div class=" group-hover:text-white">{{ $service->name }}</div>
+                    <div class="text-xs text-gray-400 group-hover:text-white">{{ $service->description }}</div>
+                </div>
+            </a>
+        @endforeach
     </div>
 </x-layout>
diff --git a/resources/views/projects.blade.php b/resources/views/projects.blade.php
index a76607b9d..6de72d451 100644
--- a/resources/views/projects.blade.php
+++ b/resources/views/projects.blade.php
@@ -17,17 +17,17 @@
             @forelse ($projects as $project)
                 <div class="gap-2 border border-transparent cursor-pointer box group" x-data
                     x-on:click="goto('{{ $project->uuid }}')">
-                    <div class="flex flex-col flex-1 mx-6">
-                        <a class=" group-hover:text-white hover:no-underline"
-                            href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">{{ $project->name }}</a>
-                        <div class="text-xs group-hover:text-white hover:no-underline"
-                            href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
+                    <a class="flex flex-col flex-1 mx-6 hover:no-underline"
+                        href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
+                        <div class="font-bold text-white">{{ $project->name }}</div>
+                        <div class="text-xs group-hover:text-white hover:no-underline">
                             {{ $project->description }}</div>
-                    </div>
+                    </a>
                     <a class="mx-4 rounded group-hover:text-white"
                         href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
-                        <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning" viewBox="0 0 24 24" stroke-width="1.5"
-                            stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                            stroke-linejoin="round">
                             <path stroke="none" d="M0 0h24v24H0z" fill="none" />
                             <path
                                 d="M10.325 4.317c.426 -1.756 2.924 -1.756 3.35 0a1.724 1.724 0 0 0 2.573 1.066c1.543 -.94 3.31 .826 2.37 2.37a1.724 1.724 0 0 0 1.065 2.572c1.756 .426 1.756 2.924 0 3.35a1.724 1.724 0 0 0 -1.066 2.573c.94 1.543 -.826 3.31 -2.37 2.37a1.724 1.724 0 0 0 -2.572 1.065c-.426 1.756 -2.924 1.756 -3.35 0a1.724 1.724 0 0 0 -2.573 -1.066c-1.543 .94 -3.31 -.826 -2.37 -2.37a1.724 1.724 0 0 0 -1.065 -2.572c-1.756 -.426 -1.756 -2.924 0 -3.35a1.724 1.724 0 0 0 1.066 -2.573c-.94 -1.543 .826 -3.31 2.37 -2.37c1 .608 2.296 .07 2.572 -1.065z" />