diff --git a/astro.config.mjs b/astro.config.mjs
index ddc9ac0..7d05606 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -256,6 +256,10 @@ export default defineConfig({
           label: "Congratulations",
           link: "/congratulations",
         },
+        {
+          label: "Next Steps",
+          link: "/next-steps",
+        },
       ],
       customCss: ["./src/styles/global.css"],
       // Set English as the default language for this site.
diff --git a/src/components/ui/CustomHead.astro b/src/components/ui/CustomHead.astro
index c4f652d..6ffab8b 100644
--- a/src/components/ui/CustomHead.astro
+++ b/src/components/ui/CustomHead.astro
@@ -6,7 +6,7 @@ const { head } = Astro.locals.starlightRoute;
 <script
   async
   src="https://widget.kapa.ai/kapa-widget.bundle.js"
-  data-website-id="2kefMS9x.o0AJRfewwVd08vhsrXWiqZFPn37g7wsz"
+  data-website-id="376f4ca7-122c-4cd3-acac-e3d8688f3e5d"
   data-project-name="angular"
   data-project-color="#0077a2"
   data-project-logo="https://tutorials.angular.courses/favicon.svg"
diff --git a/src/content/docs/en/api-server/create-task.mdx b/src/content/docs/en/api-server/create-task.mdx
index 1ec078a..9be8fef 100644
--- a/src/content/docs/en/api-server/create-task.mdx
+++ b/src/content/docs/en/api-server/create-task.mdx
@@ -80,7 +80,7 @@ Let's subscribe to the observable using the `subscribe` function.
 1.  Update the `src/app/task-form/task-form.ts` file.
 
         ```typescript ins={"Update the form submission function": 43-44} ins="this.taskService.addTask(task).subscribe();"
-        import {Component, inject, OnInit} from '@angular/core';
+        import {Component, inject} from '@angular/core';
         import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
         import {TaskService} from '../task-service';
         import {ActivatedRoute, Router} from '@angular/router';
@@ -95,7 +95,7 @@ Let's subscribe to the observable using the `subscribe` function.
           templateUrl: './task-form.html',
           styleUrls: ['./task-form.css']
         })
-        export class TaskForm implements OnInit {
+        export class TaskForm {
           private taskService = inject(TaskService);
           private router = inject(Router);
           private route = inject(ActivatedRoute);
@@ -103,7 +103,7 @@ Let's subscribe to the observable using the `subscribe` function.
 
           form = new FormGroup({
             title: new FormControl('', [Validators.required]),
-            description: new FormControl('', [Validators.minLength(1)])
+            description: new FormControl('', [Validators.minLength(3)])
           });
 
           constructor() {
@@ -121,7 +121,7 @@ Let's subscribe to the observable using the `subscribe` function.
                 });
             } else {
 
-                this.taskService.addTask(this.taskForm.value).subscribe();
+                this.taskService.addTask(this.form.value).subscribe();
             }
             this.router.navigate(['/']);
             }
diff --git a/src/content/docs/en/api-server/retrieve-tasks.mdx b/src/content/docs/en/api-server/retrieve-tasks.mdx
index 4ecf9d1..e60a487 100644
--- a/src/content/docs/en/api-server/retrieve-tasks.mdx
+++ b/src/content/docs/en/api-server/retrieve-tasks.mdx
@@ -161,7 +161,7 @@ Here its role will be to subscribe to the observable and return the list of task
          >Update</a
        >
        <button
-         class="btn btn-danger m-1"
+         class="btn btn-error m-1"
          type="button"
          (click)="deleteTask(task.id)"
        >
diff --git a/src/content/docs/en/create-task/event-binding.mdx b/src/content/docs/en/create-task/event-binding.mdx
index 9185e47..1313b05 100644
--- a/src/content/docs/en/create-task/event-binding.mdx
+++ b/src/content/docs/en/create-task/event-binding.mdx
@@ -65,7 +65,7 @@ The `ngSubmit` directive ensures that Angular handles the form submission proper
       ></textarea>
     </fieldset>
 
-    <button type="submit" class="btn btn-primary" (click)="submit()">Submit</button>
+    <button type="submit" class="btn btn-primary">Submit</button>
     </form>
    ```
 
