diff --git a/src/webapp/app/(dashboard)/explore/gems-of-2025/layout.tsx b/src/webapp/app/(dashboard)/explore/gems-of-2025/(feed)/layout.tsx
similarity index 100%
rename from src/webapp/app/(dashboard)/explore/gems-of-2025/layout.tsx
rename to src/webapp/app/(dashboard)/explore/gems-of-2025/(feed)/layout.tsx
diff --git a/src/webapp/app/(dashboard)/explore/gems-of-2025/loading.tsx b/src/webapp/app/(dashboard)/explore/gems-of-2025/(feed)/loading.tsx
similarity index 100%
rename from src/webapp/app/(dashboard)/explore/gems-of-2025/loading.tsx
rename to src/webapp/app/(dashboard)/explore/gems-of-2025/(feed)/loading.tsx
diff --git a/src/webapp/app/(dashboard)/explore/gems-of-2025/page.tsx b/src/webapp/app/(dashboard)/explore/gems-of-2025/(feed)/page.tsx
similarity index 100%
rename from src/webapp/app/(dashboard)/explore/gems-of-2025/page.tsx
rename to src/webapp/app/(dashboard)/explore/gems-of-2025/(feed)/page.tsx
diff --git a/src/webapp/app/(dashboard)/explore/gems-of-2025/collections/layout.tsx b/src/webapp/app/(dashboard)/explore/gems-of-2025/collections/layout.tsx
new file mode 100644
index 00000000..b91ed598
--- /dev/null
+++ b/src/webapp/app/(dashboard)/explore/gems-of-2025/collections/layout.tsx
@@ -0,0 +1,25 @@
+import BackButton from '@/components/navigation/backButton/BackButton';
+import Header from '@/components/navigation/header/Header';
+import type { Metadata } from 'next';
+import { Fragment } from 'react';
+
+export const metadata: Metadata = {
+  title: 'Gems of 2025 Collections',
+  description: 'Gems of 2025 Collections',
+};
+
+interface Props {
+  children: React.ReactNode;
+}
+
+export default async function Layout(props: Props) {
+  return (
+    <Fragment>
+      <Header title="Gems of 2025">
+        <BackButton href="/explore/gems-of-2025">Explore</BackButton>
+      </Header>
+
+      {props.children}
+    </Fragment>
+  );
+}
diff --git a/src/webapp/app/(dashboard)/explore/gems-of-2025/collections/page.tsx b/src/webapp/app/(dashboard)/explore/gems-of-2025/collections/page.tsx
index 7ee94a8d..995ffd22 100644
--- a/src/webapp/app/(dashboard)/explore/gems-of-2025/collections/page.tsx
+++ b/src/webapp/app/(dashboard)/explore/gems-of-2025/collections/page.tsx
@@ -1,11 +1,5 @@
 import GemsCollectionsContainer from '@/features/collections/containers/gemsCollectionsContainer/GemsCollectionsContainer';
-import GemsOfYearBanner from '@/features/collections/components/gemsOfYearBanner/GemsOfYearBanner';
 
 export default function Page() {
-  return (
-    <>
-      <GemsOfYearBanner />
-      <GemsCollectionsContainer />
-    </>
-  );
+  return <GemsCollectionsContainer />;
 }
diff --git a/src/webapp/features/collections/components/gemsOfYearBanner/GemsOfYearBanner.tsx b/src/webapp/features/collections/components/gemsOfYearBanner/GemsOfYearBanner.tsx
index 8adbcdb9..3e12daff 100644
--- a/src/webapp/features/collections/components/gemsOfYearBanner/GemsOfYearBanner.tsx
+++ b/src/webapp/features/collections/components/gemsOfYearBanner/GemsOfYearBanner.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Button, Container, Group, Title } from '@mantine/core';
+import { Button, Group, Stack, Title, Text } from '@mantine/core';
 import { useState } from 'react';
 import useCollectionSearch from '../../lib/queries/useCollectionSearch';
 import CreateCollectionDrawer from '../createCollectionDrawer/CreateCollectionDrawer';
