diff --git a/app/views/home/header.html b/app/views/home/header.html
index 70fced9..c69da38 100644
--- a/app/views/home/header.html
+++ b/app/views/home/header.html
@@ -41,7 +41,7 @@ function log(o) {
 			<div id="lang">
 				<a data-lang="en-us">English</a>
 				<a data-lang="fr-fr">Français</a>
-				<a data-lang="zh-cn">中文简体</a>
+				<a data-lang="zh-cn">简体中文</a>
 			</div>
 			
 			<ul class="nav navbar-nav navbar-left">
diff --git a/app/views/home/index_en.html b/app/views/home/index_en.html
index d74023a..c25e615 100644
--- a/app/views/home/index_en.html
+++ b/app/views/home/index_en.html
@@ -9,18 +9,17 @@
 		<p>
 		Knowledge, Blog, Sharing, Cooperation... all in leanote
 		</p>
-		
 		<div>
 			<a class="btn btn-primary" href="https://github.com/leanote/leanote">{{msg . "fork github"}}</a> 
 			&nbsp;
 			&nbsp;
 			<a class="btn btn-default" href="/demo">{{msg . "try"}}</a>
+			&nbsp;
+			&nbsp;
+			<a class="btn btn-default" href="/login">{{msg . "login"}}</a>
 			{{if .openRegister}}
 			&nbsp;
 			&nbsp;
-			OR	
-			&nbsp;
-			&nbsp;
 			<a class="btn btn-default" href="/register">{{msg . "register"}}</a> 
 			{{end}}
 		</div>
diff --git a/app/views/home/index_zh.html b/app/views/home/index_zh.html
index 0dc7afc..409cc30 100644
--- a/app/views/home/index_zh.html
+++ b/app/views/home/index_zh.html
@@ -13,12 +13,12 @@
 			&nbsp;
 			&nbsp;
 			<a class="btn btn-default" href="/demo">{{msg . "try"}}</a>
+			&nbsp;
+			&nbsp;
+			<a class="btn btn-default" href="/login">{{msg . "login"}}</a>
 			{{if .openRegister}}
 			&nbsp;
 			&nbsp;
-			OR	
-			&nbsp;
-			&nbsp;
 			<a class="btn btn-default" href="/register">{{msg . "register"}}</a> 
 			{{end}}
 		</div>
diff --git a/conf/app.conf b/conf/app.conf
index 5814241..f55538a 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -9,7 +9,7 @@ site.url=http://localhost:9000 # or http://x.com:8080, http://www.xx.com:9000
 # mongdb
 db.host=localhost
 db.port=27017
-db.dbname=leanote8 # required
+db.dbname=leanote # required
 db.username= # if not exists, please leave it blank
 db.password= # if not exists, please leave it blank
 # or you can set the mongdb url for more complex needs the format is:
@@ -17,7 +17,7 @@ db.password= # if not exists, please leave it blank
 # db.url=mongodb://root:root123@localhost:27017/leanote
 
 # You Must Change It !! About Security!!
-app.secret=V85ZzBeTnzpsHyjQX4zukbQ8qqtju9y2aDM55VWxAH9Qop19poekx3xkcDVvrD0y 
+app.secret=V85ZzBeTnzpsHyjQX4zukbQaDM55VWxAH9Qop19poekx3xkcDVvrD0y 
 
 #--------------------------------
 # revel config
diff --git a/mongodb_backup/leanote_install_data/albums.bson b/mongodb_backup/leanote_install_data/albums.bson
deleted file mode 100644
index f8fdddb..0000000
Binary files a/mongodb_backup/leanote_install_data/albums.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/albums.metadata.json b/mongodb_backup/leanote_install_data/albums.metadata.json
deleted file mode 100644
index 79a000c..0000000
--- a/mongodb_backup/leanote_install_data/albums.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.albums" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/attachs.bson b/mongodb_backup/leanote_install_data/attachs.bson
deleted file mode 100644
index 70c97ea..0000000
Binary files a/mongodb_backup/leanote_install_data/attachs.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/attachs.metadata.json b/mongodb_backup/leanote_install_data/attachs.metadata.json
deleted file mode 100644
index 060e571..0000000
--- a/mongodb_backup/leanote_install_data/attachs.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.attachs" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/blog_comments.bson b/mongodb_backup/leanote_install_data/blog_comments.bson
deleted file mode 100644
index f0e9345..0000000
Binary files a/mongodb_backup/leanote_install_data/blog_comments.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/blog_comments.metadata.json b/mongodb_backup/leanote_install_data/blog_comments.metadata.json
deleted file mode 100644
index 560e321..0000000
--- a/mongodb_backup/leanote_install_data/blog_comments.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.blog_comments" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/blog_likes.bson b/mongodb_backup/leanote_install_data/blog_likes.bson
deleted file mode 100644
index 218e50b..0000000
Binary files a/mongodb_backup/leanote_install_data/blog_likes.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/blog_likes.metadata.json b/mongodb_backup/leanote_install_data/blog_likes.metadata.json
deleted file mode 100644
index f22ab81..0000000
--- a/mongodb_backup/leanote_install_data/blog_likes.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.blog_likes" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/blog_singles.bson b/mongodb_backup/leanote_install_data/blog_singles.bson
deleted file mode 100644
index e111cf0..0000000
Binary files a/mongodb_backup/leanote_install_data/blog_singles.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/blog_singles.metadata.json b/mongodb_backup/leanote_install_data/blog_singles.metadata.json
deleted file mode 100644
index d1390b5..0000000
--- a/mongodb_backup/leanote_install_data/blog_singles.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.blog_singles" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/configs.bson b/mongodb_backup/leanote_install_data/configs.bson
deleted file mode 100644
index 224def0..0000000
Binary files a/mongodb_backup/leanote_install_data/configs.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/configs.metadata.json b/mongodb_backup/leanote_install_data/configs.metadata.json
deleted file mode 100644
index 1f41ad4..0000000
--- a/mongodb_backup/leanote_install_data/configs.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.configs" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/email_logs.bson b/mongodb_backup/leanote_install_data/email_logs.bson
deleted file mode 100644
index 6beca6b..0000000
Binary files a/mongodb_backup/leanote_install_data/email_logs.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/email_logs.metadata.json b/mongodb_backup/leanote_install_data/email_logs.metadata.json
deleted file mode 100644
index 0363b3a..0000000
--- a/mongodb_backup/leanote_install_data/email_logs.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.email_logs" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/files.bson b/mongodb_backup/leanote_install_data/files.bson
deleted file mode 100644
index b311785..0000000
Binary files a/mongodb_backup/leanote_install_data/files.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/files.metadata.json b/mongodb_backup/leanote_install_data/files.metadata.json
deleted file mode 100644
index 3008868..0000000
--- a/mongodb_backup/leanote_install_data/files.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.files" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/find_pwds.bson b/mongodb_backup/leanote_install_data/find_pwds.bson
deleted file mode 100644
index 79c5949..0000000
Binary files a/mongodb_backup/leanote_install_data/find_pwds.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/find_pwds.metadata.json b/mongodb_backup/leanote_install_data/find_pwds.metadata.json
deleted file mode 100644
index 7bddadb..0000000
--- a/mongodb_backup/leanote_install_data/find_pwds.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.find_pwds" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/group_users.bson b/mongodb_backup/leanote_install_data/group_users.bson
deleted file mode 100644
index bfed713..0000000
Binary files a/mongodb_backup/leanote_install_data/group_users.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/group_users.metadata.json b/mongodb_backup/leanote_install_data/group_users.metadata.json
deleted file mode 100644
index cd017b3..0000000
--- a/mongodb_backup/leanote_install_data/group_users.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.group_users" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/groups.bson b/mongodb_backup/leanote_install_data/groups.bson
deleted file mode 100644
index b18280f..0000000
Binary files a/mongodb_backup/leanote_install_data/groups.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/groups.metadata.json b/mongodb_backup/leanote_install_data/groups.metadata.json
deleted file mode 100644
index ea1e8fd..0000000
--- a/mongodb_backup/leanote_install_data/groups.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.groups" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/has_share_notes.bson b/mongodb_backup/leanote_install_data/has_share_notes.bson
deleted file mode 100644
index c752c06..0000000
Binary files a/mongodb_backup/leanote_install_data/has_share_notes.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/has_share_notes.metadata.json b/mongodb_backup/leanote_install_data/has_share_notes.metadata.json
deleted file mode 100644
index 6eee3fb..0000000
--- a/mongodb_backup/leanote_install_data/has_share_notes.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.has_share_notes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1 }, "name" : "UserId_1_ToUserId_1", "ns" : "leanote7.has_share_notes" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/leanote.ShareNotes.bson b/mongodb_backup/leanote_install_data/leanote.ShareNotes.bson
deleted file mode 100644
index e69de29..0000000
diff --git a/mongodb_backup/leanote_install_data/leanote.ShareNotes.metadata.json b/mongodb_backup/leanote_install_data/leanote.ShareNotes.metadata.json
deleted file mode 100644
index 774404c..0000000
--- a/mongodb_backup/leanote_install_data/leanote.ShareNotes.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.leanote.ShareNotes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1, "NoteId" : 1 }, "name" : "UserId_1_ToUserId_1_NoteId_1", "ns" : "leanote7.leanote.ShareNotes" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/leanote.has_share_notes.bson b/mongodb_backup/leanote_install_data/leanote.has_share_notes.bson
deleted file mode 100644
index e69de29..0000000
diff --git a/mongodb_backup/leanote_install_data/leanote.has_share_notes.metadata.json b/mongodb_backup/leanote_install_data/leanote.has_share_notes.metadata.json
deleted file mode 100644
index 367914d..0000000
--- a/mongodb_backup/leanote_install_data/leanote.has_share_notes.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.leanote.has_share_notes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1 }, "name" : "UserId_1_ToUserId_1", "ns" : "leanote7.leanote.has_share_notes" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/note_content_histories.bson b/mongodb_backup/leanote_install_data/note_content_histories.bson
deleted file mode 100644
index a918025..0000000
Binary files a/mongodb_backup/leanote_install_data/note_content_histories.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/note_content_histories.metadata.json b/mongodb_backup/leanote_install_data/note_content_histories.metadata.json
deleted file mode 100644
index d418bd9..0000000
--- a/mongodb_backup/leanote_install_data/note_content_histories.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.note_content_histories" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/note_contents.bson b/mongodb_backup/leanote_install_data/note_contents.bson
deleted file mode 100644
index a5839f7..0000000
Binary files a/mongodb_backup/leanote_install_data/note_contents.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/note_contents.metadata.json b/mongodb_backup/leanote_install_data/note_contents.metadata.json
deleted file mode 100644
index d10dae0..0000000
--- a/mongodb_backup/leanote_install_data/note_contents.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.note_contents" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/note_images.bson b/mongodb_backup/leanote_install_data/note_images.bson
deleted file mode 100644
index 4931752..0000000
Binary files a/mongodb_backup/leanote_install_data/note_images.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/note_images.metadata.json b/mongodb_backup/leanote_install_data/note_images.metadata.json
deleted file mode 100644
index 1badc2d..0000000
--- a/mongodb_backup/leanote_install_data/note_images.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.note_images" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/note_tags.bson b/mongodb_backup/leanote_install_data/note_tags.bson
deleted file mode 100644
index ce0dc5c..0000000
Binary files a/mongodb_backup/leanote_install_data/note_tags.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/note_tags.metadata.json b/mongodb_backup/leanote_install_data/note_tags.metadata.json
deleted file mode 100644
index 83c893e..0000000
--- a/mongodb_backup/leanote_install_data/note_tags.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.note_tags" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/notebooks.bson b/mongodb_backup/leanote_install_data/notebooks.bson
deleted file mode 100644
index 4fcf793..0000000
Binary files a/mongodb_backup/leanote_install_data/notebooks.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/notebooks.metadata.json b/mongodb_backup/leanote_install_data/notebooks.metadata.json
deleted file mode 100644
index 6184cd4..0000000
--- a/mongodb_backup/leanote_install_data/notebooks.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.notebooks" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote7.notebooks" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/notes.bson b/mongodb_backup/leanote_install_data/notes.bson
deleted file mode 100644
index 0959c30..0000000
Binary files a/mongodb_backup/leanote_install_data/notes.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/notes.metadata.json b/mongodb_backup/leanote_install_data/notes.metadata.json
deleted file mode 100644
index 72e20a7..0000000
--- a/mongodb_backup/leanote_install_data/notes.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.notes" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote7.notes" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/reports.bson b/mongodb_backup/leanote_install_data/reports.bson
deleted file mode 100644
index 7b52225..0000000
Binary files a/mongodb_backup/leanote_install_data/reports.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/reports.metadata.json b/mongodb_backup/leanote_install_data/reports.metadata.json
deleted file mode 100644
index 5574912..0000000
--- a/mongodb_backup/leanote_install_data/reports.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.reports" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/sessions.bson b/mongodb_backup/leanote_install_data/sessions.bson
deleted file mode 100644
index 69dfd53..0000000
Binary files a/mongodb_backup/leanote_install_data/sessions.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/sessions.metadata.json b/mongodb_backup/leanote_install_data/sessions.metadata.json
deleted file mode 100644
index f5becdc..0000000
--- a/mongodb_backup/leanote_install_data/sessions.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.sessions" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/share_notebooks.bson b/mongodb_backup/leanote_install_data/share_notebooks.bson
deleted file mode 100644
index 5b4286f..0000000
Binary files a/mongodb_backup/leanote_install_data/share_notebooks.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/share_notebooks.metadata.json b/mongodb_backup/leanote_install_data/share_notebooks.metadata.json
deleted file mode 100644
index c49b514..0000000
--- a/mongodb_backup/leanote_install_data/share_notebooks.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.share_notebooks" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/share_notes.bson b/mongodb_backup/leanote_install_data/share_notes.bson
deleted file mode 100644
index 34710cc..0000000
Binary files a/mongodb_backup/leanote_install_data/share_notes.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/share_notes.metadata.json b/mongodb_backup/leanote_install_data/share_notes.metadata.json
deleted file mode 100644
index 445afd9..0000000
--- a/mongodb_backup/leanote_install_data/share_notes.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.share_notes" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/suggestions.bson b/mongodb_backup/leanote_install_data/suggestions.bson
deleted file mode 100644
index 26d7013..0000000
Binary files a/mongodb_backup/leanote_install_data/suggestions.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/suggestions.metadata.json b/mongodb_backup/leanote_install_data/suggestions.metadata.json
deleted file mode 100644
index 4a04f67..0000000
--- a/mongodb_backup/leanote_install_data/suggestions.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.suggestions" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/system.indexes.bson b/mongodb_backup/leanote_install_data/system.indexes.bson
deleted file mode 100644
index b352d77..0000000
Binary files a/mongodb_backup/leanote_install_data/system.indexes.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/tag_count.bson b/mongodb_backup/leanote_install_data/tag_count.bson
deleted file mode 100644
index e69de29..0000000
diff --git a/mongodb_backup/leanote_install_data/tag_count.metadata.json b/mongodb_backup/leanote_install_data/tag_count.metadata.json
deleted file mode 100644
index dac56fb..0000000
--- a/mongodb_backup/leanote_install_data/tag_count.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.tag_count" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/tags.bson b/mongodb_backup/leanote_install_data/tags.bson
deleted file mode 100644
index 17e980c..0000000
Binary files a/mongodb_backup/leanote_install_data/tags.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/tags.metadata.json b/mongodb_backup/leanote_install_data/tags.metadata.json
deleted file mode 100644
index 49d9a78..0000000
--- a/mongodb_backup/leanote_install_data/tags.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.tags" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote7.tags" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/themes.bson b/mongodb_backup/leanote_install_data/themes.bson
deleted file mode 100644
index dbed778..0000000
Binary files a/mongodb_backup/leanote_install_data/themes.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/themes.metadata.json b/mongodb_backup/leanote_install_data/themes.metadata.json
deleted file mode 100644
index 1f51602..0000000
--- a/mongodb_backup/leanote_install_data/themes.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.themes" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/tokens.bson b/mongodb_backup/leanote_install_data/tokens.bson
deleted file mode 100644
index 8fc185d..0000000
Binary files a/mongodb_backup/leanote_install_data/tokens.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/tokens.metadata.json b/mongodb_backup/leanote_install_data/tokens.metadata.json
deleted file mode 100644
index 25d7352..0000000
--- a/mongodb_backup/leanote_install_data/tokens.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.tokens" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/user_blogs.bson b/mongodb_backup/leanote_install_data/user_blogs.bson
deleted file mode 100644
index 755bd48..0000000
Binary files a/mongodb_backup/leanote_install_data/user_blogs.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/user_blogs.metadata.json b/mongodb_backup/leanote_install_data/user_blogs.metadata.json
deleted file mode 100644
index d010db3..0000000
--- a/mongodb_backup/leanote_install_data/user_blogs.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.user_blogs" } ] }
\ No newline at end of file
diff --git a/mongodb_backup/leanote_install_data/users.bson b/mongodb_backup/leanote_install_data/users.bson
deleted file mode 100644
index 48807d8..0000000
Binary files a/mongodb_backup/leanote_install_data/users.bson and /dev/null differ
diff --git a/mongodb_backup/leanote_install_data/users.metadata.json b/mongodb_backup/leanote_install_data/users.metadata.json
deleted file mode 100644
index d905bef..0000000
--- a/mongodb_backup/leanote_install_data/users.metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote7.users" } ] }
\ No newline at end of file
diff --git a/public/blog/themes/default/post.html b/public/blog/themes/default/post.html
index 861c116..e616363 100644
--- a/public/blog/themes/default/post.html
+++ b/public/blog/themes/default/post.html
@@ -108,34 +108,17 @@ var commentNum = +"{{$.post.CommentNum}}";
 markdown 
 调用markdown来解析得到html
 -->
