diff --git a/layout/common/archive.ejs b/layout/common/archive.ejs
index 4506c8f..e7ba0d9 100644
--- a/layout/common/archive.ejs
+++ b/layout/common/archive.ejs
@@ -14,7 +14,7 @@
             <section class="archives-wrap">
                 <div class="archives">
         <% } %>
-        <%- partial('archive-post', {post: post, archive: true}) %>
+        <%- partial('summary', {post: post, archive: true}) %>
     <% });
         if (page.posts.length) { %>
         </div></section>
@@ -35,7 +35,7 @@
         </div>
         <div class="archives">
         <% page.posts.each(function (post, i) { %>
-            <%- partial('archive-post', {post: post, archive: false}) %>
+            <%- partial('summary', {post: post, archive: false}) %>
         <% }); %>
         </div></section>
         <% if (page.total > 1) { %>
@@ -54,7 +54,7 @@
         </div>
         <div class="archives">
         <% page.posts.each(function (post, i) { %>
-            <%- partial('archive-post', {post: post, archive: false}) %>
+            <%- partial('summary', {post: post, archive: false}) %>
         <% }); %>
         </div></section>
         <% if (page.total > 1) { %>
diff --git a/layout/common/article.ejs b/layout/common/article.ejs
index 245b538..06db4f4 100644
--- a/layout/common/article.ejs
+++ b/layout/common/article.ejs
@@ -16,7 +16,7 @@
         <% } %>
         <div class="article-entry" itemprop="articleBody">
         <% if (index) { %>
-            <%- excerpt(post) %>
+            <p><%- excerpt(post) %></p>
             <p class="article-more-link">
                 <a href="<%- url_for(post.path) %>#more"><%= __('article.more') %></a>
             </p>
diff --git a/layout/common/post/date.ejs b/layout/common/post/date.ejs
index cf9a46b..cef9c82 100644
--- a/layout/common/post/date.ejs
+++ b/layout/common/post/date.ejs
@@ -1,4 +1,4 @@
-<% if (post.date && !post.hidedate) { %>
+<% if (post.date) { %>
     <div class="<%= class_name %>">
         <i class="fa fa-calendar"></i>
         <a href="<%- url_for(post.path) %>">
diff --git a/layout/common/post/tag.ejs b/layout/common/post/tag.ejs
index 40aa70a..647b51b 100644
--- a/layout/common/post/tag.ejs
+++ b/layout/common/post/tag.ejs
@@ -1,6 +1,6 @@
 <% if (post.tags && post.tags.length) { %>
-    <%- list_tags(post.tags, {
-        show_count: false,
-        class: 'article-tag'
-    }) %>
+    <div class="article-tag">
+        <i class="fa fa-tag"></i>
+        <%- list_tags(post.tags, { show_count: false, style: 'link' }) %>
+    </div>
 <% } %>
\ No newline at end of file
diff --git a/layout/common/archive-post.ejs b/layout/common/summary.ejs
similarity index 100%
rename from layout/common/archive-post.ejs
rename to layout/common/summary.ejs
diff --git a/source/css/_extend.styl b/source/css/_extend.styl
index 1e41665..9349d5f 100644
--- a/source/css/_extend.styl
+++ b/source/css/_extend.styl
@@ -8,10 +8,10 @@ $link-dark
         color: color-link
 
 $block-caption
+    line-height: 1em
+    color: color-grey
     text-decoration: none
     text-transform: uppercase
-    color: color-grey
-    line-height: 1em
 
 $block
     background: #fff
diff --git a/source/css/_partial/article.styl b/source/css/_partial/article.styl
index 7edc422..f5b9a23 100644
--- a/source/css/_partial/article.styl
+++ b/source/css/_partial/article.styl
@@ -9,32 +9,6 @@
     width:100%
     height:auto
 
-.article-meta
-    clearfix()
-    & > div
-        margin-bottom: 5px
-    .article-date, .article-category
-        margin-right: 10px
-        color: color-default + #444
-    a
-        color: color-default + #444
-        &:hover
-            color: color-link
-
-.article-date
-    @extend $block-caption
-    float: left
-
-.article-category
-    float: left
-    line-height: 1em
-    color: color-default
-    .fa-angle-right
-        margin: 0 5px
-
-.article-category-link
-    @extend $block-caption
-
 .article-header
     padding: article-padding article-padding 0
     .article-title
@@ -42,15 +16,43 @@
         margin-bottom: 14px
 
 .article-title
-    text-decoration: none
     font-size: 2em
     color: color-default
-    line-height: line-height-title
+    text-decoration: none
     transition: color 0.2s
+    line-height: line-height-title
     a&:visited
         color: color-default
     a&:hover
         color: color-link
+    @media mq-mini
+        font-size: 1.6em
+    @media mq-mobile
+        font-size: 1.6em
+
+.article-meta
+    @extend $block-caption
+    clearfix()
+    line-height: 1.6em
+    & > div
+        float: left
+        margin-right: 10px
+        color: color-default + #444
+        .fa
+            margin-right: 3px
+    a
+        color: color-default + #444
+        &:hover
+            color: color-link
+
+.article-category
+    .fa-angle-right
+        margin: 0 5px
+
+.article-tag
+    .tag-link
+        &:before
+            content: "#"
 
 .article-entry
     @extend $base-style
@@ -176,14 +178,6 @@
         &:hover
             color: color-default
 
-.article-tag-list-item
-    float: left
-    margin-right: 10px
-
-.article-tag-list-link
-    &:before
-        content: "#"
-
 .article-comment-link
     float: right
     &:before
diff --git a/source/css/_variables.styl b/source/css/_variables.styl
index 95131f0..bfc3fab 100644
--- a/source/css/_variables.styl
+++ b/source/css/_variables.styl
@@ -20,7 +20,7 @@ font-serif = Georgia, "Times New Roman", "Microsoft Yahei", serif
 font-mono = "Source Code Pro", Consolas, Monaco, Menlo, Consolas, monospace
 font-size = 14px
 line-height = 1.6em
-line-height-title = 1.1em
+line-height-title = 1.3em
 
 // Header
 header-height = 64px