diff --git a/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md b/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md
index 84626eba61..afc4e6515b 100644
--- a/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md
+++ b/docs/en/Tutorials/AspNetCore-Mvc/Part-I.md
@@ -118,7 +118,7 @@ PM> Update-Database
 
 #### Add Sample Data
 
-`Update-Database` command created the `Books` table in the database. Open your database and enter a few sample rows, so you can show them on the page:
+`Update-Database` command created the `AppBooks` table in the database. Open your database and enter a few sample rows, so you can show them on the page:
 
 ![bookstore-books-table](images/bookstore-books-table.png)
 
diff --git a/docs/en/Tutorials/AspNetCore-Mvc/Part-II.md b/docs/en/Tutorials/AspNetCore-Mvc/Part-II.md
index 9ed30338fa..180133d713 100644
--- a/docs/en/Tutorials/AspNetCore-Mvc/Part-II.md
+++ b/docs/en/Tutorials/AspNetCore-Mvc/Part-II.md
@@ -20,7 +20,7 @@ In this section, you will learn how to create a new modal dialog form to create
 
 Create a new razor page, named `CreateModal.cshtml` under the `Pages/Books` folder of the `Acme.BookStore.Web` project:
 
-![bookstore-add-create-dialog](images/bookstore-add-create-dialog.png)
+![bookstore-add-create-dialog](images/bookstore-add-create-dialog-v2.png)
 
 ##### CreateModal.cshtml.cs
 
@@ -138,12 +138,12 @@ Create a new razor page, named `EditModal.cshtml` under the `Pages/Books` folder
 
 Open the `EditModal.cshtml.cs` file (`EditModalModel` class) and replace with the following code:
 
-````C#
+````csharp
 using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Acme.BookStore.Pages.Books
+namespace Acme.BookStore.Web.Pages.Books
 {
     public class EditModalModel : BookStorePageModelBase
     {
@@ -153,7 +153,7 @@ namespace Acme.BookStore.Pages.Books
 
         [BindProperty]
         public CreateUpdateBookDto Book { get; set; }
-        
+
         private readonly IBookAppService _bookAppService;
 
         public EditModalModel(IBookAppService bookAppService)
@@ -180,38 +180,26 @@ namespace Acme.BookStore.Pages.Books
 * Mapped `BookDto` (received from the `BookAppService.GetAsync`) to `CreateUpdateBookDto` in the `GetAsync` method.
 * The `OnPostAsync` simply uses `BookAppService.UpdateAsync` to update the entity.
 
-#### CreateUpdateBookDto
+#### BookDto to CreateUpdateBookDto Mapping
 
-In order to perform `BookDto` to `CreateUpdateBookDto` object mapping, change the `CreateUpdateBookDto` class as shown below:
+In order to perform `BookDto` to `CreateUpdateBookDto` object mapping, open the `BookStoreWebAutoMapperProfile.cs` in the `Acme.BookStore.Web` project and change it as shown below:
 
-````C#
-using System;
-using System.ComponentModel.DataAnnotations;
-using Volo.Abp.AutoMapper;
+````csharp
+using AutoMapper;
 
-namespace Acme.BookStore
+namespace Acme.BookStore.Web
 {
-    [AutoMapTo(typeof(Book))]
-    [AutoMapFrom(typeof(BookDto))]
-    public class CreateUpdateBookDto
+    public class BookStoreWebAutoMapperProfile : Profile
     {
-        [Required]
-        [StringLength(128)]
-        public string Name { get; set; }
-
-        [Required]
-        public BookType Type { get; set; } = BookType.Undefined;
-
-        [Required]
-        public DateTime PublishDate { get; set; }
-
-        [Required]
-        public float Price { get; set; }
+        public BookStoreWebAutoMapperProfile()
+        {
+            CreateMap<BookDto, CreateUpdateBookDto>();
+        }
     }
 }
 ````
 
-* Just added the `[AutoMapFrom(typeof(BookDto))]` attribute to create the mapping.
+* Just added `CreateMap<BookDto, CreateUpdateBookDto>();` as the mapping definition.
 
 #### EditModal.cshtml
 
@@ -219,8 +207,8 @@ Replace `EditModal.cshtml` content with the following content:
 
 ````html
 @page
-@inherits Acme.BookStore.Pages.BookStorePageBase
-@using Acme.BookStore.Pages.Books
+@inherits Acme.BookStore.Web.Pages.BookStorePageBase
+@using Acme.BookStore.Web.Pages.Books
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
 @model EditModalModel
 @{
@@ -231,7 +219,7 @@ Replace `EditModal.cshtml` content with the following content:
         <abp-modal-header title="@L["Update"].Value"></abp-modal-header>
         <abp-modal-body>
             <abp-input asp-for="Id" />
-            <abp-form-content/>
+            <abp-form-content />
         </abp-modal-body>
         <abp-modal-footer buttons="@(AbpModalButtons.Cancel|AbpModalButtons.Save)"></abp-modal-footer>
     </abp-modal>
@@ -240,7 +228,7 @@ Replace `EditModal.cshtml` content with the following content:
 
 This page is very similar to the `CreateModal.cshtml` except;
 
-* It includes an `abp-input` for the `Id` property to store id of the editing book.
+* It includes an `abp-input` for the `Id` property to store id of the editing book (which is a hidden input).
 * It uses `Books/EditModal` as the post URL and *Update* text as the modal header.
 
 #### Add "Actions" Dropdown to the Table
@@ -420,6 +408,12 @@ $(function () {
 });
 ````
 
+Open the `en.json` in the `Acme.BookStore.Domain.Shared` project and add the following line:
+
+````json
+"BookDeletionConfirmationMessage": "Are you sure to delete the book {0}?" 
+````
+
 Run the application and try to delete a book.
 
 ### Next Part
diff --git a/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-add-create-dialog-v2.png b/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-add-create-dialog-v2.png
new file mode 100644
index 0000000000..fcadfd7a82
Binary files /dev/null and b/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-add-create-dialog-v2.png differ
diff --git a/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-add-create-dialog.png b/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-add-create-dialog.png
deleted file mode 100644
index 44398e6b4c..0000000000
Binary files a/docs/en/Tutorials/AspNetCore-Mvc/images/bookstore-add-create-dialog.png and /dev/null differ