-
 {{if $.post.IsMarkdown }}
-<script src="/public/mdeditor/editor/pagedown/Markdown.Converter.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Sanitizer.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Editor.js"></script>
-<script src="/public/mdeditor/editor/pagedown/local/Markdown.local.zh.js"></script>
-<script src="/public/mdeditor/editor/Markdown.Extra.js"></script>
-
-<!--mathjax-->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({ tex2jax: { inlineMath: [['$','$'], ["\\(","\\)"]], processEscapes: true },  messageStyle: "none"});
-</script>
-<script src="/public/mdeditor/editor/mathJax.js"></script>
-<script src="/public/libs/MathJax/MathJax.js?config=TeX-AMS_HTML"></script>
+<script src="/public/libs/md2html/md2html.js"></script>
 <script>
 var content = $.trim($("#markdownContent textarea").val());
-var converter = Markdown.getSanitizingConverter();
-Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
-var html = converter.makeHtml(content);
-$("#content").html(html);
-$("pre").addClass("prettyprint linenums");
-prettyPrint();
-MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-
-initNav();
-weixin();
+md2Html(content, $("#content"), function(html) {
+    $("pre").addClass("prettyprint linenums");
+    prettyPrint();
+    initNav();
+    weixin();
+});
 </script>
-
 <!-- 不是markdown -->
 {{else}}
 <script>
