diff --git a/themes/zhaohuabing/layouts/_default/page.html b/themes/zhaohuabing/layouts/_default/page.html
index 4217502..a7c7090 100644
--- a/themes/zhaohuabing/layouts/_default/page.html
+++ b/themes/zhaohuabing/layouts/_default/page.html
@@ -28,8 +28,6 @@
                 {{ .Content }}
             {{ end }}
              
-            {{ partial "comments.html" . }}
-            
             </div>
             
             {{ partial "sidebar.html" . }}
diff --git a/themes/zhaohuabing/layouts/_default/single.html b/themes/zhaohuabing/layouts/_default/single.html
index 2efe2b3..a7c7090 100644
--- a/themes/zhaohuabing/layouts/_default/single.html
+++ b/themes/zhaohuabing/layouts/_default/single.html
@@ -1,137 +1,40 @@
-{{ define "header" }}
-<!-- Post Header -->
-<style type="text/css">
-    header.intro-header {
-        background-image: url('{{ if .Params.image }}{{ .Params.image | relURL }}{{ else }}{{ .Site.Params.header_image | relURL}}{{ end }}')
-    }
-</style>
-{{ if eq .Params.headerstyle "text" }}
-<header class="intro-header style-text" >
-{{ else }}
-<header class="intro-header" >
-{{ end }}
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
-                <div class="post-heading">
-                    <div class="tags">
-                        {{ range .Params.tags }}
-                        <a class="tag" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}" title="{{ . }}">
-                            {{ . }}
-                        </a>
-                        {{ end }}
-                    </div>
-                    <h1>{{ .Title }}</h1>
-                    <h2 class="subheading">{{ .Params.subtitle }}</h2>
-                </div>
-            </div>
-        </div>
-    </div>
-</header>
-{{ end }}
 
 {{ define "main" }}
 <!-- Post Content -->
 <article>
     <div class="container">
         <div class="row">
-
             <!-- Post Container -->
             <div class="
-                col-lg-8 col-lg-offset-2
-                col-md-10 col-md-offset-1
-                post-container">
+            col-lg-8 
+            col-md-8
+            col-sm-12
+            col-xs-12
+            post-container">
+            {{ if eq (.Param "multilingual") true }}
+                {{ partial "multilingual-sel.html" . }}
 
-                <!--
-                {{ if not (eq (.Param "showtoc") false) }}
-                <header>
-                    <h2>TOC</h2>
-                </header>
-                {{.TableOfContents}}
-                {{ end }}
-                -->
-                {{ .Content }}
-
-                {{ if .Site.Params.reward }}
-                {{ partial "reward.html" . }}
-                {{ end }}
-
-                {{ if or (.PrevInSection) (.NextInSection) }}
-                <hr>
-                <ul class="pager">
-                    {{ if .PrevInSection }}
-                    <li class="previous">
-                        <a href="{{ .PrevInSection.RelPermalink }}" data-toggle="tooltip" data-placement="top" title="{{ .PrevInSection.Title}}">&larr;
-                            Previous Post</a>
-                    </li>
-                    {{ end }}
-                    {{ if .NextInSection }}
-                    <li class="next">
-                        <a href="{{ .NextInSection.RelPermalink }}" data-toggle="tooltip" data-placement="top" title="{{ .NextInSection.Title}}">Next
-                            Post &rarr;</a>
-                    </li>
-                    {{ end }}
-                </ul>
-                {{ end }}
-
-            </div>
-
-            <!-- Side Catalog Container -->
-            {{ if not (eq (.Param "showtoc") false) }}
-            <div class="
-                col-lg-2 col-lg-offset-0
-                visible-lg-block
-                sidebar-container
-                catalog-container">
-                <div class="side-catalog">
-                    <hr class="hidden-sm hidden-xs">
-                    <h5>
-                        <a class="catalog-toggle" href="#">CATALOG</a>
-                    </h5>
-                    <ul class="catalog-body"></ul>
+                <!-- Chinese Version -->
+                <div class="zh post-container">
+                    {{$file :=  "/about/index-zh.md"}}
+                    {{ $file | readFile | markdownify}}
                 </div>
-            </div>
+            
+                <!-- English Version -->
+                <div class="en post-container">
+                    {{ .Content }}
+                </div>
+            {{ else }}
+                {{ .Content }}
             {{ end }}
-
-            <!-- Sidebar Container -->
-            <div class="
-                col-lg-8 col-lg-offset-2
-                col-md-10 col-md-offset-1
-                sidebar-container">
-
-                <!-- Featured Tags -->
-                {{ if .Site.Params.featured_tags }}
-                <section>
-                    <hr class="hidden-sm hidden-xs">
-                    <h5><a href="/tags/">FEATURED TAGS</a></h5>
-                    <div class="tags">
-                        {{ $featured_condition_size := .Site.Params.featured_condition_size }}
-                        {{ range $name, $taxonomy := .Site.Taxonomies.tags }}
-                        {{ if gt (len $taxonomy.Pages) $featured_condition_size }}
-                        <a href="{{ "/tags/" | relLangURL }}{{ $name | urlize }}" title="{{ $name }}">
-                            {{ $name }}
-                        </a>
-                        {{ end }}
-                        {{ end }}
-                    </div>
-                </section>
-                {{ end }}
-
-                <!-- Friends Blog -->
-                {{ if .Site.Params.friends }}
-                <section>
-                    <hr>
-                    <h5>FRIENDS</h5>
-                    <ul class="list-inline">
-                        {{ range .Site.Params.friend_link }}
-                        <li><a target="_blank" href="{{.href}}">{{.title}}</a></li>
-                        {{ end }}
-                    </ul>
-                </section>
-                {{ end }}
+             
             </div>
+            
+            {{ partial "sidebar.html" . }}
         </div>
     </div>
 </article>
 
 {{ end }}
+
+
diff --git a/themes/zhaohuabing/layouts/partials/sidebar.html b/themes/zhaohuabing/layouts/partials/sidebar.html
index ae33796..4cf6151 100644
--- a/themes/zhaohuabing/layouts/partials/sidebar.html
+++ b/themes/zhaohuabing/layouts/partials/sidebar.html
@@ -19,9 +19,9 @@
 
           <!-- SNS Link -->
            <ul class="list-inline">
-               {{ if .Site.Data.infos.courriel }}
+               {{ with .Site.Data.infos.courriel }}
                <li>
-                   <a href="mailto:{{ .Site.Data.infos.courriel }}">
+                   <a href="mailto:{{ . }}">
                       <span class="fa-stack fa-lg">
                           <i class="fa fa-circle fa-stack-2x"></i>
                           <i class="fa fa-envelope fa-stack-1x fa-inverse"></i>