diff --git a/AquaNet/src/components/MapDetails.svelte b/AquaNet/src/components/MapDetails.svelte
index b81c6803..ae01fd7f 100644
--- a/AquaNet/src/components/MapDetails.svelte
+++ b/AquaNet/src/components/MapDetails.svelte
@@ -17,21 +17,21 @@
   let mult = getMult(mapData[3], game)
   let mapRank = parseFloat(meta.notes?.[mapData[1] === 10 ? 0 : mapData[1]]?.lv?.toFixed(1) ?? mapData[1] ?? '0')
   </script>
-  
+
   <div class="map-detail-container" transition:slide>
     <div class="scores">
       <div>
         <img src={`${DATA_HOST}/d/mai2/music/00${mapData[0].toString().padStart(6, '0').substring(2)}.png`} alt="" on:error={coverNotFound} />
         <div class="info">
-          <div class="firstline">
+          <div class="first-line">
             <div class="song-title">{meta.name ?? t("UserHome.UnknownSong")}</div>
             <span class={`lv level-${mapData[1] === 10 ? 3 : mapData[1]}`}>
               { mapRank }
             </span>
           </div>
-          <div>
+          <div class="second-line">
             <span class={`rank-${getMult(mapData[3], game)[2].toString()[0]}`}>
-            
+
               <span class="rank-text">{("" + getMult(mapData[3], game)[2]).replace("p", "+")}</span>
               <span class="rank-num">{(mapData[3] / 10000).toFixed(2)}%</span>
             </span>
@@ -45,16 +45,17 @@
       </div>
     </div>
   </div>
-  
+
   <style lang="sass">
-    
+
     @import "../vars"
     $gap: 20px
 
     .map-detail-container
       background-color: rgb(35,35,35)
       border-radius: $border-radius
-      max-width: 250px
+      overflow: hidden
+
       .scores
         display: flex
         flex-direction: column
@@ -68,7 +69,7 @@
           gap: 12px
           max-width: 100%
           box-sizing: border-box
-          
+
           img
             width: 50px
             height: 50px
@@ -82,8 +83,8 @@
             justify-content: space-between
             overflow: hidden
             flex-direction: column
-            
-            .firstline
+
+            .first-line
               display: flex
               flex-direction: row
 
@@ -123,13 +124,20 @@
             text-align: center
             background: rgba(var(--lv-color), 0.6)
             padding: 0 6px
-            border-radius: $border-radius
-            margin-right: 6px
+            border-radius: 0 $border-radius 0 $border-radius
+
+            // Inset shadow, like it's a paper below this card with a cut
+            box-shadow: inset 0 0 10px rgba(0,0,0,0.5)
 
           span
             display: inline-block
             text-align: left
 
+          .second-line
+            display: flex
+            justify-content: space-between
+            align-items: center
+
           // Vertical table-like alignment
           span.rank-text
             min-width: 40px
@@ -143,4 +151,3 @@
             content: "+"
           color: $c-good
   </style>
-  
\ No newline at end of file
diff --git a/AquaNet/src/libs/ui.ts b/AquaNet/src/libs/ui.ts
index 14fe0c74..8aa26e93 100644
--- a/AquaNet/src/libs/ui.ts
+++ b/AquaNet/src/libs/ui.ts
@@ -119,7 +119,7 @@ export function tooltip(element: HTMLElement, params: { text: string } | string)
 
     // Initially hidden
     div.style.display = 'none'
-    
+
     document.body.appendChild(div)
   }
 
diff --git a/AquaNet/src/pages/UserHome.svelte b/AquaNet/src/pages/UserHome.svelte
index 1b908ebb..d631f587 100644
--- a/AquaNet/src/pages/UserHome.svelte
+++ b/AquaNet/src/pages/UserHome.svelte
@@ -230,13 +230,12 @@
         </div>
       </div>
     </div>
-    
+
     <div>
       <h2>B35</h2>
-      <div style="display: flex; flex-wrap: wrap; gap: 12px; item-align: center; align-content: flex-start">
+      <div class="b35">
         {#each d.user.ratingComposition.best35.split(",") as map}
-        <!-- TODO: fix flex: 1 0 -->
-          <div style="width:260px;">
+          <div>
             <MapDetails g={map} meta={allMusics[map.split(":")[0]]} game={game}/>
           </div>
         {/each}
@@ -529,4 +528,11 @@ $gap: 20px
         &:before
           content: "+"
         color: $c-good
+
+.b35
+  display: grid
+  // 3 columns
+  grid-template-columns: repeat(auto-fill, minmax(260px, 1fr))
+  gap: $gap
+
 </style>