diff --git a/src/lib/components/collection/CollectionFilters.svelte b/src/lib/components/collection/CollectionFilters.svelte
index cc3baa9b..034686d5 100644
--- a/src/lib/components/collection/CollectionFilters.svelte
+++ b/src/lib/components/collection/CollectionFilters.svelte
@@ -289,6 +289,7 @@
 				bind:value={elementFilters}
 				onValueChange={handleElementChange}
 				placeholder="Element"
+				contained
 			/>
 		{/if}
 
@@ -298,6 +299,7 @@
 				bind:value={rarityFilters}
 				onValueChange={handleRarityChange}
 				placeholder="Rarity"
+				contained
 			/>
 		{/if}
 
@@ -307,6 +309,7 @@
 				bind:value={seasonFilters}
 				onValueChange={handleSeasonChange}
 				placeholder="Season"
+				contained
 			/>
 		{/if}
 
@@ -316,6 +319,7 @@
 				bind:value={seriesFilters}
 				onValueChange={handleSeriesChange}
 				placeholder={entityType === 'weapon' ? 'Weapon Series' : 'Series'}
+				contained
 			/>
 		{/if}
 
@@ -325,6 +329,7 @@
 				bind:value={raceFilters}
 				onValueChange={handleRaceChange}
 				placeholder="Race"
+				contained
 			/>
 		{/if}
 
@@ -334,6 +339,7 @@
 				bind:value={proficiencyFilters}
 				onValueChange={handleProficiencyChange}
 				placeholder={entityType === 'weapon' ? 'Weapon Type' : 'Proficiency'}
+				contained
 			/>
 		{/if}
 
@@ -343,6 +349,7 @@
 				bind:value={genderFilters}
 				onValueChange={handleGenderChange}
 				placeholder="Gender"
+				contained
 			/>
 		{/if}
 
@@ -384,6 +391,7 @@
 					bind:value={sortBy}
 					onValueChange={handleSortChange}
 					size="small"
+					contained
 				/>
 			</div>
 		{/if}
diff --git a/src/routes/(app)/[username]/collection/+layout.svelte b/src/routes/(app)/[username]/collection/+layout.svelte
index 270a65d6..9d142e19 100644
--- a/src/routes/(app)/[username]/collection/+layout.svelte
+++ b/src/routes/(app)/[username]/collection/+layout.svelte
@@ -57,52 +57,58 @@
 
 <section class="collection">
 	<ProfileHeader
-		{username}
+		username={username ?? ''}
 		avatarPicture={data.user?.avatar?.picture}
-		title={username}
+		element={data.user?.avatar?.element}
+		granblueId={data.user?.granblueId}
+		showCrewGamertag={data.user?.showCrewGamertag}
+		crewGamertag={data.user?.crewGamertag}
+		title={username ?? ''}
 		activeTab="collection"
 		isOwner={data.isOwner}
 	/>
 
-	<!-- Entity type segmented control -->
-	<nav class="entity-nav" aria-label="Collection type">
-		<SegmentedControl
-			value={activeEntityType}
-			onValueChange={handleTabChange}
-			variant="blended"
-			size="small"
-		>
-			<Segment value="characters">Characters</Segment>
-			<Segment value="weapons">Weapons</Segment>
-			<Segment value="summons">Summons</Segment>
-			<Segment value="artifacts">Artifacts</Segment>
-		</SegmentedControl>
-
-		{#if data.isOwner && supportsAddModal}
-			<Button
-				variant="primary"
+	<div class="card-container">
+		<!-- Entity type segmented control -->
+		<nav class="entity-nav" aria-label="Collection type">
+			<SegmentedControl
+				value={activeEntityType}
+				onValueChange={handleTabChange}
+				variant="blended"
 				size="small"
-				onclick={() => (addModalOpen = true)}
-				icon="plus"
-				iconPosition="left"
 			>
-				{addButtonText}
-			</Button>
-		{:else if data.isOwner && isArtifacts}
-			<Button
-				variant="primary"
-				size="small"
-				onclick={handleAddArtifact}
-				icon="plus"
-				iconPosition="left"
-			>
-				Add artifact
-			</Button>
-		{/if}
-	</nav>
+				<Segment value="characters">Characters</Segment>
+				<Segment value="weapons">Weapons</Segment>
+				<Segment value="summons">Summons</Segment>
+				<Segment value="artifacts">Artifacts</Segment>
+			</SegmentedControl>
 
-	<div class="content">
-		{@render children()}
+			{#if data.isOwner && supportsAddModal}
+				<Button
+					variant="primary"
+					size="small"
+					onclick={() => (addModalOpen = true)}
+					icon="plus"
+					iconPosition="left"
+				>
+					{addButtonText}
+				</Button>
+			{:else if data.isOwner && isArtifacts}
+				<Button
+					variant="primary"
+					size="small"
+					onclick={handleAddArtifact}
+					icon="plus"
+					iconPosition="left"
+				>
+					Add artifact
+				</Button>
+			{/if}
+		</nav>
+
+		<div class="content">
+			{@render children()}
+		</div>
 	</div>
 </section>
 
@@ -116,24 +122,28 @@
 
 <style lang="scss">
 	@use '$src/themes/spacing' as *;
+	@use '$src/themes/layout' as *;
 
 	.collection {
 		padding: $unit-2x 0;
 	}
 
+	.card-container {
+		background: var(--card-bg);
+		border-radius: $card-corner;
+	}
+
 	.entity-nav {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
 		gap: $unit-2x;
-		margin-bottom: $unit-2x;
-
-		:global(.button) {
-			align-self: stretch;
-		}
+		padding: $unit-2x;
+		border-bottom: 1px solid var(--border-subtle);
 	}
 
 	.content {
+		padding: $unit-2x;
 		min-height: 400px;
 	}
 </style>