diff --git a/src/atlasComponents/sapiViews/core/rich/ATPSelector/wrapper/wrapper.component.ts b/src/atlasComponents/sapiViews/core/rich/ATPSelector/wrapper/wrapper.component.ts
index 64aded17667c5c7da1a3997ac05d10b86c6d3b5a..592790906c181e7699167171fc9968fb8cdd6cfd 100644
--- a/src/atlasComponents/sapiViews/core/rich/ATPSelector/wrapper/wrapper.component.ts
+++ b/src/atlasComponents/sapiViews/core/rich/ATPSelector/wrapper/wrapper.component.ts
@@ -90,7 +90,7 @@ export class WrapperATPSelector implements OnDestroy{
                 }
                 return this.#askUser(
                   null,
-                  `Template **${template.name}** does not support the current parcellation **${selectedATP.parcellation.name}**. Please select one of the following parcellations:`,
+                  `Current parcellation **${selectedATP.parcellation.name}** is not mapped in the selected template **${template.name}**. Please select one of the following parcellations:`,
                   parcs.map(p => p.name),
                   {
                     actionsAsList: true
@@ -115,7 +115,7 @@ export class WrapperATPSelector implements OnDestroy{
                 }
                 return this.#askUser(
                   null,
-                  `Parcellation **${parcellation.name}** is not mapped in the current template **${selectedATP.template.name}**. Please select one of the following templates:`,
+                  `Selected parcellation **${parcellation.name}** is not mapped in the current template **${selectedATP.template.name}**. Please select one of the following templates:`,
                   tmpls.map(tmpl => tmpl.name),
                   {
                     actionsAsList: true
diff --git a/src/ui/dialogInfo/tmpl/tmpl.style.css b/src/ui/dialogInfo/tmpl/tmpl.style.css
index 63e67f07fea53d98e2523f373fa3e82bb312f001..99437bd9504f174bedd0dc604986d842d68c600b 100644
--- a/src/ui/dialogInfo/tmpl/tmpl.style.css
+++ b/src/ui/dialogInfo/tmpl/tmpl.style.css
@@ -2,3 +2,9 @@ mat-dialog-actions a i
 {
   margin-right: 0.5rem;
 }
+
+mat-dialog-content
+{
+  display: block;
+  max-height: 30dvh;
+}
diff --git a/src/ui/dialogInfo/tmpl/tmpl.template.html b/src/ui/dialogInfo/tmpl/tmpl.template.html
index a15d70274b8b7cf6b45fd5efd89c3821862ef41b..fc99a7dd3c5fe272f770ca3cebe871025b403f58 100644
--- a/src/ui/dialogInfo/tmpl/tmpl.template.html
+++ b/src/ui/dialogInfo/tmpl/tmpl.template.html
@@ -2,27 +2,33 @@
   {{ data.title }}
 </h1>
 
-<div *ngIf="data.descMd || data.desc" mat-dialog-content class="mat-body">
-  <ng-template [ngIf]="data.desc">
-    {{ data.desc }}
-  </ng-template>
-  
-  <markdown-dom *ngIf="data.descMd" [markdown]="data.descMd">
-  </markdown-dom>
-</div>
+<mat-dialog-content>
 
-<ng-template sxplrExperimentalFlag [experimental]="true" #actionExpmt="sxplrExperimentalFlag" [ngIf]="actionExpmt.show$ | async">
-<ng-template [ngIf]="data.actionsAsList">
-  <mat-action-list>
-    <ng-template ngFor [ngForOf]="data.actions" let-action>
-      <button mat-list-item [mat-dialog-close]="action">
-        {{ action }}
-      </button>
+  <div *ngIf="data.descMd || data.desc" mat-dialog-content class="mat-body">
+    <ng-template [ngIf]="data.desc">
+      {{ data.desc }}
     </ng-template>
-  </mat-action-list>
-</ng-template>
-</ng-template>
+    
+    <markdown-dom *ngIf="data.descMd" [markdown]="data.descMd">
+    </markdown-dom>
+  </div>
+  
+  <ng-template sxplrExperimentalFlag [experimental]="true" #actionExpmt="sxplrExperimentalFlag" [ngIf]="actionExpmt.show$ | async">
+  <ng-template [ngIf]="data.actionsAsList">
+    <mat-action-list>
+      <ng-template ngFor [ngForOf]="data.actions" let-action let-first="first">
+        <ng-template [ngIf]="!first">
+          <mat-divider></mat-divider>
+        </ng-template>
+        <button mat-list-item [mat-dialog-close]="action">
+          {{ action }}
+        </button>
+      </ng-template>
+    </mat-action-list>
+  </ng-template>
+  </ng-template>
 
+</mat-dialog-content>
 
 <mat-dialog-actions align="start">