diff --git a/app/Filament/Pages/Dashboard.php b/app/Filament/Pages/Dashboard.php
index 87c741908..e6836c6c9 100644
--- a/app/Filament/Pages/Dashboard.php
+++ b/app/Filament/Pages/Dashboard.php
@@ -7,6 +7,9 @@ use App\Models\Egg;
 use App\Models\Node;
 use App\Models\Server;
 use App\Models\User;
+use Filament\Actions\CreateAction;
+use Filament\Infolists\Components\Concerns\HasHeaderActions;
+use Filament\Infolists\Infolist;
 use Filament\Pages\Page;
 
 class Dashboard extends Page
@@ -32,6 +35,50 @@ class Dashboard extends Page
             'nodesCount' => Node::query()->count(),
             'serversCount' => Server::query()->count(),
             'usersCount' => User::query()->count(),
+
+            'devActions' => [
+                CreateAction::make()
+                    ->label('Create Issue')
+                    ->icon('tabler-brand-github')
+                    ->url('https://github.com/pelican-dev/panel/issues/new/choose', true)
+                    ->color('warning'),
+                CreateAction::make()
+                    ->label('Discuss Features')
+                    ->icon('tabler-brand-github')
+                    ->url('https://github.com/pelican-dev/panel/discussions', true)
+                    ->color('primary'),
+            ],
+            'nodeActions' => [
+                CreateAction::make()
+                    ->label('Create first Node in Pelican')
+                    ->icon('tabler-server-2')
+                    ->url(route('filament.admin.resources.nodes.create'))
+                    ->color('primary'),
+            ],
+            'supportActions' => [
+                CreateAction::make()
+                    ->label('Help Translate')
+                    ->icon('tabler-language')
+                    ->url('https://crowdin.com/project/pelican-dev', true)
+                    ->color('info'),
+                CreateAction::make()
+                    ->label('Donate Directly')
+                    ->icon('tabler-cash')
+                    ->url('https://pelican.dev/donate', true)
+                    ->color('success'),
+            ],
+            'helpActions' => [
+                CreateAction::make()
+                    ->label('Read Documentation')
+                    ->icon('tabler-speedboat')
+                    ->url('https://pelican.dev/docs', true)
+                    ->color('info'),
+                CreateAction::make()
+                    ->label('Get Help in Discord')
+                    ->icon('tabler-brand-discord')
+                    ->url('https://discord.gg/pelican-panel', true)
+                    ->color('primary'),
+            ],
         ];
     }
 }
diff --git a/resources/views/filament/pages/dashboard.blade.php b/resources/views/filament/pages/dashboard.blade.php
index b6d8586fd..c927f20d0 100644
--- a/resources/views/filament/pages/dashboard.blade.php
+++ b/resources/views/filament/pages/dashboard.blade.php
@@ -50,58 +50,39 @@
     <p>You can expand the following sections:</p>
 
     @if ($inDevelopment)
-        <x-filament::section icon="tabler-code" icon-color="primary" id="intro-developers" collapsible persist-collapsed collapsed>
+        <x-filament::section
+            icon="tabler-code"
+            icon-color="primary"
+            id="intro-developers"
+            collapsible
+            persist-collapsed
+            collapsed
+           :header-actions="$devActions"
+        >
             <x-slot name="heading">Information for Developers</x-slot>
 
             <p>Thank you for trying out the development version!</p>
 
-            <p>
-                <br />
-                If you run into any issues, please report them on GitHub.
-                <br />
-                <br />
-            </p>
+            <p><br /></p>
 
-            <p>
-                <x-filament::button
-                    style="margin-top: 5px;"
-                    icon="tabler-brand-github"
-                    color="gray"
-                    tag="a"
-                    href="https://github.com/pelican-dev/panel/issues/new/choose"
-                >
-                    Report Issue on GitHub
-                </x-filament::button>
-            </p>
+            <p>If you run into any issues, please report them on GitHub.</p>
 
         </x-filament::section>
     @endif
 
     {{-- No Nodes Created --}}
     @if ($nodesCount <= 0)
-        <x-filament::section icon="tabler-server-2" icon-color="primary" id="intro-first-node" collapsible persist-collapsed>
-            <x-slot name="heading">Create First New Node</x-slot>
+        <x-filament::section
+            icon="tabler-server-2"
+            icon-color="primary"
+            id="intro-first-node"
+            collapsible
+            persist-collapsed
+            :header-actions="$nodeActions"
+        >
+            <x-slot name="heading">No Nodes Detected</x-slot>
 
-            <p>It looks like you don't have any Nodes set up yet, but don't worry because you can follow along below:</p>
-
-            <p>
-                <br />
-                If you run into any issues, please report them on GitHub.
-                <br />
-                <br />
-            </p>
-
-            <p>
-                <x-filament::button
-                    style="margin-top: 5px;"
-                    icon="tabler-server-2"
-                    color="primary"
-                    tag="a"
-                    :href="route('filament.admin.resources.nodes.create')"
-                >
-                    Create Node in Pelican
-                </x-filament::button>
-            </p>
+            <p>It looks like you don't have any Nodes set up yet, but don't worry because you click the action button to create your first one!</p>
 
         </x-filament::section>
     @endif
@@ -109,7 +90,14 @@
     {{-- No Nodes Active --}}
 
 
-    <x-filament::section icon="tabler-cash" icon-color="success" id="intro-support" collapsible persist-collapsed>
+    <x-filament::section
+        icon="tabler-heart-filled"
+        icon-color="danger"
+        id="intro-support"
+        collapsible
+        persist-collapsed
+        :header-actions="$supportActions"
+    >
         <x-slot name="heading">Support Pelican</x-slot>
 
         <p>Thank you for using Pelican, this could only be achieved through the support of you, our contributors, and the rest of our supporters!</p>
@@ -118,47 +106,22 @@
 
         <p>We appreciate any and all support from anybody.</p>
 
-        <p><br /></p>
-
-        <x-filament::button
-            style="margin-top: 5px;"
-            color="success"
-            icon="tabler-pig-money"
-            tag="a"
-            href="https://pelican.dev/donate"
-        >
-            Donate Directly
-        </x-filament::button>
-
     </x-filament::section>
 
 
 
-    <x-filament::section icon="tabler-question-mark" icon-color="info" id="intro-help" collapsible persist-collapsed>
+    <x-filament::section
+        icon="tabler-question-mark"
+        icon-color="info"
+        id="intro-help"
+        collapsible
+        persist-collapsed
+        :header-actions="$helpActions"
+    >
         <x-slot name="heading">Need Help?</x-slot>
 
         <p>Check out the documentation first! If you still need assistance then, fly onto our Discord server!</p>
 
-        <p><br /></p>
-
-        <x-filament::button
-            color="primary"
-            icon="tabler-speedboat"
-            tag="a"
-            href="https://pelican.dev/docs"
-        >
-            Read Documentation
-        </x-filament::button>
-
-        <x-filament::button
-            color="info"
-            icon="tabler-brand-discord"
-            tag="a"
-            href="https://discord.gg/pelican-panel"
-        >
-            Get Help in Discord
-        </x-filament::button>
-
     </x-filament::section>
 
     <div>