diff --git a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html
index 1f8833f929..c419da1b6f 100644
--- a/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html
+++ b/npm/ng-packs/packages/components/extensible/src/lib/components/extensible-form/extensible-form-prop.component.html
@@ -1,4 +1,7 @@
-<ng-container [ngSwitch]="getComponent(prop)" *abpPermission="prop.permission; runChangeDetection: false">
+<ng-container
+  [ngSwitch]="getComponent(prop)"
+  *abpPermission="prop.permission; runChangeDetection: false"
+>
   <ng-template ngSwitchCase="template">
     <ng-container *ngComponentOutlet="prop.template; injector: injectorForCustomComponent">
     </ng-container>
@@ -50,9 +53,7 @@
         class="form-select form-control"
       >
         @for (option of options$ | async; track option.value) {
-          <option
-            [ngValue]="option.value"
-          >
+          <option [ngValue]="option.value">
             {{ option.key }}
           </option>
         }
@@ -69,12 +70,11 @@
         multiple="multiple"
         class="form-select form-control"
       >
-        <option
-          *ngFor="let option of options$ | async; trackBy: track.by('value')"
-          [ngValue]="option.value"
-        >
-          {{ option.key }}
-        </option>
+        @for (options of options$ | asnyc; track option.value) {
+          <option [ngValue]="option.value">
+            {{ option.key }}
+          </option>
+        }
       </select>
     </ng-template>
 
@@ -160,9 +160,7 @@
     </ng-template>
 
     @if (prop.formText) {
-    <small class="text-muted d-block">{{
-      prop.formText | abpLocalization
-    }}</small>
+      <small class="text-muted d-block">{{ prop.formText | abpLocalization }}</small>
     }
   </div>
 </ng-container>
@@ -171,12 +169,17 @@
   <label [htmlFor]="prop.id" [ngClass]="classes || 'form-label'">
     @if (prop.displayTextResolver) {
       {{ prop.displayTextResolver(data) | abpLocalization }}
-    }@else{
+    } @else {
       {{ prop.displayName | abpLocalization }}
     }
     {{ asterisk }}
     @if (prop.tooltip) {
-      <i [ngbTooltip]="prop.tooltip.text | abpLocalization" [placement]="prop.tooltip.placement || 'auto'"  container="body" class="bi bi-info-circle"></i>
+      <i
+        [ngbTooltip]="prop.tooltip.text | abpLocalization"
+        [placement]="prop.tooltip.placement || 'auto'"
+        container="body"
+        class="bi bi-info-circle"
+      ></i>
     }
   </label>
 </ng-template>
diff --git a/npm/ng-packs/packages/components/page/src/page.component.html b/npm/ng-packs/packages/components/page/src/page.component.html
index 5a4a5cc66c..ee32f2e5e2 100644
--- a/npm/ng-packs/packages/components/page/src/page.component.html
+++ b/npm/ng-packs/packages/components/page/src/page.component.html
@@ -1,41 +1,37 @@
-<div class="row entry-row" *ngIf="shouldRenderRow">
-  <ng-container *ngIf="customTitle; else defaultTitleTemplate">
-    <ng-content select="abp-page-title-container"></ng-content>
-  </ng-container>
+@if (shouldRenderRow) {
+  <div class="row entry-row">
+    @if (customTitle) {
+      <ng-content select="abp-page-title-container"></ng-content>
+    } @else {
+      @if (title) {
+        <div class="col-auto" *abpPagePart="pageParts.title">
+          <h1 class="content-header-title">
+            {{ title }}
+          </h1>
+        </div>
+      }
+    }
 
-  <ng-container *ngIf="customBreadcrumb; else defaultBreadcrumbTemplate">
-    <ng-content select="abp-page-breadcrumb-container"></ng-content>
-  </ng-container>
+    @if (customBreadcrumb) {
+      <ng-content select="abp-page-breadcrumb-container"></ng-content>
+    } @else {
+      @if (breadcrumb) {
+        <div class="col-lg-auto ps-lg-0" *abpPagePart="pageParts.breadcrumb">
+          <abp-breadcrumb></abp-breadcrumb>
+        </div>
+      }
+    }
 
-  <ng-container *ngIf="customToolbar; else defaultPageToolbarTemplate">
-    <ng-content select="abp-page-toolbar-container"></ng-content>
-  </ng-container>
-</div>
+    @if (customToolbar) {
+      <ng-content select="abp-page-toolbar-container"></ng-content>
+    } @else {
+      @if (toolbarVisible) {
+        <div class="col" *abpPagePart="pageParts.toolbar; context: toolbarData">
+          <abp-page-toolbar [record]="toolbarData"></abp-page-toolbar>
+        </div>
+      }
+    }
+  </div>
+}
 
 <ng-content></ng-content>
-
-<ng-template #defaultTitleTemplate>
-  <ng-container *ngIf="title">
-    <div class="col-auto" *abpPagePart="pageParts.title">
-      <h1 class="content-header-title">
-        {{ title }}
-      </h1>
-    </div>
-  </ng-container>
-</ng-template>
-
-<ng-template #defaultBreadcrumbTemplate>
-  <ng-container *ngIf="breadcrumb">
-    <div class="col-lg-auto ps-lg-0" *abpPagePart="pageParts.breadcrumb">
-      <abp-breadcrumb></abp-breadcrumb>
-    </div>
-  </ng-container>
-</ng-template>
-
-<ng-template #defaultPageToolbarTemplate>
-  <ng-container *ngIf="toolbarVisible">
-    <div class="col" *abpPagePart="pageParts.toolbar; context: toolbarData">
-      <abp-page-toolbar [record]="toolbarData"></abp-page-toolbar>
-    </div>
-  </ng-container>
-</ng-template>
diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
index ea0d6b1459..b670b0ed48 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
+++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.html
@@ -32,25 +32,26 @@
         ></ng-container>
       </div>
 
-      <div
-        #dropdown="ngbDropdown"
-        *ngIf="menu"
-        class="d-inline-block ms-1"
-        ngbDropdown
-        placement="bottom"
-        container="body"
-        (abpInit)="initDropdown(node.key, dropdown)"
-      >
-        <i
-          class="fas fa-caret-down text-muted"
-          ngbDropdownToggle
-          [class.dropdown-toggle]="false"
-          aria-hidden="true"
-        ></i>
-        <div ngbDropdownMenu>
-          <ng-template *ngTemplateOutlet="menu; context: { $implicit: node }"></ng-template>
+      @if (menu) {
+        <div
+          #dropdown="ngbDropdown"
+          class="d-inline-block ms-1"
+          ngbDropdown
+          placement="bottom"
+          container="body"
+          (abpInit)="initDropdown(node.key, dropdown)"
+        >
+          <i
+            class="fas fa-caret-down text-muted"
+            ngbDropdownToggle
+            [class.dropdown-toggle]="false"
+            aria-hidden="true"
+          ></i>
+          <div ngbDropdownMenu>
+            <ng-template *ngTemplateOutlet="menu; context: { $implicit: node }"></ng-template>
+          </div>
         </div>
-      </div>
+      }
     </ng-template>
 
     <ng-template #defaultNodeTemplate let-node>