diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 3ec9546d..733267a1 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -11,7 +11,7 @@ public function users()
     {
         $usersCount = User::count();
 
-        return view('users');
+        return view('users', ['usersCount'=> $usersCount]);
     }
 
     // Task 2. Change the View code so alert would not show on the screen
diff --git a/resources/views/authenticated.blade.php b/resources/views/authenticated.blade.php
index e200ae1e..6ca1f1c2 100644
--- a/resources/views/authenticated.blade.php
+++ b/resources/views/authenticated.blade.php
@@ -11,9 +11,12 @@
                 <div class="p-6 bg-white border-b border-gray-200">
                     {{-- Task: add a condition to show correct text --}}
                     {{-- If user is logged in, show their email --}}
-                    Yes, I am logged in as [insert_user_email_here].
+                    @auth
+                    Yes, I am logged in as {{ auth()->user()->email }}.
+                    @endauth
+                    @guest
                     No, I am not logged in.
-                </div>
+                    @endguest
             </div>
         </div>
     </div>
diff --git a/resources/views/include.blade.php b/resources/views/include.blade.php
index 95d9bd6c..ed78635c 100644
--- a/resources/views/include.blade.php
+++ b/resources/views/include.blade.php
@@ -21,6 +21,7 @@
                                 <tr class="bg-red-100">
                                     {{-- Task: include file resources/views/includes/row.blade.php --}}
                                     {{-- passing the $user variable to it --}}
+                                    @include('includes.row', $user)
                                 </tr>
                             @endforeach
                         </tbody>
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
index f8ffc5b6..fd81d1f0 100644
--- a/resources/views/layout.blade.php
+++ b/resources/views/layout.blade.php
@@ -1,4 +1,6 @@
-<x-app-layout>
+@extends('layouts.main')
+
+@section('content')
     <div class="py-12">
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
             <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
@@ -10,4 +12,4 @@
             </div>
         </div>
     </div>
-</x-app-layout>
+@endsection
\ No newline at end of file
diff --git a/resources/views/rows.blade.php b/resources/views/rows.blade.php
index 4762a090..592c0e55 100644
--- a/resources/views/rows.blade.php
+++ b/resources/views/rows.blade.php
@@ -21,11 +21,18 @@
                         <tbody>
                             @foreach ($users as $user)
                                 {{-- Task: only every second row should have "bg-red-100" --}}
+                                @if($loop->even)
                                 <tr class="bg-red-100">
-                                    <td>{{-- Task: add row number here: 1, 2, etc. --}}</td>
+                                    @else
+                                    <tr>
+                                @endif
+                                    <td>{{-- Task: add row number here: 1, 2, etc. --}} {{$loop->iteration}}</td>
                                     <td>{{ $user->name }}</td>
                                     {{-- Task: only the FIRST row should have email with "font-bold" --}}
-                                    <td class="font-bold">{{ $user->email }}</td>
+                                    @if($loop->first)<td class="font-bold">{{ $user->email }}</td>
+                                    @else
+                                    <td>{{ $user->email }}</td>
+                                    @endif
                                     <td>{{ $user->created_at }}</td>
                                 </tr>
                             @endforeach
diff --git a/resources/views/table.blade.php b/resources/views/table.blade.php
index 399bf5c0..2d2ed3d3 100644
--- a/resources/views/table.blade.php
+++ b/resources/views/table.blade.php
@@ -19,14 +19,17 @@
                         </thead>
                         {{-- Task: add the loop here to show users, or the row "No content" --}}
                         <tbody>
+                            @forelse($users as $user)
                             <tr>
                                 <td>{{ $user->name }}</td>
                                 <td>{{ $user->email }}</td>
                                 <td>{{ $user->created_at }}</td>
                             </tr>
                             <tr>
+                            @empty
                                 <td colspan="3">No content.</td>
                             </tr>
+                            @endforelse
                         </tbody>
                     </table>
                 </div>