diff --git a/marko/page/story-content/components/edit-story-modal/index.marko b/marko/page/story-content/components/edit-story-modal/index.marko
index 1e04549..d2def41 100644
--- a/marko/page/story-content/components/edit-story-modal/index.marko
+++ b/marko/page/story-content/components/edit-story-modal/index.marko
@@ -3,7 +3,6 @@
 
   <p key="error" class="color-error">${state.error}</p>
 
-  <h2>Meta</h2>
   <label>Title</label>
   <input key="name" placeholder="Name" class="big" on-change("change", "name") value=state.values.name />
 
@@ -15,7 +14,7 @@
     <option for(category in input.categories) value=category.name selected=(state.values.category === category.name)>${category.name}</option>
   </select>
 
-  <h2>Options</h2>
+  <label>Options</label>
   <toggle value=state.values.listed on="Listed" off="Unlisted" 
           onDesc="The story will be visible on the front page."
           offDesc="A direct link is required to view this story."
@@ -25,6 +24,5 @@
           offDesc="Only you can add chapters to this story."
           on-change("change", "open") />
 
-  <h2></h2>
   <button disabled=state.loading on-click("save")>Save</button>  
 </modal>
\ No newline at end of file
diff --git a/marko/page/story/components/add-story-modal/index.marko b/marko/page/story/components/add-story-modal/index.marko
index 372bc1d..c3a22d8 100644
--- a/marko/page/story/components/add-story-modal/index.marko
+++ b/marko/page/story/components/add-story-modal/index.marko
@@ -1,9 +1,8 @@
 <modal class="modal color-text nolabel" key="modal2" enabled=(input.enabled) closable on-close("close") >
-  <h1>Edit Story</h1>
+  <h1>Add Story</h1>
 
   <p key="error" class="color-error">${state.error}</p>
 
-  <h2>Meta</h2>
   <label>Title</label>
   <input key="name" placeholder="Name" class="big" on-change("change", "name") value=state.values.name />
 
@@ -15,10 +14,7 @@
     <option for(category in input.categories) value=category.name selected=(state.values.category === category.name)>${category.name}</option>
   </select>
 
-  <h2>Tags</h2>
-  <story-tag-options small tags=state.tags loading=state.loading on-remove("removeTag") on-add("addTag") />  
-
-  <h2>Options</h2>
+  <label>Options</label>
   <toggle value=state.values.listed on="Listed" off="Unlisted" 
           onDesc="The story will be visible on the front page."
           offDesc="A direct link is required to view this story."
@@ -28,6 +24,5 @@
           offDesc="Only you can add chapters to this story."
           on-change("change", "open") />
 
-  <h2></h2>
   <button disabled=state.loading on-click("save")>Add Story</button>  
 </modal>
\ No newline at end of file