diff --git a/data/2024/week07.md b/data/2024/week07.md
new file mode 100644
index 0000000..8c95ac3
--- /dev/null
+++ b/data/2024/week07.md
@@ -0,0 +1,3 @@
+---
+curator: Mykola
+---
\ No newline at end of file
diff --git a/web/src/components/WeekNews.astro b/web/src/components/WeekNews.astro
index ddc70bb..34ce358 100644
--- a/web/src/components/WeekNews.astro
+++ b/web/src/components/WeekNews.astro
@@ -12,10 +12,10 @@ const current = false;
     
     <div class=`flex w-full p-4 sm:p-6 ${!issue.published ? "bg-blue-950" : "bg-white/10"}`>
         <div class="grid gap-2 sm:gap-6 sm:flex items-center">
-            <h1 class="text-2xl"><a href={issue.published} class=`${!issue.published ? 'no-underline' : ''}`>Week {issue.week.split('-').join('/')}</a></h1>
+            <h1 class="text-2xl"><a href=`/issue/${issue.week}`>Week {issue.week.split('-').join('/')}</a></h1>
             <div class=`text-xl ${current ? "text-white/50" : ""}`>{format(issue.period[0], "MMM d")} - {format(issue.period[1], "MMM d, yyyy")}</div>
             {!issue.published &&
-                <div class="text-white">🚧 Current week</div>
+                <div class="text-white">🚧 Future edition</div>
             }
         </div>
         <div class="grow"></div>
diff --git a/web/src/layouts/base.astro b/web/src/layouts/base.astro
index ac73a39..0e202a4 100644
--- a/web/src/layouts/base.astro
+++ b/web/src/layouts/base.astro
@@ -19,13 +19,16 @@ import '../styles/base.css';
                 </div>
                 <div class="grow"></div>
                 <div class="flex gap-3 mt-4 md:mt-0">
-                    <a href="https://docs.web3privacy.info/news/week-in-the-privacy">Documentation</a>
-                    <a href="https://github.com/web3privacy/news">Source code</a>
+                    <a href="https://paragraph.xyz/@privacynews/subscribe">Subscribe now!</a>
                 </div>
             </div>
             <div class="mt-10">
                 <slot />
             </div>
         </div>
+        <div class="flex gap-6 mt-4 mb-10 items-center justify-center">
+            <a href="https://docs.web3privacy.info/news/week-in-the-privacy">Documentation</a>
+            <a href="https://github.com/web3privacy/news">Source code</a>
+        </div>
 	</body>
 </html>
\ No newline at end of file
diff --git a/web/src/pages/index.astro b/web/src/pages/index.astro
index 581dcc6..7058f09 100644
--- a/web/src/pages/index.astro
+++ b/web/src/pages/index.astro
@@ -7,9 +7,6 @@ import issues from '../issues.json';
 ---
 
 <BaseLayout>
-	<div class="mb-8">
-		<a href="https://paragraph.xyz/@privacynews/subscribe">Subscribe now!</a>
-	</div>
 	{issues.map((issue) => (
 		<WeekNews {issue} />
 	))}
diff --git a/web/src/pages/issue/[week].astro b/web/src/pages/issue/[week].astro
new file mode 100644
index 0000000..ced8cac
--- /dev/null
+++ b/web/src/pages/issue/[week].astro
@@ -0,0 +1,24 @@
+---
+import BaseLayout from '../../layouts/base.astro';
+import WeekNews from '../../components/WeekNews.astro';
+import issues from '../../issues.json';
+
+export function getStaticPaths() {
+    return issues.map(issue => {
+        return {
+            params: { week: issue.week }
+        }
+    })
+}
+
+const { week } = Astro.params;
+const issue = issues.find(item => item.week === week);
+
+---
+
+<BaseLayout>
+    <div class="mb-8">
+        <a href="/">← Show latest edition</a>
+    </div>
+	<WeekNews {issue} />
+</BaseLayout>
\ No newline at end of file