diff --git a/src/content/docs/en/create-task/router-navigation.mdx b/src/content/docs/en/create-task/router-navigation.mdx
index ee6c941..9f2bc82 100644
--- a/src/content/docs/en/create-task/router-navigation.mdx
+++ b/src/content/docs/en/create-task/router-navigation.mdx
@@ -36,7 +36,7 @@ This service allows you to retrieve information about the current route and enab
 
 1. Update the file `src/app/task-form.ts`.
 
-   ```typescript ins={"1. Import the Router": 4-5} ins={"2. Inject the Router": 13-14} ins={"3. Use the navigation function provided by the Router": 29-30}
+   ```typescript ins={"1. Import the Router": 4-5} ins={"2. Inject the Router": 13-14} ins={"3. Use the navigation function provided by the Router": 23-24}
    // task-form.ts
    import { Component } from "@angular/core";
    import { TaskService } from "../task-service";
@@ -52,10 +52,10 @@ This service allows you to retrieve information about the current route and enab
 
      private router = inject(Router);
 
-     task = {
-       title: "",
-       description: "",
-     };
+    form = new FormGroup({
+      title: new FormControl(''),
+      description: new FormControl('')
+    });
 
      submit() {
        this.taskService.addTask(this.task);
diff --git a/src/content/docs/en/delete-task/add-delete-button.mdx b/src/content/docs/en/delete-task/add-delete-button.mdx
index e65f04c..c31853b 100644
--- a/src/content/docs/en/delete-task/add-delete-button.mdx
+++ b/src/content/docs/en/delete-task/add-delete-button.mdx
@@ -33,7 +33,7 @@ A click event is sufficient here because delete is a simple direct action that d
               <td>
                 <a class="btn btn-secondary" [routerLink]="['/update', task.id]">Update</a>
 
-              <button class="btn btn-danger" type="button" (click)="deleteTask(task.id)">Delete</button>
+              <button class="btn btn-error" type="button" (click)="deleteTask(task.id)">Delete</button>
             </td>
             </tr>
           }
diff --git a/src/content/docs/en/delete-task/add-empty-list.mdx b/src/content/docs/en/delete-task/add-empty-list.mdx
index f55c650..799dd90 100644
--- a/src/content/docs/en/delete-task/add-empty-list.mdx
+++ b/src/content/docs/en/delete-task/add-empty-list.mdx
@@ -14,7 +14,7 @@ import NotificationCard from "../../../../components/ui/NotificationCard";
 
 You've just learned how to delete a task from the list, now you want to display a message when the list is empty.
 
-## The @if Controlf Flow syntax
+## The @if Control Flow syntax
 
 To iterate over the task list, you used `@for` from the Control Flow feature.
 
diff --git a/src/content/docs/en/getting-started/getting-started.mdx b/src/content/docs/en/getting-started/getting-started.mdx
index ab34295..324391e 100644
--- a/src/content/docs/en/getting-started/getting-started.mdx
+++ b/src/content/docs/en/getting-started/getting-started.mdx
@@ -96,35 +96,17 @@ Hot reloading is a feature that allows you to see the changes you make to your c
        └─ app.html
    ```
 
-2. Locate the placeholder (which is wrapped in HTML comment tags) in the `app.html` file and replace the template content with following:
+2. Open the `app.html` file and replace the whole content with following:
 
    ```html ins="app.html"
    // app.html
    <h1>Welcome to {{title()}}!</h1>
    ```
 
-3. In the file `app.ts`, locate the `imports` array and remove the `RouterOutlet` import:
-
-   ```diff lang="ts"
-   // app.ts
-   - import { RouterOutlet } from '@angular/router';
-   ```
-
-   ```ts del="RouterOutlet"
-   // app.ts
-   @Component({
-     // ...
-     imports: [RouterOutlet],
-   })
-   export class App {
-     // ...
-   }
-   ```
-
 4. Return to your browser to see the following page:
 
    ```
