diff --git a/package.json b/package.json
index a34a98e42d..a8edf239e4 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
   },
   "scripts": {
     "build": "npm run clean && nico build",
-    "start": "nico server",
+    "start": "npm run clean && nico server",
     "clean": "rm -rf _site"
   }
 }
diff --git a/theme/templates/layout.html b/theme/templates/layout.html
index ed5a8cb78c..0ac192ca8c 100644
--- a/theme/templates/layout.html
+++ b/theme/templates/layout.html
@@ -38,8 +38,6 @@
     </nav>
     <div class="nav-phone-icon"></div>
   </header>
-
-  {%- block main %}
   {%- if post.filename === 'index' %}
   <div class="main">
     <div class="main-box" id="main">
@@ -50,8 +48,12 @@
       </div>
     </div>
   </div>
+  {%- else %}
+  <article class="markdown">
+    <h1>{{ post.title }}</h1>
+    {{ post.html }}
+  </article>
   {%- endif %}
-  {% endblock -%}
 
   <footer id="footer">
     <ul>
diff --git a/theme/templates/page.html b/theme/templates/page.html
index 97b509c323..6a01302ba4 100644
--- a/theme/templates/page.html
+++ b/theme/templates/page.html
@@ -2,9 +2,3 @@
 
 {% block title %}{{post.title}} - {{config.site.name}}{% endblock %}
 {% block description %}{% if post.summay %}{{post.summary}}{% endif %}{% endblock %}
-{% block main -%}
-<article class="markdown">
-  <h1>{{ post.title }}</h1>
-  {{ post.html }}
-</article>
-{%- endblock %}