diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 3ec9546d..4e8de555 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/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 38c135bd..758e2528 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -24,6 +24,8 @@ public function register()
      */
     public function boot()
     {
-        //
+        View::composer(['*'], function ($view) {
+            $view->with(['metaTitle' => 'Blade Test']);
+        });
     }
 }
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 57b73b54..4de87ab1 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -13,6 +13,6 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-        // \App\Models\User::factory(10)->create();
+//         \App\Models\User::factory(10)->create();
     }
 }
diff --git a/resources/views/alert.blade.php b/resources/views/alert.blade.php
index 68bf0b9d..9bcdca65 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 !!}
+                    {!! htmlentities($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..078acc72 100644
--- a/resources/views/authenticated.blade.php
+++ b/resources/views/authenticated.blade.php
@@ -11,8 +11,11 @@
                 <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.
+                    @if(auth()->check())
+                        Yes, I am logged in as {{auth()->user()->email}}.
+                    @else
+                        No, I am not logged in.
+                    @endif
                 </div>
             </div>
         </div>
diff --git a/resources/views/include.blade.php b/resources/views/include.blade.php
index 95d9bd6c..fe507324 100644
--- a/resources/views/include.blade.php
+++ b/resources/views/include.blade.php
@@ -19,6 +19,7 @@
                         <tbody>
                             @foreach ($users as $user)
                                 <tr class="bg-red-100">
+                                    @include('includes.row')
                                     {{-- Task: include file resources/views/includes/row.blade.php --}}
                                     {{-- passing the $user variable to it --}}
                                 </tr>
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
index f8ffc5b6..ceb38905 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
diff --git a/resources/views/rows.blade.php b/resources/views/rows.blade.php
index 4762a090..7795cc44 100644
--- a/resources/views/rows.blade.php
+++ b/resources/views/rows.blade.php
@@ -21,11 +21,11 @@
                         <tbody>
                             @foreach ($users as $user)
                                 {{-- Task: only every second row should have "bg-red-100" --}}
-                                <tr class="bg-red-100">
-                                    <td>{{-- Task: add row number here: 1, 2, etc. --}}</td>
+                                <tr class="{{$loop->even?'bg-red-100':''}}">
+                                    <td>{{ 1 + $loop->index }}</td>
                                     <td>{{ $user->name }}</td>
                                     {{-- Task: only the FIRST row should have email with "font-bold" --}}
-                                    <td class="font-bold">{{ $user->email }}</td>
+                                    <td class="{{$loop->first?'font-bold':''}}">{{ $user->email }}</td>
                                     <td>{{ $user->created_at }}</td>
                                 </tr>
                             @endforeach
diff --git a/resources/views/table.blade.php b/resources/views/table.blade.php
index 399bf5c0..dc9badc9 100644
--- a/resources/views/table.blade.php
+++ b/resources/views/table.blade.php
@@ -11,22 +11,27 @@
                 <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>
-                            <tr>
-                                <td>{{ $user->name }}</td>
-                                <td>{{ $user->email }}</td>
-                                <td>{{ $user->created_at }}</td>
-                            </tr>
+                        @if(count($users)>0)
+                            @foreach($users as $user)
+                                <tr>
+                                    <td>{{ $user->name }}</td>
+                                    <td>{{ $user->email }}</td>
+                                    <td>{{ $user->created_at }}</td>
+                                </tr>
+                            @endforeach
+                        @else
                             <tr>
                                 <td colspan="3">No content.</td>
                             </tr>
+                        @endif
                         </tbody>
                     </table>
                 </div>