-   Task Manager
+   Welcome to Angular introduction course
    ```
 
 </Steps>
diff --git a/src/content/docs/en/next-steps.mdx b/src/content/docs/en/next-steps.mdx
new file mode 100644
index 0000000..71286de
--- /dev/null
+++ b/src/content/docs/en/next-steps.mdx
@@ -0,0 +1,36 @@
+---
+title: Next Steps
+description: Learn what to do next after completing this course.
+course: angular-20
+slug: "next-steps"
+---
+
+import NotificationCard from "../../../components/ui/NotificationCard";
+
+<NotificationCard state="objective" title="Chapter Objective">
+  Learn what to do next after completing this course.
+</NotificationCard>
+
+## Ideas to Go Further
+
+Build on what you learned in this course by extending the **task manager** (wedding planner) app or trying new concepts:
+
+- **Filters and search** — Add a search box or filter by title or creation date on the task list, using the same data binding and control flow (`@for`, `@if`) you used for listing tasks.
+
+- **Task categories or tags** — Extend the `Task` interface with a category or tags, add a dropdown or chips in the create/update forms (reactive forms), and filter the list by category.
+
+- **Route guards** — The course didn't cover guards. Add a `CanDeactivate` guard so that leaving the add or edit form with unsaved changes asks the user for confirmation.
+
+- **Loading and error states** — When calling the API (getTasks, addTask, updateTask, deleteTask), show a loading spinner and handle errors with user-friendly messages in your templates, using the same `TaskService` and `HttpClient`.
+
+- **Reusable list + empty state** — As you did with **AlertBanner** (inputs and outputs), extract your task list and "No tasks" empty state into a generic reusable component that accepts items and an empty message as inputs and emits edit/delete actions via outputs.
+
+- **Lazy-load routes** — Keep your existing routes but load the add-task or update-task feature on demand with lazy loading so the initial bundle stays smaller.
+
+- **Simple auth flow** — The course didn't cover interceptors. Add a login form and a minimal auth service that stores a token, then use an HTTP interceptor to attach the token to every request.
+
+- **Persistence choice** — Swap **JSON Server** for another backend (e.g. Firebase, Supabase, or a small Node/Express API) while keeping the same `TaskService` interface and your existing components.
+
+- **Testing** — The project was created with `--skip-tests=true`. Add unit tests for `TaskService` (e.g. with `HttpClientTestingModule`) and for key components (form validation, list display, delete button).
+
+- **Styling and accessibility** — Go further with **DaisyUI** (e.g. more components or themes) or try a component library like Angular Material; add basic accessibility (labels, focus, keyboard support) to forms and buttons.
diff --git a/src/content/docs/en/task-listing/add-ui-library.mdx b/src/content/docs/en/task-listing/add-ui-library.mdx
index ad2c76c..73573d2 100644
--- a/src/content/docs/en/task-listing/add-ui-library.mdx
+++ b/src/content/docs/en/task-listing/add-ui-library.mdx
@@ -61,11 +61,9 @@ For this course, you will add <a href="https://daisyui.com/" target="_blank">Dai
 
 5. Check out the _small_ changes in your browser.
 
-   <Image
-     class="shadow-xl rounded-xl"
-     src={bootstrapImg}
-     alt="A bird sitting on a nest of eggs."
-   />
+   ```html
+   Task Manager
+   ```
 
 </Steps>
 
diff --git a/src/content/docs/en/task-listing/typescript-interface.mdx b/src/content/docs/en/task-listing/typescript-interface.mdx
index d225db4..f59917d 100644
--- a/src/content/docs/en/task-listing/typescript-interface.mdx
+++ b/src/content/docs/en/task-listing/typescript-interface.mdx
@@ -54,7 +54,7 @@ Each task has 4 properties:
    ```typescript
    // task.model.ts
    export interface Task {
-     id: string;
+     id?: string;
      title: string;
      description: string;
      createdAt: Date;
diff --git a/src/content/docs/en/update-task/form-validation.mdx b/src/content/docs/en/update-task/form-validation.mdx
index aed6d02..ef6a2bf 100644
--- a/src/content/docs/en/update-task/form-validation.mdx
+++ b/src/content/docs/en/update-task/form-validation.mdx
@@ -24,8 +24,8 @@ In our case we won't handle the error but we will console log the error if the f
 
 1. Update the file `src/app/task-form/task-form.ts`.
 
-   ```typescript ins="[Validators.required]" ins="[Validators.minLength(1)]"
-   import { Component, inject, OnInit } from "@angular/core";
+   ```typescript ins="[Validators.required]" ins="[Validators.minLength(3)]"
+   import { Component, inject } from "@angular/core";
    import { FormControl, FormGroup, ReactiveFormsModule } from "@angular/forms";
    import { TaskService } from "../task-service";
    import { Router } from "@angular/router";
@@ -38,7 +38,7 @@ In our case we won't handle the error but we will console log the error if the f
      templateUrl: "./task-form.html",
      styleUrl: "./task-form.css",
    })
