diff --git a/resources/views/account/layouts/app.blade.php b/resources/views/account/layouts/app.blade.php
new file mode 100644
index 0000000..265b37c
--- /dev/null
+++ b/resources/views/account/layouts/app.blade.php
@@ -0,0 +1,30 @@
+@extends('layouts.app')
+@section('content')
+    <main class="main">
+
+        <div class="site-breadcrumb" style="background: url({{asset('assets/img/breadcrumb/02.jpg')}})">
+            <div class="container">
+                <h2 class="breadcrumb-title">@yield('title')</h2>
+                <ul class="breadcrumb-menu">
+                    <li><a href="{{route('index')}}">صفحه اصلی</a></li>
+                    <li class="active">@yield('title')</li>
+                </ul>
+            </div>
+        </div>
+        <div class="user-profile py-120">
+            <div class="container">
+                <div class="row">
+                    <div class="col-lg-3">
+                        @include('account.layouts.sidebar')
+                    </div>
+                    <div class="col-lg-9">
+                        @yield('account-content')
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    </main>
+
+@endsection
+
diff --git a/resources/views/components/flight.blade.php b/resources/views/components/flight.blade.php
index 0d5f314..23db92f 100644
--- a/resources/views/components/flight.blade.php
+++ b/resources/views/components/flight.blade.php
@@ -1,65 +1,102 @@
+<div class="col-md-6 col-lg-3">
+    <div class="flight-item">
 
-    <div class="col-md-6 col-lg-3">
-        <div class="flight-item">
+        <div class="flight-img">
 
-            <div class="flight-img">
-                <img src="assets/img/flight/01.jpg" alt>
+            <img
+                src="{{ asset('assets/img/flight/01.jpg') }}"
+                alt="{{ $flight->title }}"
+            >
 
-                <a href="#" class="add-wishlist">
+            @if(auth()->check())
+
+                <form
+                    action="{{ route('account.favorites.toggle', [
+                        'type' => 'flight',
+                        'id' => $flight->id
+                    ]) }}"
+                    method="POST"
+                >
+                    @csrf
+
+                    <button
+                        type="submit"
+                        class="add-wishlist border-0 bg-transparent"
+                    >
+                        <i class="far fa-heart"></i>
+                    </button>
+                </form>
+
+            @else
+
+                <a
+                    href="{{ route('auth.login.index') }}"
+                    class="add-wishlist"
+                >
                     <i class="far fa-heart"></i>
                 </a>
-            </div>
 
-            <div class="flight-content">
+            @endif
 
-                <div class="flight-title">
+        </div>
 
-                    <div class="flight-title-info">
+        <div class="flight-content">
 
-                        <img src="assets/img/flight/airline-1.png" alt>
+            <div class="flight-title">
 
-                        <h4>
-                            <a href="#">
-                                {{ $flight->departureAirport->city->name }}
+                <div class="flight-title-info">
 
-                                <i class="far fa-exchange"></i>
+                    <img
+                        src="{{ asset('assets/img/flight/airline-1.png') }}"
+                        alt=""
+                    >
 
-                                {{ $flight->arrivalAirport->city->name }}
-                            </a>
-                        </h4>
+                    <h4>
+                        <a href="{{ route('flights.show', $flight->id) }}">
 
-                    </div>
+                            {{ $flight->departureAirport->city->name }}
 
-                    <p class="flight-date">
-                        <i class="far fa-calendar-days"></i>
+                            <i class="far fa-exchange"></i>
 
-                        {{ $flight->departure_time->toJalali()->format('Y/m/d H:i') }}
-                    </p>
+                            {{ $flight->arrivalAirport->city->name }}
+
+                        </a>
+                    </h4>
 
                 </div>
 
-                <div class="flight-bottom">
+                <p class="flight-date">
 
-                    <div class="flight-price">
-                        از
+                    <i class="far fa-calendar-days"></i>
 
-                        <span>
+                    {{ $flight->departure_time->toJalali()->format('Y/m/d H:i') }}
+
+                </p>
+
+            </div>
+
+            <div class="flight-bottom">
+
+                <div class="flight-price">
+                    از
+
+                    <span>
                         {{ number_format($flight->price) }} تومان
                     </span>
-                    </div>
+                </div>
 
