diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php
index 382ca6e..463b620 100644
--- a/resources/views/projects/edit.blade.php
+++ b/resources/views/projects/edit.blade.php
@@ -1,57 +1,79 @@
 <x-app-layout>
     <div class="max-w-2xl mx-auto p-4">
         <h1 class="text-2xl font-bold mb-4">{{ __('Edit Project') }}: {{ $project->name }}</h1>
-        <form action="{{ route('projects.update', $project) }}" method="POST" class="space-y-4">
-            @csrf
-            @method('PUT')
-            <div>
-                <label class="label">{{ __('Name') }}</label>
-                <input type="text" name="name" value="{{ old('name', $project->name) }}" class="input input-bordered w-full" required>
-            </div>
-            <div>
-                <label class="label">{{ __('Address') }}</label>
-                <input type="text" name="address" value="{{ old('address', $project->address) }}" class="input input-bordered w-full" required>
-            </div>
-            <div class="grid grid-cols-2 gap-4">
-                <div>
-                    <label class="label">{{ __('Latitude') }}</label>
-                    <input type="number" step="any" name="lat" value="{{ old('lat', $project->lat) }}" class="input input-bordered w-full" required>
+        
+        <div class="tabs tab-box w-full">
+            <ul role="tablist" class="menu menu-horizontal p-0 mb-4 border-b border-base-200">
+                <li role="tab">
+                    <a href="#project-data" aria-controls="project-data" aria-selected="true" class="tab tab-active">{{ __('Project Data') }}</a>
+                </li>
+                <li role="tab">
+                    <a href="#phases" aria-controls="phases" aria-selected="false" class="tab">{{ __('Phases') }}</a>
+                </li>
+                <li role="tab">
+                    <a href="#users" aria-controls="users" aria-selected="false" class="tab">{{ __('Users') }}</a>
+                </li>
+            </ul>
+            
+            <div class="tab-content space-y-4">
+                <!-- Project Data Tab -->
+                <div role="tabpanel" id="project-data" class="tab-pane">
+                    <form action="{{ route('projects.update', $project) }}" method="POST" class="space-y-4">
+                        @csrf
+                        @method('PUT')
+                        <div>
+                            <label class="label">{{ __('Name') }}</label>
+                            <input type="text" name="name" value="{{ old('name', $project->name) }}" class="input input-bordered w-full" required>
+                        </div>
+                        <div>
+                            <label class="label">{{ __('Address') }}</label>
+                            <input type="text" name="address" value="{{ old('address', $project->address) }}" class="input input-bordered w-full" required>
+                        </div>
+                        <div class="grid grid-cols-2 gap-4">
+                            <div>
+                                <label class="label">{{ __('Latitude') }}</label>
+                                <input type="number" step="any" name="lat" value="{{ old('lat', $project->lat) }}" class="input input-bordered w-full" required>
+                            </div>
+                            <div>
+                                <label class="label">{{ __('Longitude') }}</label>
+                                <input type="number" step="any" name="lng" value="{{ old('lng', $project->lng) }}" class="input input-bordered w-full" required>
+                            </div>
+                        </div>
+                        <div>
+                            <label class="label">{{ __('Status') }}</label>
+                            <select name="status" class="select select-bordered w-full">
+                                <option value="planning" @selected($project->status == 'planning')>{{ __('Planning') }}</option>
+                                <option value="in_progress" @selected($project->status == 'in_progress')>{{ __('In progress') }}</option>
+                                <option value="paused" @selected($project->status == 'paused')>{{ __('Paused') }}</option>
+                                <option value="completed" @selected($project->status == 'completed')>{{ __('Completed') }}</option>
+                            </select>
+                        </div>
+                        <div class="grid grid-cols-2 gap-4">
+                            <div>
+                                <label class="label">{{ __('Start date') }}</label>
+                                <input type="date" name="start_date" value="{{ old('start_date', $project->start_date->format('Y-m-d')) }}" class="input input-bordered w-full" required>
+                            </div>
+                            <div>
+                                <label class="label">{{ __('Estimated end date') }}</label>
+                                <input type="date" name="end_date_estimated" value="{{ old('end_date_estimated', $project->end_date_estimated?->format('Y-m-d')) }}" class="input input-bordered w-full">
+                            </div>
+                        </div>
+                        <button type="submit" class="btn btn-primary w-full">{{ __('Update') }}</button>
+                    </form>
                 </div>
-                <div>
-                    <label class="label">{{ __('Longitude') }}</label>
-                    <input type="number" step="any" name="lng" value="{{ old('lng', $project->lng) }}" class="input input-bordered w-full" required>
+                
+                <!-- Phases Tab -->
+                <div role="tabpanel" id="phases" class="tab-pane">
+                    <h2 class="text-xl font-bold mb-2">{{ __('Phases') }}</h2>
+                    <livewire:phase-list :project="$project" />
+                </div>
+                
+                <!-- Users Tab -->
+                <div role="tabpanel" id="users" class="tab-pane">
+                    <h2 class="text-xl font-bold mb-2">{{ __('Users') }}</h2>
+                    <livewire:project-users :project="$project" />
                 </div>
             </div>
-            <div>
-                <label class="label">{{ __('Status') }}</label>
-                <select name="status" class="select select-bordered w-full">
-                    <option value="planning" @selected($project->status == 'planning')>{{ __('Planning') }}</option>
-                    <option value="in_progress" @selected($project->status == 'in_progress')>{{ __('In progress') }}</option>
-                    <option value="paused" @selected($project->status == 'paused')>{{ __('Paused') }}</option>
-                    <option value="completed" @selected($project->status == 'completed')>{{ __('Completed') }}</option>
-                </select>
-            </div>
-            <div class="grid grid-cols-2 gap-4">
-                <div>
-                    <label class="label">{{ __('Start date') }}</label>
-                    <input type="date" name="start_date" value="{{ old('start_date', $project->start_date->format('Y-m-d')) }}" class="input input-bordered w-full" required>
-                </div>
-                <div>
-                    <label class="label">{{ __('Estimated end date') }}</label>
-                    <input type="date" name="end_date_estimated" value="{{ old('end_date_estimated', $project->end_date_estimated?->format('Y-m-d')) }}" class="input input-bordered w-full">
-                </div>
-            </div>
-            <button type="submit" class="btn btn-primary w-full">{{ __('Update') }}</button>
-        </form>
-
-        <hr class="my-6">
-
-        <h2 class="text-xl font-bold mb-2">{{ __('Phases') }}</h2>
-        <livewire:phase-list :project="$project" />
-
-        <hr class="my-6">
-
-        <h2 class="text-xl font-bold mb-2">{{ __('Users') }}</h2>
-        <livewire:project-users :project="$project" />
+        </div>
     </div>
 </x-app-layout>