-   export class TaskForm implements OnInit {
+   export class TaskForm {
      private taskService = inject(TaskService);
      private router = inject(Router);
 
@@ -48,7 +48,7 @@ In our case we won't handle the error but we will console log the error if the f
 
      form = new FormGroup({
        title: new FormControl("", [Validators.required]),
-       description: new FormControl("", [Validators.minLength(1)]),
+       description: new FormControl("", [Validators.minLength(3)]),
      });
 
      constructor() {
@@ -66,6 +66,8 @@ In our case we won't handle the error but we will console log the error if the f
            "Description Errors: ",
            this.form.controls.description.errors
          );
+
+         return;
        }
        this.taskService.addTask(this.form.value);
        this.router.navigate(["/"]);
diff --git a/src/content/docs/en/update-task/retrieve-data-url.mdx b/src/content/docs/en/update-task/retrieve-data-url.mdx
index 28932ad..240a62a 100644
--- a/src/content/docs/en/update-task/retrieve-data-url.mdx
+++ b/src/content/docs/en/update-task/retrieve-data-url.mdx
@@ -129,7 +129,7 @@ constructor() {
 1. Update the file `src/app/task-form/task-form.ts`.
 
    ```typescript ins={"get the id from the URL": 19-20} ins={"Patch the form value": 28-31} ins={"inject ActivatedRoute": 17-18} ins={"import ActivatedRoute": 5-6}
-   import { Component, inject, OnInit } from "@angular/core";
+   import { Component, inject } from "@angular/core";
    import { FormControl, FormGroup, ReactiveFormsModule } from "@angular/forms";
    import { TaskService } from "../task-service";
    import { Router } from "@angular/router";
@@ -142,7 +142,7 @@ constructor() {
      templateUrl: "./task-form.html",
      styleUrl: "./task-form.css",
    })
-   export class TaskForm implements OnInit {
+   export class TaskForm {
      private taskService = inject(TaskService);
      private router = inject(Router);
 
@@ -152,7 +152,7 @@ constructor() {
 
      form = new FormGroup({
        title: new FormControl("", [Validators.required]),
-       description: new FormControl("", [Validators.minLength(1)]),
+       description: new FormControl("", [Validators.minLength(3)]),
      });
 
      constructor() {
diff --git a/src/content/docs/en/update-task/submit-update-form.mdx b/src/content/docs/en/update-task/submit-update-form.mdx
index 93bcfeb..4129f02 100644
--- a/src/content/docs/en/update-task/submit-update-form.mdx
+++ b/src/content/docs/en/update-task/submit-update-form.mdx
@@ -83,6 +83,8 @@ submit() {
         console.log('Your Form: ', this.form.value);
         console.log('Title Errors: ', this.form.controls.title.errors);
         console.log('Description Errors: ', this.form.controls.description.errors);
+
+        return;
       }
 
         if (this.id ) {
@@ -109,7 +111,7 @@ In both cases, return to the task list.
 
    ```typescript
     // task-form.ts
-   import { Component, OnInit, inject } from "@angular/core";
+   import { Component, inject } from "@angular/core";
    import {FormControl, FormGroup, ReactiveFormsModule} from '@angular/forms';
    import {TaskService} from '../task-service';
    import {ActivatedRoute, Router} from '@angular/router';
@@ -122,7 +124,7 @@ In both cases, return to the task list.
      templateUrl: "./task-form.html",
      styleUrl: "./task-form.css",
    })
-   export class TaskForm implements OnInit {
+   export class TaskForm {
      private taskService = inject(TaskService);
      private router = inject(Router);
      private route = inject(ActivatedRoute);