-                    <div class="flight-text-btn">
-                        <a href="{{route('flights.show',$flight->id)}}">
-                            نمایش جزئیات
-                            <i class="fas fa-arrow-left"></i>
-                        </a>
-                    </div>
+                <div class="flight-text-btn">
+
+                    <a href="{{ route('flights.show', $flight->id) }}">
+                        نمایش جزئیات
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
 
                 </div>
 
             </div>
 
         </div>
+
     </div>
-
-
+</div>
diff --git a/resources/views/show-layouts/reviews.blade.php b/resources/views/show-layouts/reviews.blade.php
index 759d6b8..ba0cde5 100644
--- a/resources/views/show-layouts/reviews.blade.php
+++ b/resources/views/show-layouts/reviews.blade.php
@@ -1,63 +1,81 @@
 <div class="listing-item">
-    <h4 class="mb-3">بررسی‌ها</h4>
+
+    <h4 class="mb-3">بازخوردها</h4>
 
     <div class="listing-review">
 
-        <h5>بازخوردها</h5>
 
         @forelse($comments as $comment)
+
             <div class="listing-review-item">
 
                 <div class="listing-review-author">
+
                     <img
                         src="{{ $comment->user?->file
-        ? asset('storage/'.$comment->user->file->path)
-        : asset('assets/img/account/01.jpg') }}"
-                        alt
+                    ? asset('storage/'.$comment->user->file->path)
+                    : asset('assets/img/account/01.jpg') }}"
+                        alt=""
                     >
-
                     <div class="listing-review-author-info">
                         <div>
                             <h6>
-                                {{ $comment->user?->first_name }}
-                                {{ $comment->user?->last_name }}
+                                @if($comment->user)
+                                    {{ $comment->user->first_name }}
+                                    {{ $comment->user->last_name }}
+                                @else
+                                    {{ $comment->guest_name }}
+                                @endif
                             </h6>
+
                             <span>
                                 <i class="far fa-clock"></i>
                                 {{ $comment->created_at->toJalali()->format('Y/m/d') }}
                             </span>
+
                         </div>
                     </div>
+
                 </div>
 
                 <p>{{ $comment->comment }}</p>
 
             </div>
+
         @empty
-            <p>هنوز بازخوردی ثبت نشده است. اولین نفری باشید که نظر می‌دهد.</p>
+
+            <p>
+                هنوز بازخوردی ثبت نشده است.
+                اولین نفری باشید که نظر می‌دهد.
+            </p>
+
         @endforelse
 
     </div>
 
     <div class="listing-review-form">
-        <h4>نظر بدهید</h4>
-        @if($errors->any())
-            <div class="alert alert-danger">
-                @foreach($errors->all() as $error)
-                    <div>{{ $error }}</div>
-                @endforeach
-            </div>
-        @endif
 
-        @if(session('success'))
-            <div class="alert alert-success">
-                {{ session('success') }}
-            </div>
-        @endif
-        <form action="{{ route('flights.comments.store', $flight) }}" method="POST">
+        <h4>نظر بدهید</h4>
+
+        @error('success')
+        <div class="alert alert-success">
+            {{ $message }}
+        </div>
+        @enderror
+
+        @php
+            $commentRoute = $type === 'flight'
+                ? route('flights.comments.store', $item)
+                : route('tours.comments.store', $item);
+        @endphp
+
+
+        <form action="{{ $commentRoute }}" method="POST">
+
             @csrf
 
             @guest
+
                 <div class="form-group mb-3">
                     <input
                         type="text"
@@ -66,9 +84,11 @@
                         placeholder="نام شما*"
                         value="{{ old('guest_name') }}"
                     >
+
                 </div>
 
                 <div class="form-group mb-3">
+
                     <input
                         type="email"
                         name="guest_email"
@@ -76,22 +96,28 @@
                         placeholder="ایمیل شما*"
                         value="{{ old('guest_email') }}"
                     >
+
                 </div>
             @endguest
 
             <div class="form-group">
-        <textarea
-            name="comment"
-            class="form-control"
-            cols="30"
-            rows="5"
-            placeholder="نظر خود را بنویسید*"
-        >{{ old('comment') }}</textarea>
+
+                <textarea
+                    name="comment"
+                    class="form-control"
+                    cols="30"
+                    rows="5"
+                    placeholder="نظر خود را بنویسید*"
+                >{{ old('comment') }}</textarea>
+
             </div>
 
             <button class="theme-btn" type="submit">
                 نظر بدهید
             </button>
+
         </form>
+
     </div>
+
 </div>