diff --git a/VERSION b/VERSION
index 8384713..a003776 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.11.4
+6.11.5
diff --git a/play-life-web/package.json b/play-life-web/package.json
index 74af37a..4869aef 100644
--- a/play-life-web/package.json
+++ b/play-life-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "play-life-web",
-  "version": "6.11.4",
+  "version": "6.11.5",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/play-life-web/src/components/ShoppingList.css b/play-life-web/src/components/ShoppingList.css
index 11821b5..68310a2 100644
--- a/play-life-web/src/components/ShoppingList.css
+++ b/play-life-web/src/components/ShoppingList.css
@@ -4,10 +4,23 @@
   padding-bottom: 2.5rem;
 }
 
-.close-x-button {
-  position: fixed;
-  top: 1rem;
-  right: 1rem;
+.shopping-header {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  max-width: 42rem;
+  margin: 0 auto;
+  padding-top: 1rem;
+}
+
+.shopping-header .board-selector {
+  flex: 1;
+  max-width: none;
+  margin: 0;
+}
+
+.shopping-close-btn {
+  flex-shrink: 0;
   background: rgba(255, 255, 255, 0.9);
   border: none;
   font-size: 1.5rem;
@@ -20,15 +33,19 @@
   justify-content: center;
   border-radius: 50%;
   transition: background-color 0.2s, color 0.2s;
-  z-index: 1600;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
 }
 
-.close-x-button:hover {
+.shopping-close-btn:hover {
   background-color: #ffffff;
   color: #2c3e50;
 }
 
+.shopping-header .board-pill {
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  border-color: transparent;
+}
+
 .shopping-empty {
   text-align: center;
   padding: 3rem 1rem;
diff --git a/play-life-web/src/components/ShoppingList.jsx b/play-life-web/src/components/ShoppingList.jsx
index 41e77c3..8391577 100644
--- a/play-life-web/src/components/ShoppingList.jsx
+++ b/play-life-web/src/components/ShoppingList.jsx
@@ -531,15 +531,17 @@ function ShoppingList({ onNavigate, refreshTrigger = 0, isActive = false, initia
 
   return (
     <div className="shopping-list">
-      <button className="close-x-button" onClick={() => window.history.back()}>✕</button>
-      <BoardSelector
-        boards={boards}
-        selectedBoardId={selectedBoardId}
-        onBoardChange={handleBoardChange}
-        onBoardEdit={handleBoardEdit}
-        onAddBoard={handleAddBoard}
-        loading={boardsLoading}
-      />
+      <div className="shopping-header">
+        <BoardSelector
+          boards={boards}
+          selectedBoardId={selectedBoardId}
+          onBoardChange={handleBoardChange}
+          onBoardEdit={handleBoardEdit}
+          onAddBoard={handleAddBoard}
+          loading={boardsLoading}
+        />
+        <button className="shopping-close-btn" onClick={() => window.history.back()}>✕</button>
+      </div>
 
       {boards.length === 0 && !boardsLoading && (
         <div className="shopping-empty">
diff --git a/play-life-web/src/components/Wishlist.css b/play-life-web/src/components/Wishlist.css
index 8681c4a..e31f103 100644
--- a/play-life-web/src/components/Wishlist.css
+++ b/play-life-web/src/components/Wishlist.css
@@ -478,3 +478,11 @@
   transform: translateY(-1px);
 }
 
+
+.wishlist .board-pill {
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+}
+
+.wishlist .board-pill {
+  border-color: transparent;
+}