@@ -18,24 +18,27 @@ export default function GemsOfYearBanner() {
 
   return (
     <>
-      <Container p="xs" size="xl">
-        <Group justify="space-between" align="center" py="md">
-          <Title order={1} size="h2">
+      <Group justify="space-between" align="center">
+        <Stack gap={0}>
+          <Title order={1} size="h1">
             Gems of 2025
           </Title>
+          <Text fw={500} fz={'lg'}>
+            Collections from our community
+          </Text>
+        </Stack>
 
-          {!hasGemsCollection && (
-            <Button
-              variant="light"
-              color="grape"
-              leftSection={<FiPlus size={18} />}
-              onClick={() => setIsDrawerOpen(true)}
-            >
-              Create your own
-            </Button>
-          )}
-        </Group>
-      </Container>
+        {!hasGemsCollection && (
+          <Button
+            variant="light"
+            color="grape"
+            leftSection={<FiPlus size={18} />}
+            onClick={() => setIsDrawerOpen(true)}
+          >
+            Create your own
+          </Button>
+        )}
+      </Group>
 
       <CreateCollectionDrawer
         isOpen={isDrawerOpen}
diff --git a/src/webapp/features/collections/containers/gemsCollectionsContainer/GemsCollectionsContainer.tsx b/src/webapp/features/collections/containers/gemsCollectionsContainer/GemsCollectionsContainer.tsx
index 5fdd11cb..f13695ee 100644
--- a/src/webapp/features/collections/containers/gemsCollectionsContainer/GemsCollectionsContainer.tsx
+++ b/src/webapp/features/collections/containers/gemsCollectionsContainer/GemsCollectionsContainer.tsx
@@ -1,16 +1,20 @@
 'use client';
 
-import { Container, SimpleGrid } from '@mantine/core';
+import { Container, Stack } from '@mantine/core';
 import { Suspense } from 'react';
 import GemsCollectionsContainerContent from '../gemsCollectionsContainerContent/GemsCollectionsContainerContent';
 import CollectionsContainerContentSkeleton from '../collectionsContainerContent/Skeleton.collectionsContainerContent';
+import GemsOfYearBanner from '../../components/gemsOfYearBanner/GemsOfYearBanner';
 
 export default function GemsCollectionsContainer() {
   return (
     <Container p="xs" size="xl">
-      <Suspense fallback={<CollectionsContainerContentSkeleton />}>
-        <GemsCollectionsContainerContent />
-      </Suspense>
+      <Stack gap={'xl'}>
+        <GemsOfYearBanner />
+        <Suspense fallback={<CollectionsContainerContentSkeleton />}>
+          <GemsCollectionsContainerContent />
+        </Suspense>
+      </Stack>
     </Container>
   );
 }
diff --git a/src/webapp/features/home/components/gemsOf2025/GemsOf2025.tsx b/src/webapp/features/home/components/gemsOf2025/GemsOf2025.tsx
index aae86bae..d3e623f4 100644
--- a/src/webapp/features/home/components/gemsOf2025/GemsOf2025.tsx
+++ b/src/webapp/features/home/components/gemsOf2025/GemsOf2025.tsx
@@ -6,6 +6,8 @@ import Banner from '@/assets/gems-of-2025-banner.webp';
 import useCollectionSearch from '@/features/collections/lib/queries/useCollectionSearch';
 import CreateCollectionDrawer from '@/features/collections/components/createCollectionDrawer/CreateCollectionDrawer';
 import { useState } from 'react';
+import { BiCollection } from 'react-icons/bi';
+import { FiPlus } from 'react-icons/fi';
 
 export default function GemsOf2025() {
   const [isDrawerOpen, setIsDrawerOpen] = useState(false);
@@ -45,36 +47,25 @@ export default function GemsOf2025() {
             <Group gap={'xs'} justify="center">
               <Button
                 component={Link}
-                href="/explore/gems-of-2025"
-                size="md"
+                href="/explore/gems-of-2025/collections"
+                size="sm"
                 variant="white"
                 color={'blue.8'}
+                leftSection={<BiCollection size={18} />}
               >
-                Explore
+                View Gems
               </Button>
-              {!isLoadingSearchResults && (
-                <>
-                  {hasGemsCollection ? (
-                    <Button
-                      component={Link}
-                      href="/explore/gems-of-2025/collections"
-                      size="md"
-                      variant="white"
-                      color={'grape'}
-                    >
-                      View collections
-                    </Button>
-                  ) : (
-                    <Button
-                      size="md"
-                      variant="white"
-                      color="grape"
-                      onClick={() => setIsDrawerOpen(true)}
-                    >
-                      Create your collection
-                    </Button>
-                  )}
-                </>
+
+              {!isLoadingSearchResults && !hasGemsCollection && (
+                <Button
+                  size="sm"
+                  variant="white"
+                  color={'grape'}
+                  leftSection={<FiPlus size={18} />}
+                  onClick={() => setIsDrawerOpen(true)}
+                >
+                  Create Your Collection
+                </Button>
               )}
             </Group>
           </Stack>