diff --git a/packages/fakeyou.com/src/components/common/Panel/Panel.tsx b/packages/fakeyou.com/src/components/common/Panel/Panel.tsx
index 25e1d4281e..7b2f6ef07b 100644
--- a/packages/fakeyou.com/src/components/common/Panel/Panel.tsx
+++ b/packages/fakeyou.com/src/components/common/Panel/Panel.tsx
@@ -5,18 +5,15 @@ interface PanelProps {
   padding?: boolean;
   mb?: boolean;
   mt?: boolean;
-  full?: boolean;
 }
 
-export default function Panel({ children, padding, mb, mt, full }: PanelProps) {
+export default function Panel({ children, padding, mb, mt }: PanelProps) {
   return (
-    <div className={full ? "container-panel mw-100" : "container-panel"}>
-      <div
-        className={`panel ${padding ? "p-3 py-4 p-md-4" : ""}
+    <div
+      className={`panel rounded ${padding ? "p-3 py-4 p-md-4" : ""}
         ${mb ? "mb-4" : ""} ${mt ? "mt-4" : ""}`}
-      >
-        {children}
-      </div>
+    >
+      {children}
     </div>
   );
 }
diff --git a/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx b/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx
index f62b1cade1..2dfedb1d2c 100644
--- a/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx
+++ b/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx
@@ -37,7 +37,7 @@ export default function PageHeader({
 
   return (
     <div className="pt-3 pb-4 pt-lg-4">
-      <Panel padding full={full}>
+      <Panel padding>
         <div className="d-flex flex-column gap-4">
           <div>
             <div className="d-flex">
diff --git a/packages/fakeyou.com/src/components/layout/PageHeaderModelView/PageHeaderModelView.tsx b/packages/fakeyou.com/src/components/layout/PageHeaderModelView/PageHeaderModelView.tsx
index 331e477565..871b610374 100644
--- a/packages/fakeyou.com/src/components/layout/PageHeaderModelView/PageHeaderModelView.tsx
+++ b/packages/fakeyou.com/src/components/layout/PageHeaderModelView/PageHeaderModelView.tsx
@@ -35,7 +35,7 @@ export default function PageHeaderModelView({
   return (
     <div className="pt-3 pb-4 pt-lg-4">
       {view === "regular" && (
-        <Panel padding full={full}>
+        <Panel padding>
           <div className="row gy-3">
             <div className="col-12 col-lg-8">
               <h2 className="fw-bold">
diff --git a/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx b/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx
index 51c2a7f5f8..293483ab78 100644
--- a/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx
@@ -33,7 +33,7 @@ interface MediaPageProps {
 // Dummy media data (replace with actual API data)
 let dummyMediaData = {
   token: "m_v032bt6ecm0rwhebbhgdmk5rexf7cij",
-  media_type: MediaType.Video, // Change to somthing like "video" or "image" to test different types
+  media_type: MediaType.Audio, // Change to somthing like "video" or "image" to test different types
   public_bucket_path:
     "/media/8/p/c/h/h/8pchhrgc0ayawn09s9gmtfec2mcft0xk/fakeyou_8pchhrgc0ayawn09s9gmtfec2mcft0xk.mp4", // Replace with actual URLs
   maybe_creator_user: {
@@ -82,7 +82,7 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) {
     switch (data.media_type) {
       case MediaType.Audio:
         return (
-          <div className="d-flex flex-column gap-4">
+          <div className="panel p-3 p-lg-4 d-flex flex-column gap-4 rounded">
             <MediaAudioComponent mediaData={data} />
             <div>
               <h5 className="fw-semibold">
@@ -97,7 +97,7 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) {
         );
       case MediaType.Video:
         return (
-          <div className="ratio ratio-16x9">
+          <div className="panel ratio ratio-16x9">
             <MediaVideoComponent mediaData={data} />
           </div>
         );
@@ -298,9 +298,9 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) {
       </Container>
 
       <Container type="padded">
-        <div className="row g-4">
+        <div className="row g-4 mb-4">
           <div className="col-12 col-xl-8">
-            <div className="panel media-wrapper rounded">
+            <div className="media-wrapper">
               {renderMediaComponent(mediaData)}
             </div>
 
@@ -370,14 +370,16 @@ export default function MediaPage({ sessionWrapper }: MediaPageProps) {
       </Container>
 
       <div className="d-xl-none mt-4">
-        <Panel padding>
-          <h4 className="fw-semibold mb-3">Comments</h4>
-          <CommentComponent
-            entityType="user"
-            entityToken={mediaData.token}
-            sessionWrapper={sessionWrapper}
-          />
-        </Panel>
+        <Container type="padded">
+          <Panel>
+            <h4 className="fw-semibold mb-3">Comments</h4>
+            <CommentComponent
+              entityType="user"
+              entityToken={mediaData.token}
+              sessionWrapper={sessionWrapper}
+            />
+          </Panel>
+        </Container>
       </div>
     </>
   );