diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 8ca17c9..95a07a3 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -19,9 +19,8 @@ class ReportController extends Controller
     {
         $this->authorizeProjectAccess($project);
 
-        return view('reports.builder', [
+        return \Livewire\Livewire::mount(\App\Livewire\Reports\ReportBuilder::class, [
             'project' => $project,
-            'availableEntities' => (new ReportFilters)->getAvailableEntities(),
         ]);
     }
 
diff --git a/app/Livewire/Reports/ReportBuilder.php b/app/Livewire/Reports/ReportBuilder.php
index 47f78b0..66d3ee0 100644
--- a/app/Livewire/Reports/ReportBuilder.php
+++ b/app/Livewire/Reports/ReportBuilder.php
@@ -6,9 +6,7 @@ use App\DTO\ReportFilters;
 use App\Models\Project;
 use App\Services\ReportGenerator;
 use Livewire\Component;
-use Livewire\Attributes\Layout;
 
-#[Layout('layouts.app')]
 class ReportBuilder extends Component
 {
     public Project $project;
diff --git a/resources/views/reports/builder.blade.php b/resources/views/reports/builder.blade.php
new file mode 100644
index 0000000..cd8a68c
--- /dev/null
+++ b/resources/views/reports/builder.blade.php
@@ -0,0 +1,7 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container mx-auto px-4 py-8">
+    <livewire:reports.report-builder :project="$project" :key="'report-builder-'.$project->id" />
+</div>
+@endsection
\ No newline at end of file