diff --git a/npm/ng-packs/apps/dev-app/src/app/home/home.component.html b/npm/ng-packs/apps/dev-app/src/app/home/home.component.html
index 067a74c50f..677ee2e37f 100644
--- a/npm/ng-packs/apps/dev-app/src/app/home/home.component.html
+++ b/npm/ng-packs/apps/dev-app/src/app/home/home.component.html
@@ -1,6 +1,6 @@
 <div class="container">
   <div class="p-5 text-center">
-    <div class="badge badge-success h5 rounded mb-4" role="alert">
+    <div class="d-inline-block bg-success text-white p-1 h5 rounded mb-4" role="alert">
       <h5 class="m-1">
         <i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is
         successfully running!
diff --git a/npm/ng-packs/apps/dev-app/src/environments/environment.ts b/npm/ng-packs/apps/dev-app/src/environments/environment.ts
index d3aa48f6ad..d92bd9747a 100644
--- a/npm/ng-packs/apps/dev-app/src/environments/environment.ts
+++ b/npm/ng-packs/apps/dev-app/src/environments/environment.ts
@@ -15,8 +15,8 @@ export const environment = {
     clientId: 'MyProjectName_App',
     dummyClientSecret: '1q2w3e*',
     scope: 'offline_access MyProjectName',
-    // responseType: 'code',
-    // redirectUri: baseUrl
+    responseType: 'code',
+    redirectUri: baseUrl,
   },
   apis: {
     default: {
diff --git a/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html b/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html
index a1334e5f95..d099de1674 100644
--- a/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html
+++ b/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html
@@ -3,7 +3,7 @@
     <div class="card">
       <div class="card-body">
         <div class="row">
-          <div class="col-12 col-md-3">
+          <div class="col-12 col-md-3 mb-2 mb-md-0">
             <ul class="nav flex-column nav-pills" id="nav-tab" role="tablist">
               <ng-container *abpFor="let setting of settings; trackBy: trackByFn">
                 <li
diff --git a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html
index aa1f1703c5..38be2289d7 100644
--- a/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html
+++ b/npm/ng-packs/packages/theme-shared/extensions/src/lib/components/page-toolbar/page-toolbar.component.html
@@ -1,5 +1,5 @@
 <div class="row justify-content-end mx-n1" id="AbpContentToolbar">
-  <div class="col-auto px-1 pt-2" *ngFor="let action of actionList; trackBy: trackByFn">
+  <div class="col-auto px-1 pt-0 pt-md-2" *ngFor="let action of actionList; trackBy: trackByFn">
     <ng-container *ngIf="action.visible(data)">
       <ng-container *abpPermission="action.permission">
         <ng-container *ngIf="action.component as component; else button">
diff --git a/templates/app/angular/src/app/home/home.component.html b/templates/app/angular/src/app/home/home.component.html
index 067a74c50f..677ee2e37f 100644
--- a/templates/app/angular/src/app/home/home.component.html
+++ b/templates/app/angular/src/app/home/home.component.html
@@ -1,6 +1,6 @@
 <div class="container">
   <div class="p-5 text-center">
-    <div class="badge badge-success h5 rounded mb-4" role="alert">
+    <div class="d-inline-block bg-success text-white p-1 h5 rounded mb-4" role="alert">
       <h5 class="m-1">
         <i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is
         successfully running!
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml
index e3604b875a..8cd6abc5dc 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/Pages/Index.cshtml
@@ -13,7 +13,7 @@
 }
 <div class="container">
     <div class="p-5 text-center">
-        <div class="badge badge-success h5 rounded mb-4 " role="alert">
+        <div class="d-inline-block bg-success text-white p-1 h5 rounded mb-4 " role="alert">
             <h5 class="m-1"> <i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is successfully running!</h5>
         </div>
         <h1>Welcome to the Application</h1>
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
index df173c9b97..08066fb5cd 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/Pages/Index.cshtml
@@ -13,7 +13,7 @@
 }
 <div class="container">
     <div class="p-5 text-center">
-        <div class="badge badge-success h5 rounded mb-4 " role="alert">
+        <div class="d-inline-block bg-success text-white p-1 h5 rounded mb-4 " role="alert">
             <h5 class="m-1"> <i class="fas fa-rocket"></i> Congratulations, <strong>MyProjectName</strong> is successfully running!</h5>
         </div>
         <h1>Welcome to the Application</h1>