diff --git a/app/Core/Providers/RouteServiceProvider.php b/app/Core/Providers/RouteServiceProvider.php
index a47ea9d3b..7aa91238d 100644
--- a/app/Core/Providers/RouteServiceProvider.php
+++ b/app/Core/Providers/RouteServiceProvider.php
@@ -86,7 +86,7 @@ public function boot(): void
                     return $frontController->executeAction($controllerParts['class'], $controllerParts['method']);
                 });
 
-                Route::any('{moduleName}', function (IncomingRequest $request, $moduleName, $actionName) use ($frontController)  {
+                Route::any('{moduleName}', function (IncomingRequest $request, $moduleName) use ($frontController)  {
                     $httpMethod = Str::lower($request->getMethod());
                     $controllerParts = $frontController->getValidControllerCall($moduleName, "index", $httpMethod, "Controllers");
                     return $frontController->executeAction($controllerParts['class'], $controllerParts['method']);
diff --git a/app/Domain/Auth/Templates/includes/loginInfo.blade.php b/app/Domain/Auth/Templates/includes/loginInfo.blade.php
index b434bd44f..e56c3d695 100644
--- a/app/Domain/Auth/Templates/includes/loginInfo.blade.php
+++ b/app/Domain/Auth/Templates/includes/loginInfo.blade.php
@@ -1,66 +1,73 @@
 @dispatchEvent('beforeUserinfoMenuOpen')
-
 <div class="userinfo">
     @dispatchEvent('afterUserinfoMenuOpen')
-    @if(session()->exists("companysettings.logoPath") && session("companysettings.logoPath") !== false)
-        <a href='{{ BASE_URL }}/users/editOwn/' class="dropdown-toggle profileHandler includeLogo" data-toggle="dropdown">
-            <img src="{{ BASE_URL }}/api/users?profileImage={{ $user['id'] ?? -1 }}&v={{ format($user['modified'] ?? -1)->timestamp() }}" class="profilePicture"/>
-            <img src="{{ session("companysettings.logoPath") }}" class="logo"/>
-            <i class="fa fa-caret-down" aria-hidden="true"></i>
-        </a>
-    @else
-        <a href='{{ BASE_URL }}/users/editOwn/' class="dropdown-toggle profileHandler" data-toggle="dropdown">
-            <img src="{{ BASE_URL }}/api/users?profileImage={{ $user['id'] ?? -1 }}&v={{ format($user['modified'] ?? -1)->timestamp() }}" class="profilePicture"/>
-            <i class="fa fa-caret-down" aria-hidden="true"></i>
-        </a>
-    @endif
-    <ul class="dropdown-menu">
-        @dispatchEvent('afterUserinfoDropdownMenuOpen')
-        <li>
-            <a href='{{ BASE_URL }}/users/editOwn/'>
-                {!! __("menu.my_profile") !!}
-            </a>
-        </li>
-        <li>
-            <a href='{{ BASE_URL }}/users/editOwn#theme'>
-                {!! __("menu.theme") !!}
-            </a>
-        </li>
-        <li>
-            <a href='{{ BASE_URL }}/users/editOwn#settings'>
-                {!! __("menu.settings") !!}
-            </a>
-        </li>
 
-        <li class="nav-header border">{!! __("menu.help_support") !!}</li>
-        <li>
-            <a href='javascript:void(0);'
-               onclick="leantime.helperController.showHelperModal('{{ $modal }}', 300, 500);">
-                {!! __("menu.what_is_this_page") !!}
-            </a>
-        </li>
-        <li>
-            <a href='https://leantime.io/knowledge-base' target="_blank">
-                {!! __("menu.knowledge_base") !!}
-            </a>
-        </li>
-        <li>
-            <a href='https://discord.gg/4zMzJtAq9z' target="_blank">
-                {!! __("menu.community") !!}
-            </a>
-        </li>
-        <li>
-            <a href='https://leantime.io/contact-us' target="_blank">
-                {!! __("menu.contact_us") !!}
-            </a>
-        </li>
-        <li class="border">
-            <a href='{{ BASE_URL }}/auth/logout'>
-                {!! __("menu.sign_out") !!}
-            </a>
-        </li>
-        @dispatchEvent('beforeUserinfoDropdownMenuClose')
-    </ul>
-   @dispatchEvent('beforeUserinfoMenuClose')
+    <x-global::actions.dropdown contentRole='ghost' position="left">
+        <x-slot:labelText>
+            @if(session()->exists("companysettings.logoPath") && session("companysettings.logoPath") !== false)
+                <a href="{{ BASE_URL }}/users/editOwn/" class="profileHandler includeLogo">
+                    <img src="{{ BASE_URL }}/api/users?profileImage={{ $user['id'] ?? -1 }}&v={{ format($user['modified'] ?? -1)->timestamp() }}" class="profilePicture"/>
+                    <img src="{{ session("companysettings.logoPath") }}" class="logo"/>
+                    <i class="fa fa-caret-down" aria-hidden="true"></i>
+                </a>
+            @else
+                <a href="{{ BASE_URL }}/users/editOwn/" class="profileHandler">
+                    <img src="{{ BASE_URL }}/api/users?profileImage={{ $user['id'] ?? -1 }}&v={{ format($user['modified'] ?? -1)->timestamp() }}" class="profilePicture"/>
+                    <i class="fa fa-caret-down" aria-hidden="true"></i>
+                </a>
+            @endif
+        </x-slot:labeltext>
+
+        <x-slot:menu>
+            <x-global::actions.dropdown.item>
+                <a href='{{ BASE_URL }}/users/editOwn/'>
+                    {!! __("menu.my_profile") !!}
+                </a>
+            </x-global::actions.dropdown.item>
+            <x-global::actions.dropdown.item>
+                <a href='{{ BASE_URL }}/users/editOwn#theme'>
+                    {!! __("menu.theme") !!}
+                </a>
+            </x-global::actions.dropdown.item>
+            <x-global::actions.dropdown.item>
+                <a href='{{ BASE_URL }}/users/editOwn#settings'>
+                    {!! __("menu.settings") !!}
+                </a>
+            </x-global::actions.dropdown.item>
+
+            <x-global::actions.dropdown.item class="nav-header border">
+                {!! __("menu.help_support") !!}
+            </x-global::actions.dropdown.item>
+            <x-global::actions.dropdown.item>
+                <a href='javascript:void(0);' onclick="leantime.helperController.showHelperModal('{{ $modal }}', 300, 500);">
+                    {!! __("menu.what_is_this_page") !!}
+                </a>
+            </x-global::actions.dropdown.item>
+            <x-global::actions.dropdown.item>
+                <a href='https://leantime.io/knowledge-base' target="_blank">
+                    {!! __("menu.knowledge_base") !!}
+                </a>
+            </x-global::actions.dropdown.item>
+            <x-global::actions.dropdown.item>
+                <a href='https://discord.gg/4zMzJtAq9z' target="_blank">
+                    {!! __("menu.community") !!}
+                </a>
+            </x-global::actions.dropdown.item>
+            <x-global::actions.dropdown.item>
+                <a href='https://leantime.io/contact-us' target="_blank">
+                    {!! __("menu.contact_us") !!}
+                </a>
+            </x-global::actions.dropdown.item>
+            <x-global::actions.dropdown.item class="border">
+                <a href='{{ BASE_URL }}/auth/logout'>
+                    {!! __("menu.sign_out") !!}
+                </a>
+            </x-global::actions.dropdown.item>
+        </x-slot:menu>
+        
+    </x-global::actions.dropdown>
+
+    @dispatchEvent('beforeUserinfoMenuClose')
 </div>
+
 @dispatchEvent('afterUserinfoMenuClose')
diff --git a/app/Domain/Install/Templates/new.blade.php b/app/Domain/Install/Templates/new.blade.php
index 9391c0f06..890304f32 100644
--- a/app/Domain/Install/Templates/new.blade.php
+++ b/app/Domain/Install/Templates/new.blade.php
@@ -14,20 +14,71 @@
     <?php echo $tpl->displayInlineNotification(); ?>
 
     <form action="{{ BASE_URL }}/install" method="post" class="registrationForm">
-        <h3 class="subtitle"><?=$tpl->language->__("subtitles.login_info");?></h3>
-        <input type="email" name="email" class="form-control" placeholder="<?=$tpl->language->__("label.email");?>" value=""/><br />
-        <input type="password" name="password" class="form-control" placeholder="<?=$tpl->language->__("label.password");?>" />
-        <br /><br />
-        <h3 class="subtitle"><?=$tpl->language->__("subtitles.user_info");?></h3>
-        <x-global::forms.text-input 
-        type="text" 
-        id="projectName" 
-        name="projectname" 
-        value="" 
-        placeholder="" 
-        variant="title" 
-        class="w-full" 
-    />
+        @csrf <!-- Include CSRF token for security -->
+    
+        <h3 class="subtitle">{{ __('subtitles.login_info') }}</h3>
+    
+        <x-global::forms.text-input
+            type="email"
+            name="email"
+            class="form-control"
+            :value="old('email')"
+            caption="{{ __('label.email') }}"
+            placeholder="{{ __('label.email') }}"
+        /><br />
+    
+        <x-global::forms.text-input
+            type="password"
+            name="password"
+            class="form-control"
+            caption="{{ __('label.password') }}"
+            placeholder="{{ __('label.password') }}"
+        /><br /><br />
+    
+        <h3 class="subtitle">{{ __('subtitles.user_info') }}</h3>
+    
+        <x-global::forms.text-input
+            type="text"
+            name="firstname"
+            class="form-control"
+            :value="old('firstname')"
+            caption="{{ __('label.firstname') }}"
+            placeholder="{{ __('label.firstname') }}"
+        /><br />
+    
+        <x-global::forms.text-input
+            type="text"
+            name="lastname"
+            class="form-control"
+            :value="old('lastname')"
+            caption="{{ __('label.lastname') }}"
+            placeholder="{{ __('label.lastname') }}"
+        /><br />
+    
+        <x-global::forms.text-input
+            type="text"
+            name="company"
+            class="form-control"
+            :value="old('company')"
+            caption="{{ __('label.company_name') }}"
+            placeholder="{{ __('label.company_name') }}"
+        /><br /><br />
+    
+        <input type="hidden" name="install" value="Install" />
+    
+        <p>
+            <x-global::forms.button
+                type="submit"
+                name="installAction"
+                class="btn btn-primary"
+                :value="__('buttons.install')"
+                onClick="this.form.submit(); this.disabled=true; this.value='{{ __('buttons.install') }}';"
+            >
+                {{ __('buttons.install') }}
+            </x-global::forms.button>
+        </p>
+    </form>
+    
     <br />
             <br /><br />
         <input type="hidden" name="install" value="Install" />
diff --git a/app/Domain/Users/Templates/editOwn.blade.php b/app/Domain/Users/Templates/editOwn.blade.php
index afbd7beca..10b07430c 100644
--- a/app/Domain/Users/Templates/editOwn.blade.php
+++ b/app/Domain/Users/Templates/editOwn.blade.php
@@ -31,57 +31,52 @@
                         
                             <div class="row-fluid">
                                 <div class="form-group">
-                                    <x-global::forms.text-input 
-                                        type="text" 
-                                        name="firstname" 
-                                        id="firstname" 
-                                        value="{{ $values['firstname'] }}" 
-                                        labelText="{{ __('label.firstname') }}"
+                                    <x-global::forms.text-input
+                                        name="firstname"
+                                        id="firstname"
                                         class="input"
-                                        {{ session('userdata.isLdap') ? 'disabled' : '' }} 
+                                        :value="$values['firstname']"
+                                        caption="{{ __('label.firstname') }}"
+                                        :disabled="session('userdata.isLdap')"
                                     />
-                                    <br/>
                                 </div>
-                        
+                            
                                 <div class="form-group">
-                                    <x-global::forms.text-input 
-                                        type="text" 
-                                        name="lastname" 
-                                        id="lastname" 
-                                        value="{{ $values['lastname'] }}" 
-                                        labelText="{{ __('label.lastname') }}"
+                                    <x-global::forms.text-input
+                                        name="lastname"
+                                        id="lastname"
                                         class="input"
-                                        {{ session('userdata.isLdap') ? 'disabled' : '' }} 
+                                        :value="$values['lastname']"
+                                        caption="{{ __('label.lastname') }}"
+                                        :disabled="session('userdata.isLdap')"
                                     />
-                                    <br/>
                                 </div>
-                        
+                            
                                 <div class="form-group">
-                                    <x-global::forms.text-input 
-                                        type="text" 
-                                        name="user" 
-                                        id="user" 
-                                        value="{{ $values['user'] }}" 
-                                        labelText="{{ __('label.email') }}"
+                                    <x-global::forms.text-input
+                                        name="user"
+                                        id="user"
                                         class="input"
-                                        {{ session('userdata.isLdap') ? 'disabled' : '' }} 
+                                        :value="$values['user']"
+                                        caption="{{ __('label.email') }}"
+                                        :disabled="session('userdata.isLdap')"
                                     />
-                                    <br/>
                                 </div>
-                        
+                            
                                 <div class="form-group">
-                                    <x-global::forms.text-input 
-                                        type="text" 
-                                        name="phone" 
-                                        id="phone" 
-                                        value="{{ $values['phone'] }}" 
-                                        labelText="{{ __('label.phone') }}"
+                                    <x-global::forms.text-input
+                                        name="phone"
+                                        id="phone"
                                         class="input"
-                                        {{ session('userdata.isLdap') ? 'disabled' : '' }} 
+                                        :value="$values['phone']"
+                                        caption="{{ __('label.phone') }}"
+                                        :disabled="session('userdata.isLdap')"
                                     />
-                                    <br/>
                                 </div>
                             </div>
+                            
+                            
+                            
                         
                             <p class="stdformbutton">
                                 <input type="hidden" name="profileInfo" value="1" />