diff --git a/public/blog/themes/default/style.css b/public/blog/themes/default/style.css
index 3416ae2..1d48b6c 100644
--- a/public/blog/themes/default/style.css
+++ b/public/blog/themes/default/style.css
@@ -530,3 +530,8 @@ table tr:nth-child(2n) {
 	border-collapse: collapse;
 	padding: 6px 13px;
 }
+
+.desc *, #content * {
+    word-wrap: break-word;
+}
+
diff --git a/public/blog/themes/elegant/post.html b/public/blog/themes/elegant/post.html
index 861c116..a8d7a77 100644
--- a/public/blog/themes/elegant/post.html
+++ b/public/blog/themes/elegant/post.html
@@ -107,35 +107,17 @@ var commentNum = +"{{$.post.CommentNum}}";
 <!-- 
 markdown 
 调用markdown来解析得到html
--->
-
-{{if $.post.IsMarkdown }}
-<script src="/public/mdeditor/editor/pagedown/Markdown.Converter.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Sanitizer.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Editor.js"></script>
-<script src="/public/mdeditor/editor/pagedown/local/Markdown.local.zh.js"></script>
-<script src="/public/mdeditor/editor/Markdown.Extra.js"></script>
-
-<!--mathjax-->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({ tex2jax: { inlineMath: [['$','$'], ["\\(","\\)"]], processEscapes: true },  messageStyle: "none"});
-</script>
-<script src="/public/mdeditor/editor/mathJax.js"></script>
-<script src="/public/libs/MathJax/MathJax.js?config=TeX-AMS_HTML"></script>
+-->{{if $.post.IsMarkdown }}
+<script src="/public/libs/md2html/md2html.js"></script>
 <script>
 var content = $.trim($("#markdownContent textarea").val());
