diff --git a/apps/web/src/components/OfflineQueueManager.tsx b/apps/web/src/components/OfflineQueueManager.tsx
index f4b82b9cd..2a69a7fdc 100644
--- a/apps/web/src/components/OfflineQueueManager.tsx
+++ b/apps/web/src/components/OfflineQueueManager.tsx
@@ -147,7 +147,7 @@ export function OfflineQueueManager({
             <p className="text-sm">All requests have been processed</p>
           </div>
         ) : (
-          <div className="space-y-2 max-h-[400px] overflow-y-auto custom-scrollbar">
+          <div className="space-y-2 max-h-layout-list overflow-y-auto custom-scrollbar">
             {queue.map((request) => (
               <div
                 key={request.id}
diff --git a/apps/web/src/components/developer/APIPlaygroundView.tsx b/apps/web/src/components/developer/APIPlaygroundView.tsx
index 456f59633..fc4120737 100644
--- a/apps/web/src/components/developer/APIPlaygroundView.tsx
+++ b/apps/web/src/components/developer/APIPlaygroundView.tsx
@@ -132,7 +132,7 @@ export const APIPlaygroundView: React.FC = () => {
             <div className="flex-1 bg-black/30 rounded border border-kodo-steel/50 p-4 relative group">
               {response ? (
                 <>
-                  <pre className="text-xs text-kodo-lime font-mono whitespace-pre-wrap overflow-auto h-full max-h-[500px]">
+                  <pre className="text-xs text-kodo-lime font-mono whitespace-pre-wrap overflow-auto h-full max-h-layout-drawer">
                     {response}
                   </pre>
                   <button
diff --git a/apps/web/src/components/developer/modals/CreateAPIKeyModal.tsx b/apps/web/src/components/developer/modals/CreateAPIKeyModal.tsx
index 37ae04e31..996405ea4 100644
--- a/apps/web/src/components/developer/modals/CreateAPIKeyModal.tsx
+++ b/apps/web/src/components/developer/modals/CreateAPIKeyModal.tsx
@@ -96,7 +96,7 @@ export const CreateAPIKeyModal: React.FC<CreateAPIKeyModalProps> = ({
         className="absolute inset-0 bg-kodo-void/90 backdrop-blur-md"
         onClick={step === 1 ? onClose : undefined}
       ></div>
-      <div className="relative w-full max-w-2xl bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden glass-hud flex flex-col max-h-[85vh]">
+      <div className="relative w-full max-w-2xl bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden glass-hud flex flex-col max-h-layout-modal">
         {/* Header - Fixed */}
         <div className="p-6 border-b border-kodo-steel/50 flex justify-between items-center bg-white/5 flex-none z-10">
           <h3 className="text-xl font-bold text-white flex items-center gap-3 font-display">
@@ -248,7 +248,7 @@ export const CreateAPIKeyModal: React.FC<CreateAPIKeyModalProps> = ({
           ) : (
             <Button
               onClick={onClose}
-              className="bg-kodo-cyan hover:bg-kodo-cyan/80 text-black font-semibold min-w-[100px] shadow-button-primary-glow hover:shadow-button-primary-glow-hover transition-all duration-[var(--duration-normal)]"
+              className="bg-kodo-cyan hover:bg-kodo-cyan/80 text-black font-semibold min-w-24 shadow-button-primary-glow hover:shadow-button-primary-glow-hover transition-all duration-[var(--duration-normal)]"
             >
               Done
             </Button>
diff --git a/apps/web/src/components/education/modals/QuizModal.tsx b/apps/web/src/components/education/modals/QuizModal.tsx
index 3d0680f2a..64fd2bfa1 100644
--- a/apps/web/src/components/education/modals/QuizModal.tsx
+++ b/apps/web/src/components/education/modals/QuizModal.tsx
@@ -104,7 +104,7 @@ export const QuizModal: React.FC<QuizModalProps> = ({
   return (
     <div className="fixed inset-0 z-[100] flex items-center justify-center p-4">
       <div className="absolute inset-0 bg-kodo-void/90 backdrop-blur-sm"></div>
-      <div className="relative w-full max-w-2xl bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-[80vh]">
+      <div className="relative w-full max-w-2xl bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-layout-modal-sm">
         {/* Header */}
         <div className="p-4 border-b border-kodo-steel bg-kodo-ink flex justify-between items-center">
           <h3 className="font-bold text-white flex items-center gap-2">
diff --git a/apps/web/src/components/library/playlists/AddToPlaylistModal.tsx b/apps/web/src/components/library/playlists/AddToPlaylistModal.tsx
index 92ba702c4..915cb14ef 100644
--- a/apps/web/src/components/library/playlists/AddToPlaylistModal.tsx
+++ b/apps/web/src/components/library/playlists/AddToPlaylistModal.tsx
@@ -75,7 +75,7 @@ export const AddToPlaylistModal: React.FC<AddToPlaylistModalProps> = ({
         className="absolute inset-0 bg-kodo-void/90 backdrop-blur-sm"
         onClick={onClose}
       ></div>
-      <div className="relative w-full max-w-md bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-[70vh]">
+      <div className="relative w-full max-w-md bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-layout-modal-xs">
         <div className="p-4 border-b border-kodo-steel bg-kodo-ink flex justify-between items-center">
           <h3 className="font-bold text-white">Add to Playlist</h3>
           <button onClick={onClose}>
diff --git a/apps/web/src/components/marketplace/modals/LicenceDetailsModal.tsx b/apps/web/src/components/marketplace/modals/LicenceDetailsModal.tsx
index 4994b3eba..9b0899d53 100644
--- a/apps/web/src/components/marketplace/modals/LicenceDetailsModal.tsx
+++ b/apps/web/src/components/marketplace/modals/LicenceDetailsModal.tsx
@@ -20,7 +20,7 @@ export const LicenceDetailsModal: React.FC<LicenceDetailsModalProps> = ({
         className="absolute inset-0 bg-kodo-void/90 backdrop-blur-sm"
         onClick={onClose}
       ></div>
-      <div className="relative w-full max-w-lg bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-[80vh]">
+      <div className="relative w-full max-w-lg bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-layout-modal-sm">
         <div className="p-4 border-b border-kodo-steel bg-kodo-ink flex justify-between items-center">
           <h3 className="font-bold text-white flex items-center gap-2">
             <ShieldCheck className="w-5 h-5 text-kodo-steel" /> License Agreement
diff --git a/apps/web/src/components/modals/CreatorModal.tsx b/apps/web/src/components/modals/CreatorModal.tsx
index c059e5238..6ab21c1a2 100644
--- a/apps/web/src/components/modals/CreatorModal.tsx
+++ b/apps/web/src/components/modals/CreatorModal.tsx
@@ -35,7 +35,7 @@ export const CreatorModal: React.FC<CreatorModalProps> = ({
         className="absolute inset-0 bg-kodo-void/90 backdrop-blur-sm"
         onClick={onClose}
       ></div>
-      <div className="relative w-full max-w-4xl bg-kodo-graphite border border-kodo-steel rounded-2xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-[90vh]">
+      <div className="relative w-full max-w-4xl bg-kodo-graphite border border-kodo-steel rounded-2xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-layout-modal-lg">
         {/* Header */}
         <div className="flex justify-between items-center p-8 border-b border-kodo-steel bg-kodo-ink">
           <div className="flex items-center gap-4">
diff --git a/apps/web/src/components/notifications/NotificationBell.tsx b/apps/web/src/components/notifications/NotificationBell.tsx
index 92560ab7f..92d3e9186 100644
--- a/apps/web/src/components/notifications/NotificationBell.tsx
+++ b/apps/web/src/components/notifications/NotificationBell.tsx
@@ -50,7 +50,7 @@ export const NotificationBell: React.FC<NotificationBellProps> = ({
       </Button>
 
       {isOpen && (
-        <div className="absolute top-full right-0 mt-4 w-96 bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl overflow-hidden animate-fadeIn origin-top-right ring-1 ring-white/5 flex flex-col max-h-[80vh]">
+        <div className="absolute top-full right-0 mt-4 w-96 bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl overflow-hidden animate-fadeIn origin-top-right ring-1 ring-white/5 flex flex-col max-h-layout-modal-sm">
           <div className="p-4 border-b border-kodo-steel/50 flex justify-between items-center bg-kodo-ink">
             <div>
               <h3 className="font-bold text-white">Notifications</h3>
diff --git a/apps/web/src/components/player/FullPlayer.tsx b/apps/web/src/components/player/FullPlayer.tsx
index 5673e559f..4b58304ed 100644
--- a/apps/web/src/components/player/FullPlayer.tsx
+++ b/apps/web/src/components/player/FullPlayer.tsx
@@ -71,7 +71,7 @@ export const FullPlayer: React.FC<FullPlayerProps> = ({ onClose }) => {
           className={`flex flex-col items-center md:items-start text-center md:text-left transition-all duration-[var(--duration-slow)] ${showLyrics ? 'md:w-1/3' : 'md:w-1/2'}`}
         >
           <div
-            className="aspect-square w-full max-w-[400px] rounded-2xl overflow-hidden shadow-2xl mb-8 border border-white/10 relative group cursor-pointer"
+            className="aspect-square w-full max-w-lg rounded-2xl overflow-hidden shadow-2xl mb-8 border border-white/10 relative group cursor-pointer"
             onClick={() => setShowLyrics(!showLyrics)}
           >
             <img
@@ -101,7 +101,7 @@ export const FullPlayer: React.FC<FullPlayerProps> = ({ onClose }) => {
 
         {/* Right: Lyrics View */}
         {showLyrics && (
-          <div className="flex-1 h-[60vh] w-full md:w-auto animate-slideInRight">
+          <div className="flex-1 h-layout-lyrics w-full md:w-auto animate-slideInRight">
             <LyricsPanel />
           </div>
         )}
diff --git a/apps/web/src/components/player/QueuePanel.tsx b/apps/web/src/components/player/QueuePanel.tsx
index e4c7ed844..276cfde19 100644
--- a/apps/web/src/components/player/QueuePanel.tsx
+++ b/apps/web/src/components/player/QueuePanel.tsx
@@ -12,7 +12,7 @@ export function QueuePanel({ onClose }: QueuePanelProps) {
     usePlayerStore();
 
   return (
-    <div className="fixed bottom-16 right-4 w-96 bg-background border border-border rounded-lg shadow-lg z-40 max-h-[400px] flex flex-col">
+    <div className="fixed bottom-16 right-4 w-96 bg-background border border-border rounded-lg shadow-lg z-40 max-h-layout-list flex flex-col">
       <div className="p-4 border-b border-border flex items-center justify-between">
         <h3 className="font-semibold">Queue</h3>
         <Button variant="ghost" size="icon" onClick={onClose}>
diff --git a/apps/web/src/components/seller/modals/FlashSaleModal.tsx b/apps/web/src/components/seller/modals/FlashSaleModal.tsx
index 82d7f65ab..c1a5a774f 100644
--- a/apps/web/src/components/seller/modals/FlashSaleModal.tsx
+++ b/apps/web/src/components/seller/modals/FlashSaleModal.tsx
@@ -41,7 +41,7 @@ export const FlashSaleModal: React.FC<FlashSaleModalProps> = ({
         className="absolute inset-0 bg-kodo-void/90 backdrop-blur-sm"
         onClick={onClose}
       ></div>
-      <div className="relative w-full max-w-2xl bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-[85vh]">
+      <div className="relative w-full max-w-2xl bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-layout-modal">
         <div className="p-4 border-b border-kodo-steel bg-kodo-ink flex justify-between items-center">
           <h3 className="font-bold text-white flex items-center gap-2">
             <Zap className="w-5 h-5 text-kodo-gold" /> Start Flash Sale
diff --git a/apps/web/src/components/upload/BulkUploadModal.tsx b/apps/web/src/components/upload/BulkUploadModal.tsx
index 3f4c9237c..0b2530b6a 100644
--- a/apps/web/src/components/upload/BulkUploadModal.tsx
+++ b/apps/web/src/components/upload/BulkUploadModal.tsx
@@ -31,7 +31,7 @@ export const BulkUploadModal: React.FC<BulkUploadModalProps> = ({
         className="absolute inset-0 bg-background/90 backdrop-blur-sm"
         onClick={onClose}
       ></div>
-      <div className="relative w-full max-w-3xl bg-card border border-border rounded-2xl shadow-2xl overflow-hidden flex flex-col max-h-[80vh] animate-scaleIn">
+      <div className="relative w-full max-w-3xl bg-card border border-border rounded-2xl shadow-2xl overflow-hidden flex flex-col max-h-layout-modal-sm animate-scaleIn">
         {/* Header */}
         <div className="p-8 border-b border-border bg-muted flex justify-between items-center">
           <div>
diff --git a/apps/web/src/components/upload/metadata/LyricsEditorModal.tsx b/apps/web/src/components/upload/metadata/LyricsEditorModal.tsx
index 100aeb587..01cd0a8c2 100644
--- a/apps/web/src/components/upload/metadata/LyricsEditorModal.tsx
+++ b/apps/web/src/components/upload/metadata/LyricsEditorModal.tsx
@@ -39,7 +39,7 @@ export const LyricsEditorModal: React.FC<LyricsEditorModalProps> = ({
         className="absolute inset-0 bg-background/90 backdrop-blur-sm"
         onClick={onClose}
       ></div>
-      <div className="relative w-full max-w-2xl bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-[85vh]">
+      <div className="relative w-full max-w-2xl bg-kodo-graphite border border-kodo-steel rounded-xl shadow-2xl animate-scaleIn overflow-hidden flex flex-col max-h-layout-modal">
         <div className="p-4 border-b border-border bg-muted flex justify-between items-center">
           <h3 className="font-bold text-white flex items-center gap-2">
             <Mic2 className="w-4 h-4 text-kodo-steel" /> Lyrics Editor
diff --git a/apps/web/src/features/tracks/pages/track-detail-page/TrackDetailPageHero.tsx b/apps/web/src/features/tracks/pages/track-detail-page/TrackDetailPageHero.tsx
index 2e7656700..e3a6f2a7c 100644
--- a/apps/web/src/features/tracks/pages/track-detail-page/TrackDetailPageHero.tsx
+++ b/apps/web/src/features/tracks/pages/track-detail-page/TrackDetailPageHero.tsx
@@ -7,7 +7,7 @@ interface TrackDetailPageHeroProps {
 export function TrackDetailPageHero({ track }: TrackDetailPageHeroProps) {
   const coverUrl = (track as { cover_art_path?: string }).cover_art_path;
   return (
-    <div className="absolute inset-0 h-[60vh] overflow-hidden pointer-events-none">
+    <div className="absolute inset-0 h-layout-lyrics overflow-hidden pointer-events-none">
       <div
         className="absolute inset-x-0 -top-40 h-[150%] opacity-20 blur-[120px] scale-110"
         style={{
diff --git a/apps/web/src/features/tracks/pages/track-detail-page/TrackDetailPageSkeleton.tsx b/apps/web/src/features/tracks/pages/track-detail-page/TrackDetailPageSkeleton.tsx
index a01ad8697..48aaf3fdb 100644
--- a/apps/web/src/features/tracks/pages/track-detail-page/TrackDetailPageSkeleton.tsx
+++ b/apps/web/src/features/tracks/pages/track-detail-page/TrackDetailPageSkeleton.tsx
@@ -3,7 +3,7 @@ import { Card } from '@/components/ui/card';
 export function TrackDetailPageSkeleton() {
   return (
     <div className="min-h-layout-page pb-24 relative overflow-hidden bg-background transition-opacity duration-[var(--duration-normal)]">
-      <div className="absolute inset-0 h-[60vh] bg-muted/30 pointer-events-none" />
+      <div className="absolute inset-0 h-layout-lyrics bg-muted/30 pointer-events-none" />
       <div className="container mx-auto px-4 relative z-10 pt-8">
         <div className="h-10 w-24 bg-muted animate-pulse rounded-full mb-8" />
         <div className="grid grid-cols-1 lg:grid-cols-12 gap-12 items-start">