diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 3ec9546d..1ea08e52 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', compact('usersCount'));
     }
 
     // Task 2. Change the View code so alert would not show on the screen
diff --git a/resources/views/alert.blade.php b/resources/views/alert.blade.php
index 68bf0b9d..2980b456 100644
--- a/resources/views/alert.blade.php
+++ b/resources/views/alert.blade.php
@@ -9,7 +9,7 @@
         <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
             <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
                 <div class="p-6 bg-white border-b border-gray-200">
-                    {!! $text !!}
+                    {{ $text }}
                     Your task is to change the code of alert.blade.php, to avoid that JavaScript alert.
                 </div>
             </div>
diff --git a/resources/views/authenticated.blade.php b/resources/views/authenticated.blade.php
index e200ae1e..06f84ba9 100644
--- a/resources/views/authenticated.blade.php
+++ b/resources/views/authenticated.blade.php
@@ -11,8 +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].
-                    No, I am not logged in.
+                    @auth
+                        Yes, I am logged in as {{ auth()->user()->email }}.
+                    @endauth
+                    @guest
+                        No, I am not logged in.
+                    @endguest
                 </div>
             </div>
         </div>
diff --git a/resources/views/include.blade.php b/resources/views/include.blade.php
index 95d9bd6c..f64f9940 100644
--- a/resources/views/include.blade.php
+++ b/resources/views/include.blade.php
@@ -11,18 +11,19 @@
                 <div class="p-6 bg-white border-b border-gray-200">
                     <table>
                         <thead>
-                            <tr>
-                                <th>Name</th>
-                                <th>Email</th>
-                            </tr>
+                        <tr>
+                            <th>Name</th>
+                            <th>Email</th>
+                        </tr>
                         </thead>
                         <tbody>
-                            @foreach ($users as $user)
-                                <tr class="bg-red-100">
-                                    {{-- Task: include file resources/views/includes/row.blade.php --}}
-                                    {{-- passing the $user variable to it --}}
-                                </tr>
-                            @endforeach
+                        @foreach ($users as $user)
+                            <tr class="bg-red-100">
+                                {{-- Task: include file resources/views/includes/row.blade.php --}}
+                                {{-- passing the $user variable to it --}}
+                                {{ view('includes.row', ['user'=>$user])}}
+                            </tr>
+                        @endforeach
                         </tbody>
                     </table>
                 </div>
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
index f8ffc5b6..0926a216 100644
--- a/resources/views/layout.blade.php
+++ b/resources/views/layout.blade.php
@@ -1,13 +1,13 @@
-<x-app-layout>
-    <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">
-                <div class="p-6 bg-white border-b border-gray-200">
-                    {{-- Task: change the layout from layouts/app.blade.php --}}
-                    {{-- to layouts/main.blade.php --}}
-                    Please change layout.
-                </div>
+@extends('layouts.main')
+<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">
+            <div class="p-6 bg-white border-b border-gray-200">
+                Task: change the layout from layouts/app.blade.php
+                to layouts/main.blade.php
+                Please change layout.
             </div>
         </div>
     </div>
-</x-app-layout>
+</div>
+
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 9da21478..282cefd2 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -6,7 +6,7 @@
         <meta name="csrf-token" content="{{ csrf_token() }}">
 
         {{-- Task: edit one file to pass $metaTitle as "Blade Test" to all views --}}
-        <title>{{ $metaTitle ?? 'Laravel' }}</title>
+        <title>{{ $metaTitle ?? 'Blade Test' }}</title>
 
         <!-- Fonts -->
         <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">
diff --git a/resources/views/rows.blade.php b/resources/views/rows.blade.php
index 4762a090..6ad3847f 100644
--- a/resources/views/rows.blade.php
+++ b/resources/views/rows.blade.php
@@ -11,24 +11,32 @@
                 <div class="p-6 bg-white border-b border-gray-200">
                     <table>
                         <thead>
-                            <tr>
-                                <th>Row Number</th>
-                                <th>Name</th>
-                                <th>Email</th>
-                                <th>Registered at</th>
-                            </tr>
+                        <tr>
+                            <th>Row Number</th>
+                            <th>Name</th>
+                            <th>Email</th>
+                            <th>Registered at</th>
+                        </tr>
                         </thead>
                         <tbody>
-                            @foreach ($users as $user)
-                                {{-- Task: only every second row should have "bg-red-100" --}}
+                        @foreach ($users as $index=>$user)
+                            {{-- Task: only every second row should have "bg-red-100" --}}
+                            @if($index % 2 == 0)
                                 <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. --}} {{$index}}</td>
                                     <td>{{ $user->name }}</td>
                                     {{-- Task: only the FIRST row should have email with "font-bold" --}}
-                                    <td class="font-bold">{{ $user->email }}</td>
+                                    @if($index == 0)
+                                        <td class="font-bold">{{ $user->email }}</td>
+                                    @else
+                                        <td>{{ $user->email }}</td>
+                                    @endif
                                     <td>{{ $user->created_at }}</td>
                                 </tr>
-                            @endforeach
+                                @endforeach
                         </tbody>
                     </table>
                 </div>
diff --git a/resources/views/table.blade.php b/resources/views/table.blade.php
index 399bf5c0..eef380c6 100644
--- a/resources/views/table.blade.php
+++ b/resources/views/table.blade.php
@@ -11,22 +11,26 @@
                 <div class="p-6 bg-white border-b border-gray-200">
                     <table>
                         <thead>
-                            <tr>
-                                <th>Name</th>
-                                <th>Email</th>
-                                <th>Registered at</th>
-                            </tr>
+                        <tr>
+                            <th>Name</th>
+                            <th>Email</th>
+                            <th>Registered at</th>
+                        </tr>
                         </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>
+                        @empty
                             <tr>
                                 <td colspan="3">No content.</td>
                             </tr>
+                        @endforelse
                         </tbody>
                     </table>
                 </div>