-var converter = Markdown.getSanitizingConverter();
-Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
-var html = converter.makeHtml(content);
-$("#content").html(html);
-$("pre").addClass("prettyprint linenums");
-prettyPrint();
-MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-
-initNav();
-weixin();
+md2Html(content, $("#content"), function(html) {
+    $("pre").addClass("prettyprint linenums");
+    prettyPrint();
+    initNav();
+    weixin();
+});
 </script>
-
 <!-- 不是markdown -->
 {{else}}
 <script>
diff --git a/public/blog/themes/elegant/style.css b/public/blog/themes/elegant/style.css
index ad015bd..f2a3fea 100644
--- a/public/blog/themes/elegant/style.css
+++ b/public/blog/themes/elegant/style.css
@@ -540,4 +540,7 @@ table tr:nth-child(2n) {
 	border: 1px solid #ddd;
 	border-collapse: collapse;
 	padding: 6px 13px;
+}
+.desc *, #content * {
+    word-wrap: break-word;
 }
\ No newline at end of file
diff --git a/public/blog/themes/nav_fixed/post.html b/public/blog/themes/nav_fixed/post.html
index 861c116..e616363 100644
--- a/public/blog/themes/nav_fixed/post.html
+++ b/public/blog/themes/nav_fixed/post.html
@@ -108,34 +108,17 @@ var commentNum = +"{{$.post.CommentNum}}";
 markdown 
 调用markdown来解析得到html
 -->
