diff --git a/docs/en/UI/Angular/Config-State.md b/docs/en/UI/Angular/Config-State.md
index bda3250b32..0c1070f54d 100644
--- a/docs/en/UI/Angular/Config-State.md
+++ b/docs/en/UI/Angular/Config-State.md
@@ -233,4 +233,4 @@ Please refer to `Config.Environment` type for all the properties you can pass to
 
 ## What's Next?
 
-- [Modifying the Menu](./Modifying-the-Menu.md)
\ No newline at end of file
+- [HTTP Requests](./Http-Requests)
diff --git a/docs/en/UI/Angular/Content-Projection-Service.md b/docs/en/UI/Angular/Content-Projection-Service.md
index db7c52be81..7e03776835 100644
--- a/docs/en/UI/Angular/Content-Projection-Service.md
+++ b/docs/en/UI/Angular/Content-Projection-Service.md
@@ -1,4 +1,4 @@
-# Content Projection
+# Projecting Angular Content
 
 You can use the `ContentProjectionService` in @abp/ng.core package in order to project content in an easy and explicit way.
 
@@ -75,4 +75,4 @@ projectContent<T extends Type<any> | TemplateRef<any>>(
 
 ## What's Next?
 
-- [TrackByService](./Track-By-Service.md)
+- [Confirmation Popup](./Confirmation-Service.md)
diff --git a/docs/en/UI/Angular/Custom-Setting-Page.md b/docs/en/UI/Angular/Custom-Setting-Page.md
index e4ee6d45c2..9a17f6ad7b 100644
--- a/docs/en/UI/Angular/Custom-Setting-Page.md
+++ b/docs/en/UI/Angular/Custom-Setting-Page.md
@@ -35,7 +35,3 @@ export class AppComponent {
 Navigate to `/setting-management` route to see the changes:
 
 ![Custom Settings Tab](./images/custom-settings.png)
-
-## What's Next?
-
-- [Lazy Loading Scripts & Styles](./Lazy-Load-Service.md)
diff --git a/docs/en/UI/Angular/Dom-Insertion-Service.md b/docs/en/UI/Angular/Dom-Insertion-Service.md
index 88f30136b3..d56e4f8b0e 100644
--- a/docs/en/UI/Angular/Dom-Insertion-Service.md
+++ b/docs/en/UI/Angular/Dom-Insertion-Service.md
@@ -1,4 +1,4 @@
-# Dom Insertion (of Scripts and Styles)
+# Inserting Scripts & Styles to DOM
 
 You can use the `DomInsertionService` in @abp/ng.core package in order to insert scripts and styles in an easy and explicit way.
 
@@ -137,4 +137,4 @@ The `has` method returns a boolean value that indicates the given content has al
 
 ## What's Next?
 
-- [ContentProjectionService](./Content-Projection-Service.md)
+- [Lazy Loading Scripts & Styles](./Lazy-Load-Service.md)
diff --git a/docs/en/UI/Angular/Environment.md b/docs/en/UI/Angular/Environment.md
index 402e110f94..67fe4eb315 100644
--- a/docs/en/UI/Angular/Environment.md
+++ b/docs/en/UI/Angular/Environment.md
@@ -4,7 +4,7 @@ Every application needs some **environment** variables. In Angular world, this i
 
 Current `Environment` configuration holds sub config classes as follows:
 
-```typescript
+```js
 export interface Environment {
   apis: Apis;
   application: Application;
@@ -16,7 +16,7 @@ export interface Environment {
 
 ## Apis
 
-```typescript
+```js
 export interface Apis {
   [key: string]: ApiConfig;
   default: ApiConfig;
@@ -56,7 +56,7 @@ Everything else will be sent to `"https://localhost:8080"`
 
 ## Application
 
-```typescript
+```js
  export interface Application {
   name: string;
   baseUrl?: string;
@@ -80,7 +80,7 @@ Abp Framework supports this out of box.
 
 To integrate an existing config json into the `environment`, you need to set `remoteEnv`
 
-```typescript
+```js
 export type customMergeFn = (
   localEnv: Partial<Config.Environment>,
   remoteEnv: any,
@@ -106,4 +106,3 @@ export interface RemoteEnv {
 ## What's Next?
 
 * [Service Proxies](./Service-Proxies.md)
-
diff --git a/docs/en/UI/Angular/Lazy-Load-Service.md b/docs/en/UI/Angular/Lazy-Load-Service.md
index b4eddf7b25..344b446107 100644
--- a/docs/en/UI/Angular/Lazy-Load-Service.md
+++ b/docs/en/UI/Angular/Lazy-Load-Service.md
@@ -1,4 +1,4 @@
-# How to Lazy Load Scripts and Styles
+# Lazy Loading Scripts & Styles
 
 You can use the `LazyLoadService` in @abp/ng.core package in order to lazy load scripts and styles in an easy and explicit way.
 
@@ -210,4 +210,4 @@ load(strategy: LoadingStrategy, retryTimes?: number, retryDelay?: number): Obser
 
 ## What's Next?
 
-- [DomInsertionService](./Dom-Insertion-Service.md)
+- [Projecting Angular Content](./Content-Projection-Service.md)
diff --git a/docs/en/UI/Angular/List-Service.md b/docs/en/UI/Angular/List-Service.md
index f65f0db4cd..f934ec49c2 100644
--- a/docs/en/UI/Angular/List-Service.md
+++ b/docs/en/UI/Angular/List-Service.md
@@ -177,3 +177,8 @@ As of v3.0, with ngx-datatable, the `page` property has to be set as `0` for ini
 ```
 
 **Important Note:** The `abp-table` is not removed, but is deprecated and will be removed in the future. Please consider switching to ngx-datatable.
+
+
+## What's Next?
+
+- [Easy *ngFor trackBy](./Track-By-Service.md)
diff --git a/docs/en/UI/Angular/Multi-Tenancy.md b/docs/en/UI/Angular/Multi-Tenancy.md
index fb9fb54f76..e4532a5ee5 100644
--- a/docs/en/UI/Angular/Multi-Tenancy.md
+++ b/docs/en/UI/Angular/Multi-Tenancy.md
@@ -132,4 +132,4 @@ The app sends the `__tenant` header that contains the current tenant id on each
 
 ## What's Next?
 
-- [Confirmation Popup](./Confirmation-Service.md)
+- [RxJS Subscriptions](./Subscription-Service.md)
diff --git a/docs/en/UI/Angular/Quick-Start.md b/docs/en/UI/Angular/Quick-Start.md
index e054b522ea..a58671156c 100644
--- a/docs/en/UI/Angular/Quick-Start.md
+++ b/docs/en/UI/Angular/Quick-Start.md
@@ -209,4 +209,4 @@ In addition, you can [deploy your application to certain targets using the Angul
 
 ## What's Next?
 
-- [Environment](./Environment.md)
+- [Environment Variables](./Environment.md)
diff --git a/docs/en/UI/Angular/Service-Proxies.md b/docs/en/UI/Angular/Service-Proxies.md
index 7dfb2c052c..ece959a90d 100644
--- a/docs/en/UI/Angular/Service-Proxies.md
+++ b/docs/en/UI/Angular/Service-Proxies.md
@@ -141,4 +141,4 @@ export class BookComponent implements OnInit {
 
 ## What's Next?
 
-- [HTTP Requests](./Http-Requests)
+- [Config State](./Config-State.md)
diff --git a/docs/en/UI/Angular/Subscription-Service.md b/docs/en/UI/Angular/Subscription-Service.md
index 5d920df96e..02fee46dc1 100644
--- a/docs/en/UI/Angular/Subscription-Service.md
+++ b/docs/en/UI/Angular/Subscription-Service.md
@@ -1,4 +1,4 @@
-# Easy Unsubscription for Your Observables
+# RxJS Subscriptions
 
 `SubscriptionService` is a utility service to provide an easy unsubscription from RxJS observables in Angular components and directives. Please see [why you should unsubscribe from observables on instance destruction](https://angular.io/guide/lifecycle-hooks#cleaning-up-on-instance-destruction).
 
@@ -200,4 +200,4 @@ class DemoComponent implements OnInit {
 
 ## What's Next?
 
-- [ListService](./List-Service.md)
+- [Working with Lists](./List-Service.md)
diff --git a/docs/en/UI/Angular/Toaster-Service.md b/docs/en/UI/Angular/Toaster-Service.md
index faa5632ab8..d2c1fc08f3 100644
--- a/docs/en/UI/Angular/Toaster-Service.md
+++ b/docs/en/UI/Angular/Toaster-Service.md
@@ -156,4 +156,4 @@ Removes all open toasts.
 
 ## What's Next?
 
-- [Config State](./Config-State.md)
+- [Modifying the Menu](./Modifying-the-Menu.md)
diff --git a/docs/en/UI/Angular/Track-By-Service.md b/docs/en/UI/Angular/Track-By-Service.md
index 050706accd..7883be4754 100644
--- a/docs/en/UI/Angular/Track-By-Service.md
+++ b/docs/en/UI/Angular/Track-By-Service.md
@@ -1,4 +1,4 @@
-# Easy TrackByFunction Implementation
+# Easy *ngFor trackBy
 
 `TrackByService` is a utility service to provide an easy implementation for one of the most frequent needs in Angular templates: `TrackByFunction`. Please see [this page in Angular docs](https://angular.io/guide/template-syntax#ngfor-with-trackby) for its purpose.
 
@@ -116,4 +116,4 @@ class DemoComponent {
 
 ## What's Next?
 
-- [SubscriptionService](./Subscription-Service.md)
+- [Inserting Scripts & Styles to DOM](./Dom-Insertion-Service.md)