diff --git a/resources/views/components/emails/footer.blade.php b/resources/views/components/emails/footer.blade.php
index d275015de..8b3cad06c 100644
--- a/resources/views/components/emails/footer.blade.php
+++ b/resources/views/components/emails/footer.blade.php
@@ -1,6 +1,6 @@
 {{ Illuminate\Mail\Markdown::parse('---') }}
 
 Thank you,<br>
-{{ config('app.name') ?? 'Last Hour Cloud' }}
+Last Hour Cloud
 
 {{ Illuminate\Mail\Markdown::parse('[Contact Support](https://lasthourhosting.org/contact.html)') }}
\ No newline at end of file
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index 1863f9ceb..3d9246cf8 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -496,16 +496,22 @@ class="flex h-6 w-6 shrink-0 items-center justify-center rounded-lg border text-
         <li title="Get Involved">
             <a class="justify-center hover:text-white hover:bg-transparent" href="https://shilohcode.com/get-involved" target="_blank">
                 <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 16 16">
-                    <path d="M13.5 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3M11 2.5a2.5 2.5 0 1 1 .603 1.628l-6.718 3.12a2.5 2.5 0 0 1 0 1.504l6.718 3.12a2.5 2.5 0 1 1-.488.876l-6.718-3.12a2.5 2.5 0 1 1 0-3.256l6.718-3.12A2.5 2.5 0 0 1 11 2.5m-8.5 4a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3m11 5.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3" />
+                    <path fill="currentColor" d="M13.5 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3M11 2.5a2.5 2.5 0 1 1 .603 1.628l-6.718 3.12a2.5 2.5 0 0 1 0 1.504l6.718 3.12a2.5 2.5 0 1 1-.488.876l-6.718-3.12a2.5 2.5 0 1 1 0-3.256l6.718-3.12A2.5 2.5 0 0 1 11 2.5m-8.5 4a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3m11 5.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3" />
                 </svg>
             </a>
         </li>
         <li title="Get help!">
             <a href="https://lasthourhosting.org/contact.html" target="_blank">
+<<<<<<< HEAD
                 <div class="justify-center hover:text-white hover:bg-transparent">
                     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
                         <path d="M16 8c0 3.866-3.582 7-8 7a9 9 0 0 1-2.347-.306c-.584.296-1.925.864-4.181 1.234-.2.032-.352-.176-.273-.362.354-.836.674-1.95.77-2.966C.744 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7M5 8a1 1 0 1 0-2 0 1 1 0 0 0 2 0m4 0a1 1 0 1 0-2 0 1 1 0 0 0 2 0m3 1a1 1 0 1 0 0-2 1 1 0 0 0 0 2" />
 >>>>>>> 04e370917 (main: fix for various bugs)
+=======
+                <div class="justify-center items-center hover:text-white hover:bg-transparent">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+                        <path fill="currentColor" d="M16 8c0 3.866-3.582 7-8 7a9 9 0 0 1-2.347-.306c-.584.296-1.925.864-4.181 1.234-.2.032-.352-.176-.273-.362.354-.836.674-1.95.77-2.966C.744 11.37 0 9.76 0 8c0-3.866 3.582-7 8-7s8 3.134 8 7M5 8a1 1 0 1 0-2 0 1 1 0 0 0 2 0m4 0a1 1 0 1 0-2 0 1 1 0 0 0 2 0m3 1a1 1 0 1 0 0-2 1 1 0 0 0 0 2" />
+>>>>>>> c870cd8ce (fix: UI and copy issues)
                     </svg>
                 </div>
             </a>
diff --git a/resources/views/livewire/settings/email.blade.php b/resources/views/livewire/settings/email.blade.php
index 106dd77d4..c42377262 100644
--- a/resources/views/livewire/settings/email.blade.php
+++ b/resources/views/livewire/settings/email.blade.php
@@ -5,8 +5,7 @@
     <div class="pb-4 ">Email settings for password resets, invitations, etc.</div>
     <form wire:submit='submitFromFields' class="flex flex-col gap-2 pb-4">
         <x-forms.input required id="settings.smtp_from_name" helper="Name used in emails." label="From Name" />
-        <x-forms.input required id="settings.smtp_from_address" helper="Email address used in emails."
-            label="From Address" />
+        <x-forms.input required id="settings.smtp_from_address" helper="Email address used in emails." label="From Address" />
         <x-forms.button type="submit">
             Save
         </x-forms.button>
@@ -27,14 +26,12 @@
                     <div class="flex flex-col w-full gap-2 xl:flex-row">
                         <x-forms.input required id="settings.smtp_host" placeholder="smtp.mailgun.org" label="Host" />
                         <x-forms.input required id="settings.smtp_port" placeholder="587" label="Port" />
-                        <x-forms.input id="settings.smtp_encryption" helper="If SMTP uses SSL, set it to 'tls'."
-                            placeholder="tls" label="Encryption" />
+                        <x-forms.input id="settings.smtp_encryption" helper="If SMTP uses SSL, set it to 'tls'." placeholder="tls" label="Encryption" />
                     </div>
                     <div class="flex flex-col w-full gap-2 xl:flex-row">
                         <x-forms.input id="settings.smtp_username" label="SMTP Username" />
                         <x-forms.input id="settings.smtp_password" type="password" label="SMTP Password" />
-                        <x-forms.input id="settings.smtp_timeout" helper="Timeout value for sending emails."
-                            label="Timeout" />
+                        <x-forms.input id="settings.smtp_timeout" helper="Timeout value for sending emails." label="Timeout" />
                     </div>
                 </div>
             </form>
@@ -52,11 +49,10 @@
                 </div>
                 <div class="flex flex-col gap-4">
                     <div class="flex flex-col w-full gap-2 xl:flex-row">
-                        <x-forms.input type="password" id="settings.resend_api_key" placeholder="API key" required
-                            label="Host" />
+                        <x-forms.input type="password" id="settings.resend_api_key" placeholder="API key" required label="Host" />
                     </div>
                 </div>
             </form>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file