diff --git a/assets/css/gemini/style.css b/assets/css/gemini/style.css
index 04480cf..bd20ba0 100644
--- a/assets/css/gemini/style.css
+++ b/assets/css/gemini/style.css
@@ -142,6 +142,18 @@
   margin: 0px;
 }
 
+.posts-expand .post-header {
+  margin: 0;
+}
+
+.posts-expand .post-body {
+  margin: 28px 0;
+}
+
+.post-footer-btn {
+  text-align: center;
+}
+
 
 /* Font A */
 .fa-spin {
diff --git a/i18n/en-us.toml b/i18n/en-us.toml
index f5f5536..20bdbcf 100644
--- a/i18n/en-us.toml
+++ b/i18n/en-us.toml
@@ -40,5 +40,7 @@
   other = "Views"
 [PostCatg]
   other = "Categories"
+[PostTag]
+  other = "Tags"
 [PostReadMore]
   other = "Read More"
\ No newline at end of file
diff --git a/i18n/zh-cn.toml b/i18n/zh-cn.toml
index bc6b2d0..a220c6a 100644
--- a/i18n/zh-cn.toml
+++ b/i18n/zh-cn.toml
@@ -31,14 +31,16 @@
 [PostWords]
   other = "字数"
 [PostWordCount]
-  other = "{{- .WordCount -}}字"
+  other = "{{- .WordCount -}}"
 [PostReading]
   other = "阅读"
 [PostReadTime]
   other = "{{- .ReadingTime -}}分钟"
 [PostVisitor]
-  other = "浏览次数"
+  other = "浏览数"
 [PostCatg]
   other = "分类"
+[PostTag]
+  other = "标签"
 [PostReadMore]
   other = "阅读全文"
\ No newline at end of file
diff --git a/layouts/index.html b/layouts/index.html
index 8d34d9e..af5d033 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -10,73 +10,21 @@
     </h2>
     <div class="post-meta-container">
       <div class="post-meta">
-        <span class="post-meta-item">
-          <span class="post-meta-item-icon">
-            <i class="far fa-calendar"></i>
-          </span>
-          <span class="post-meta-item-text">{{- T "PostPublishDate" }}{{- T "ColoneFlag" }}</span>
-          <time title="{{ T "PostPublishTime" }}{{ T "ColoneFlag" }}{{ .PublishDate }}" itemprop="dateCreated datePublished" datetime="{{ .PublishDate }}">{{- .PublishDate.Format .Site.Params.DateFormat -}}</time>
-        </span>
-        {{- if gt .Lastmod .PublishDate }}
-        <span class="post-meta-item">
-          <span class="post-meta-item-icon">
-            <i class="far fa-calendar-check"></i>
-          </span>
-          <span class="post-meta-item-text">{{- T "PostLastModDate" }}{{- T "ColoneFlag" }}</span>
-          <time title="{{ T "PostLastModTime" }}{{ T "ColoneFlag" }}{{ .Lastmod }}" itemprop="dateModified" datetime="{{ .Lastmod }}">{{- .Lastmod.Format .Site.Params.DateFormat -}}</time>
-        </span>
-        {{- end }}
-        {{- if isset .Params "categories" }}
-        {{- if not (eq (len .Params.categories) 0) }}
-        <span class="post-meta-item">
-          <span class="post-meta-item-icon">
-            <i class="fa fa-folder-open"></i>
-          </span>
-          <span class="post-meta-item-text">{{- T "PostCatg" }}{{- T "ColoneFlag"}}</span>
-          <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
-          {{- range .Params.categories }}
-          <span class="post-meta-catg" itemprop="name">
-            <a href="{{ . | urlize }}" itemprop="url" rel="index">{{ . }}</a>
-          </span>
-          {{- end }}
-          </span>
-        </span>
-        {{- end }}
-        {{- end }}
-        <span class="post-meta-item">
-          <span class="post-meta-item-icon">
-            <i class="fa fa-file-word"></i>
-          </span>
-          <span class="post-meta-item-text">{{- T "PostWords" }}{{- T "ColoneFlag" -}}</span>
-          <span>{{- T "PostWordCount" . -}}</span>
-        </span>
-        <span class="post-meta-item">
-          <span class="post-meta-item-icon">
-            <i class="fa fa-hourglass"></i>
-          </span>
-          <span class="post-meta-item-text">{{- T "PostReading" }}{{- T "ColoneFlag" -}}</span>
-          <span>{{- T "PostReadTime" . -}}</span>
-        </span>
-        <span class="post-meta-item">
-          <span class="post-meta-item-icon">
-            <i class="fa fa-eye"></i>
-          </span>
-          <span class="post-meta-item-text">{{- T "PostVisitor" -}}{{ T "ColoneFlag" -}}</span>
-          <span id="busuanzi_value_site_pv">
-            <i class="fa fa-sync fa-spin"></i>
-          </span>
-        </span>
+        {{- partial "post_meta/date" . }}
+        {{- partial "post_meta/catgs" . }}
+        {{- partial "post_meta/tags" . }}
       </div>
     </div>
-    <div class="post-body" itemprop="articleBody">{{ .Summary }}</div>
-    <div class="post-button">
+  </header>
+  <div class="post-body" itemprop="articleBody">{{ .Summary }}</div>
+  <footer class="post-footer">
+    <div class="post-footer-btn">
       <a class="hvr-shutter-out-horizontal" href="{{ .Permalink }}" rel="contents">
         {{- T "PostReadMore" }} &raquo;
       </a>
     </div>
-    <footer class="post-footer">
-      <div class="post-eof"></div>
-    </footer>
+    <div class="post-eof"></div>
+  </footer>
 </article>
 </div>    
 {{- end }}
diff --git a/layouts/partials/post_meta/catgs.html b/layouts/partials/post_meta/catgs.html
new file mode 100644
index 0000000..bcdf35d
--- /dev/null
+++ b/layouts/partials/post_meta/catgs.html
@@ -0,0 +1,17 @@
+{{- if isset .Params "categories" }}
+{{- if not (eq (len .Params.categories) 0) }}
+<span class="post-meta-item">
+  <span class="post-meta-item-icon">
+    <i class="fa fa-folder-open"></i>
+  </span>
+  <span class="post-meta-item-text">{{- T "PostCatg" }}{{- T "ColoneFlag"}}</span>
+  <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
+    {{- range (first 3 .Params.categories) }}
+    <span class="post-meta-catg" itemprop="name">
+      <a href="{{ . | urlize }}" itemprop="url" rel="index">{{ . }}</a>
+    </span>
+    {{- end }}
+  </span>
+</span>
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/layouts/partials/post_meta/date.html b/layouts/partials/post_meta/date.html
new file mode 100644
index 0000000..b6c072b
--- /dev/null
+++ b/layouts/partials/post_meta/date.html
@@ -0,0 +1,16 @@
+<span class="post-meta-item">
+  <span class="post-meta-item-icon">
+    <i class="far fa-calendar"></i>
+  </span>
+  <span class="post-meta-item-text">{{- T "PostPublishDate" }}{{- T "ColoneFlag" }}</span>
+  <time title="{{ T "PostPublishTime" }}{{ T "ColoneFlag" }}{{ .PublishDate }}" itemprop="dateCreated datePublished" datetime="{{ .PublishDate }}">{{- .PublishDate.Format .Site.Params.DateFormat -}}</time>
+</span>
+{{- if gt .Lastmod .PublishDate }}
+<span class="post-meta-item">
+  <span class="post-meta-item-icon">
+    <i class="far fa-calendar-check"></i>
+  </span>
+  <span class="post-meta-item-text">{{- T "PostLastModDate" }}{{- T "ColoneFlag" }}</span>
+  <time title="{{ T "PostLastModTime" }}{{ T "ColoneFlag" }}{{ .Lastmod }}" itemprop="dateModified" datetime="{{ .Lastmod }}">{{- .Lastmod.Format .Site.Params.DateFormat -}}</time>
+</span>
+{{- end }}
\ No newline at end of file
diff --git a/layouts/partials/post_meta/reading.html b/layouts/partials/post_meta/reading.html
new file mode 100644
index 0000000..06f9631
--- /dev/null
+++ b/layouts/partials/post_meta/reading.html
@@ -0,0 +1,7 @@
+<span class="post-meta-item">
+  <span class="post-meta-item-icon">
+    <i class="fa fa-hourglass"></i>
+  </span>
+  <span class="post-meta-item-text">{{- T "PostReading" }}{{- T "ColoneFlag" -}}</span>
+  <span>{{- T "PostReadTime" . -}}</span>
+</span>
\ No newline at end of file
diff --git a/layouts/partials/post_meta/tags.html b/layouts/partials/post_meta/tags.html
new file mode 100644
index 0000000..62e64be
--- /dev/null
+++ b/layouts/partials/post_meta/tags.html
@@ -0,0 +1,17 @@
+{{- if isset .Params "tags" }}
+{{- if not (eq (len .Params.tags) 0) }}
+<span class="post-meta-item">
+  <span class="post-meta-item-icon">
+    <i class="fa fa-tags"></i>
+  </span>
+  <span class="post-meta-item-text">{{- T "PostTag" }}{{- T "ColoneFlag"}}</span>
+  <span itemprop="about" itemscope itemtype="http://schema.org/Thing">
+    {{- range (first 3 .Params.tags) }}
+    <span class="post-meta-catg" itemprop="name">
+      <a href="{{ . | urlize }}" itemprop="url" rel="index">{{ . }}</a>
+    </span>
+    {{- end }}
+  </span>
+</span>
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/layouts/partials/post_meta/views.html b/layouts/partials/post_meta/views.html
new file mode 100644
index 0000000..e2882e7
--- /dev/null
+++ b/layouts/partials/post_meta/views.html
@@ -0,0 +1,9 @@
+<span class="post-meta-item">
+  <span class="post-meta-item-icon">
+    <i class="fa fa-eye"></i>
+  </span>
+  <span class="post-meta-item-text">{{- T "PostVisitor" -}}{{ T "ColoneFlag" -}}</span>
+  <span id="busuanzi_value_site_pv">
+    <i class="fa fa-sync fa-spin"></i>
+  </span>
+</span>
\ No newline at end of file
diff --git a/layouts/partials/post_meta/words.html b/layouts/partials/post_meta/words.html
new file mode 100644
index 0000000..2502fbf
--- /dev/null
+++ b/layouts/partials/post_meta/words.html
@@ -0,0 +1,7 @@
+<span class="post-meta-item">
+  <span class="post-meta-item-icon">
+    <i class="fa fa-file-word"></i>
+  </span>
+  <span class="post-meta-item-text">{{- T "PostWords" }}{{- T "ColoneFlag" -}}</span>
+  <span>{{- T "PostWordCount" . -}}</span>
+</span>
\ No newline at end of file