diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
index 0575d0cdc4..9f071e44a0 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
@@ -31,7 +31,7 @@
                       <div class="mt-2" [ngStyle]="feature.style" (keyup.enter)="save()">
                         @switch (feature.valueType?.name) {
                           @case (valueTypes.ToggleStringValueType) {
-                            <div class="form-check">
+                            <div class="form-check" [class.px-4]="!!feature.parentName">
                               <input
                                 class="form-check-input"
                                 type="checkbox"
@@ -52,7 +52,7 @@
                             </div>
                           }
                           @case (valueTypes.FreeTextStringValueType) {
-                            <div class="mb-3 form-group">
+                            <div class="mb-3 form-group" [class.px-2]="!!feature.parentName">
                               <label [htmlFor]="feature.name" class="form-label">{{
                                 feature.displayName
                               }}</label>
@@ -74,7 +74,7 @@
                           }
                           @case (valueTypes.SelectionStringValueType) {
                             @if (feature.valueType.itemSource?.items?.length) {
-                              <div class="mb-3 form-group">
+                              <div class="mb-3 form-group" [class.px-2]="!!feature.parentName">
                                 <label [htmlFor]="feature.name" class="form-label">{{
                                   feature.displayName
                                 }}</label>
diff --git a/templates/app/angular/src/app/home/home.component.html b/templates/app/angular/src/app/home/home.component.html
index c80dd1724e..e3e73e48ae 100644
--- a/templates/app/angular/src/app/home/home.component.html
+++ b/templates/app/angular/src/app/home/home.component.html
@@ -21,7 +21,7 @@
                 $implicit: {
                   description:
                     'Learn how to create and run a new web application using the application startup template.',
-                  href: 'https://docs.abp.io/en/commercial/latest/getting-started',
+                  href: 'https://abp.io/docs/latest/get-started',
                   label: 'Getting Started'
                 }
               }
@@ -36,7 +36,7 @@
                 $implicit: {
                   description:
                     'Learn how to build an ABP based web application named Acme.BookStore.',
-                  href: 'https://docs.abp.io/en/commercial/latest/tutorials/book-store/part-1?UI=MVC&DB=EF',
+                  href: 'https://abp.io/docs/latest/tutorials/book-store/part-01?UI=NG&DB=EF',
                   label: 'Explore Tutorial'
                 }
               }
@@ -46,7 +46,7 @@
           <h4>Customize Lepton Theme</h4>
           <p class="text-muted mb-2">Learn how to customize LeptonX Theme as you wish.</p>
           <a
-            href="https://docs.abp.io/en/commercial/latest/themes/lepton/customizing-lepton-theme"
+            href="https://abp.io/docs/latest/framework/ui/angular/theming"
             class="btn btn-primary soft mb-5 mb-xl-0"
             target="_blank"
             >Customize Lepton</a
@@ -67,7 +67,7 @@
               label: 'Visit Support',
               description:
                 'You can check for similar problems and solutions, or open a new topic to discuss your specific issue.',
-              href: 'https://support.abp.io/QA/Questions',
+              href: 'https://abp.io/support/questions',
               card: 'card overflow-hidden',
               imgClass: '',
               imgSrc: 'assets/images/getting-started/img-support.png',
@@ -84,7 +84,7 @@
               label: 'Visit Blog',
               description:
                 'You can find content on .NET development, cross-platform, ASP.NET application templates, ABP-related news, and more.',
-              href: 'https://blog.abp.io/abp',
+              href: 'https://abp.io/blog',
               card: 'card h-md-100 overflow-hidden',
               imgClass: 'margin-bottom: -24px',
               imgSrc: 'assets/images/getting-started/img-blog.png',
@@ -107,7 +107,7 @@
           Explore all ABP users' experiences with the ABP Framework, discover articles and videos on
           how to use ABP, and join raffles for a chance to win surprise gifts!
         </p>
-        <a class="btn btn-brand soft mb-3" href="https://community.abp.io/" target="_blank"
+        <a class="btn btn-brand soft mb-3" href="https://abp.io/community/" target="_blank"
           >Join ABP Community</a
         >
       </div>
@@ -145,7 +145,7 @@
               icon: 'bi bi-check fs-4',
               iconClass: 'rounded-circle me-2 flex-center bg-brand soft',
               title: 'Samples',
-              link: 'https://docs.abp.io/en/abp/latest/Samples/Index',
+              link: 'https://abp.io/docs/latest/Samples/Index',
             },
             {
               iconType: 'icon',
@@ -161,7 +161,7 @@
               icon: 'bi bi-check fs-4',
               iconClass: 'rounded-circle me-2 flex-center bg-brand soft',
               title: 'FAQ',
-              link: 'https://commercial.abp.io/faq',
+              link: 'https://abp.io/faq',
             },
           ]
         }
@@ -219,7 +219,7 @@
               iconType: 'image',
               icon: 'assets/images/getting-started/discord.svg',
               title: 'Discord',
-              link: 'https://community.abp.io/discord'
+              link: 'https://abp.io/community/discord'
             },
             {
               iconType: 'image',