diff --git a/myteamwallet_frontend_modern/src/app/core/layout/shell/shell.scss b/myteamwallet_frontend_modern/src/app/core/layout/shell/shell.scss
index 7ac94b5..ef8036f 100644
--- a/myteamwallet_frontend_modern/src/app/core/layout/shell/shell.scss
+++ b/myteamwallet_frontend_modern/src/app/core/layout/shell/shell.scss
@@ -1,7 +1,8 @@
 :host {
   display: flex;
   flex-direction: column;
-  height: 100dvh;
+  height: calc(100dvh - var(--env-banner-height, 0px));
+  overflow: hidden;
   position: relative;
 }
 
@@ -17,6 +18,7 @@
 
 .shell-content {
   flex: 1;
+  min-height: 0;
   overflow-y: auto;
 }
 
diff --git a/myteamwallet_frontend_modern/src/app/features/public-team/public-player.scss b/myteamwallet_frontend_modern/src/app/features/public-team/public-player.scss
index d35a6cc..8bf180f 100644
--- a/myteamwallet_frontend_modern/src/app/features/public-team/public-player.scss
+++ b/myteamwallet_frontend_modern/src/app/features/public-team/public-player.scss
@@ -1,9 +1,12 @@
 :host {
-  display: block;
-  min-height: 100%;
+  display: flex;
+  flex-direction: column;
+  height: calc(100dvh - var(--env-banner-height, 0px));
+  overflow: hidden;
   // background: color-mix(in srgb, var(--mat-sys-primary-container) 18%, var(--mat-sys-surface));
 }
 .public-header {
+  flex-shrink: 0;
   height: 64px;
   padding: 0 max(20px, calc((100vw - 900px) / 2));
   display: flex;
@@ -22,6 +25,11 @@
   font-size: 1.1rem;
 }
 main {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+}
+.page {
   max-width: 900px;
   margin: 0 auto;
   padding: 28px 24px 64px;
@@ -86,7 +94,7 @@ main {
   color: var(--mat-sys-on-surface-variant);
 }
 @media (max-width: 600px) {
-  main {
+  .page {
     padding: 22px 16px 48px;
   }
 }
diff --git a/myteamwallet_frontend_modern/src/app/features/public-team/public-team.scss b/myteamwallet_frontend_modern/src/app/features/public-team/public-team.scss
index ee189f2..298b874 100644
--- a/myteamwallet_frontend_modern/src/app/features/public-team/public-team.scss
+++ b/myteamwallet_frontend_modern/src/app/features/public-team/public-team.scss
@@ -1,9 +1,12 @@
 :host {
-  display: block;
-  min-height: 100%;
+  display: flex;
+  flex-direction: column;
+  height: calc(100dvh - var(--env-banner-height, 0px));
+  overflow: hidden;
   // background: color-mix(in srgb, var(--mat-sys-primary-container) 18%, var(--mat-sys-surface));
 }
 .public-header {
+  flex-shrink: 0;
   height: 64px;
   padding: 0 max(20px, calc((100vw - 1180px) / 2));
   display: flex;
@@ -22,6 +25,11 @@
   font-size: 1.1rem;
 }
 main {
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+}
+.page {
   max-width: 1180px;
   margin: 0 auto;
   padding: 40px 24px 64px;
@@ -146,7 +154,7 @@ aside h2 {
   .content-grid {
     gap: 32px;
   }
-  main {
+  .page {
     padding: 28px 16px 48px;
   }
 }