diff --git a/marko/page/story/components/story-menu/index.marko b/marko/page/story/components/story-menu/index.marko
index b2d78f4..a31d2c8 100644
--- a/marko/page/story/components/story-menu/index.marko
+++ b/marko/page/story/components/story-menu/index.marko
@@ -1,22 +1,19 @@
 <menu user=input.user>
   <menu-header>Story</menu-header>
   <menu-link key="index" selected=input.selected.index icon="S" href="/story/">Stories</menu-link>
-  <menu-link dark key="_create" on-click("open", "story.add") icon="+">Add Story</menu-link>  
-  <menu-gap />
-  <menu-header>Categories</menu-header>
-  <menu-link for(category in (input.categories||[])) key=(category.name) selected=(input.selected.category == category.name) href=("/story/by-category/"+category.name) icon=category.name.charAt(0)>${category.name}</menu-link>
+  <menu-link selected=input.selected.tags icon="T" href="/story/tag-list/">Tags</menu-link>
   <menu-gap />
   <if(input.menuMonth != null)>
-    <menu-header>Month</menu-header>
-    <menu-link selected=(input.selected.special === "date") icon="M" href=("/story/by-month/"+input.menuMonth)>${input.menuMonth}</menu-link>
-    <menu-gap />
+    <menu-link selected=(input.selected.special === "month") icon="M" href=("/story/by-month/"+input.menuMonth.url)>${input.menuMonth.text}</menu-link>
   </if>
   <if(input.menuAuthor != null)>
-    <menu-header>Author</menu-header>
     <menu-link selected=(input.selected.special === "author") icon="A" href=("/story/by-author/"+input.menuAuthor)>${input.menuAuthor}</menu-link>
-    <menu-gap />
   </if>
-  <menu-header>Tags</menu-header>
   <menu-link for(tag in (input.menuTags||[])) key=(tag.kind+":"+tag.name) selected=(input.selected.tag === tag.kind+":"+tag.name) href=("/story/by-tag/"+tag.kind+"/"+tag.name) textClass=("color-tag-"+tag.kind.toLowerCase()) icon=tag.kind.charAt(0)>${tag.name}</menu-link>
-  <menu-link selected=input.selected.tags icon="T" href="/story/tag-list/">Tags</menu-link>
+  <menu-gap />
+  <menu-link dark key="_create" on-click("open", "story.add") icon="+">Add Story</menu-link>  
+  <menu-gap />
+  <menu-header>Categories</menu-header>
+  <menu-link for(category in (input.categories||[])) key=(category.name) selected=(input.selected.category == category.name) href=("/story/by-category/"+category.name) icon=category.name.charAt(0)>${category.name}</menu-link>
+  <menu-gap />
 </menu>
\ No newline at end of file
diff --git a/marko/page/story/list.marko b/marko/page/story/list.marko
index 0556b4b..8293789 100644
--- a/marko/page/story/list.marko
+++ b/marko/page/story/list.marko
@@ -1,6 +1,6 @@
 <include("../layout", {title: "Stories", site: "story"})>
   <@body>
     <background src="/assets/images/bg.png" opacity=0.25 />
-    <page user=input.user stories=input.stories categories=input.categories />
+    <page user=input.user stories=input.stories categories=input.categories selected=input.selected menuAuthor=input.menuAuthor menuMonth=input.menuMonth />
   </@body>
 </include>
diff --git a/routes/story/by-month.js b/routes/story/by-month.js
index 0f68500..3b16fee 100644
--- a/routes/story/by-month.js
+++ b/routes/story/by-month.js
@@ -1,3 +1,4 @@
+const moment = require("moment")
 const express = require("express")
 const router = express.Router()
 
@@ -16,11 +17,10 @@ router.get("/:yearmonth(\-{0,1}[0-9]{4}\-[0-9]{1,2})", common, async(req, res) =
     // Month is zero-based, while input is one-based.
     const fromDate = new Date(Date.UTC(year, month - 1, 1))
     const toDate = new Date(Date.UTC(year, month, 1))
-    const monthStr = `${fromDate}-${month > 9 ? month : '0' + month}`
 
     res.markoAsync(listTemplate, {
       stories: storyApi.list({earliestFictionalDate: fromDate, latestFictionalDate: toDate}), 
-      menuMonth: monthStr,
+      menuMonth: {url: moment.utc(fromDate).format("YYYY-MM"), text: moment.utc(fromDate).format("MMMM YYYY")},
       selected: {special: "month"},
     })
   } catch(err) {