-
 {{if $.post.IsMarkdown }}
-<script src="/public/mdeditor/editor/pagedown/Markdown.Converter.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Sanitizer.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Editor.js"></script>
-<script src="/public/mdeditor/editor/pagedown/local/Markdown.local.zh.js"></script>
-<script src="/public/mdeditor/editor/Markdown.Extra.js"></script>
-
-<!--mathjax-->
-<script type="text/x-mathjax-config">
-  MathJax.Hub.Config({ tex2jax: { inlineMath: [['$','$'], ["\\(","\\)"]], processEscapes: true },  messageStyle: "none"});
-</script>
-<script src="/public/mdeditor/editor/mathJax.js"></script>
-<script src="/public/libs/MathJax/MathJax.js?config=TeX-AMS_HTML"></script>
+<script src="/public/libs/md2html/md2html.js"></script>
 <script>
 var content = $.trim($("#markdownContent textarea").val());
-var converter = Markdown.getSanitizingConverter();
-Markdown.Extra.init(converter, {extensions: ["tables", "fenced_code_gfm", "def_list"]});
-var html = converter.makeHtml(content);
-$("#content").html(html);
-$("pre").addClass("prettyprint linenums");
-prettyPrint();
-MathJax.Hub.Queue(["Typeset",MathJax.Hub,"wmd-preview"]);
-
-initNav();
-weixin();
+md2Html(content, $("#content"), function(html) {
+    $("pre").addClass("prettyprint linenums");
+    prettyPrint();
+    initNav();
+    weixin();
+});
 </script>
-
 <!-- 不是markdown -->
 {{else}}
 <script>
diff --git a/public/blog/themes/nav_fixed/style.css b/public/blog/themes/nav_fixed/style.css
index 725f5dc..68abd7e 100644
--- a/public/blog/themes/nav_fixed/style.css
+++ b/public/blog/themes/nav_fixed/style.css
@@ -580,3 +580,6 @@ table tr:nth-child(2n) {
 	border-collapse: collapse;
 	padding: 6px 13px;
 }
+.desc *, #content * {
+    word-wrap: break-word;
+}