diff --git a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
index ab13d90fd..db766d6c2 100755
--- a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
+++ b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
@@ -1,5 +1,3 @@
-@import url(http://fonts.googleapis.com/css?family=Mako);
-
 /*html { background: #eee; }
 body {
 	background: #fff;
@@ -13,7 +11,7 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
 */
 	
 
-.rg, .rgp { font-family: mako, 'Sans Serif'; }
+.rg, .rgp {  }
 .rg input, .rgp input, .rg textarea, .rgp textarea { 
 	resize: none;
 	border: none;
@@ -23,7 +21,6 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
 	padding: 0;
 	display: block;
 	font-size: 13px;
-	font-family: mako, 'Sans Serif';
 	}
 .rgp textarea { overflow: auto; }
 .rg a, .rgp a {
@@ -463,4 +460,9 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
 .rgih98.focus { background-position: 0 -326px; }
 .rgih98.focus span { background-position: right -326px; }
 
-.w380 { width: 380px; }
\ No newline at end of file
+.w380 { width: 380px; }
+
+#orbit_gallery .nav-tabs, #orbit_gallery .tab-pane {
+	margin-left: 8px;
+	margin-right: 8px;
+}
\ No newline at end of file
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb
index fa4c9a1e2..a2acd706c 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb
@@ -1,24 +1,63 @@
-<div class="albumname_edit">
-	<label for="">Album Name:</label>
-	<div class="inputui rginput rgih26 w380"><span><input type="text" id='album_name_text' value="<%= @album_name %>" class="txtchange" /></span></div>
-</div>
-<div id='description_loader'>
-	<% @images.each do |image| %>
-	<div class="rgphoto_edit">
-		<a href="orbit_gallery?theater=<%= image.id %>"><img src="<%= image.file.thumb.url %>"></a>
-		<div class="inputui rginput rgih98 w380">
-			<span>
-				<textarea  name="description_box" class="txtchange" for="<%= image.id%>"><%= image.description %></textarea>
-			</span>
+<%=
+# for tab effect, please check
+# /Users/ally/orbit/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+# from line 129
+%>
+<ul class="nav nav-tabs">
+    <li class="active"><a data-toggle="tab" href=".zh_tw">中文</a></li>
+    <li><a data-toggle="tab" href=".en">英文</a></li>
+</ul>
+<div class="tab_content">
+	<div class="zh_tw tab-pane in active">
+		<div class="albumname_edit">
+			<label for="">Album Name:</label>
+			<div class="inputui rginput rgih26 w380"><span><input type="text" id='album_name_text' value="<%= @album_name %>" class="txtchange" /></span></div>
 		</div>
-		<div class="edit_fn">
-			<a class="rgui rgbt rgbtsg bt-dels" onclick="return false;" title="Delete" href="<%= image.id %>">Delete</a>
-			<% if image.id.to_s == @cover %>
-				<a class="rgui rgbt rgbtsg bt-cover setcover" onclick="return false;" title="Set Cover" href="<%= image.id %>">Set Cover</a>
-			<% else %>
-				<a class="rgui rgbt rgbtsg bt-cover" onclick="return false;" title="Set Cover" href="<%= image.id %>">Set Cover</a>
+		<div id='description_loader'>
+			<% @images.each do |image| %>
+			<div class="rgphoto_edit">
+				<a href="orbit_gallery?theater=<%= image.id %>"><img src="<%= image.file.thumb.url %>"></a>
+				<div class="inputui rginput rgih98 w380">
+					<span>
+						<textarea  name="description_box" class="txtchange" for="<%= image.id%>"><%= image.description %></textarea>
+					</span>
+				</div>
+				<div class="edit_fn">
+					<a class="rgui rgbt rgbtsg bt-dels" onclick="return false;" title="Delete" href="<%= image.id %>">Delete</a>
+					<% if image.id.to_s == @cover %>
+						<a class="rgui rgbt rgbtsg bt-cover setcover" onclick="return false;" title="Set Cover" href="<%= image.id %>">Set Cover</a>
+					<% else %>
+						<a class="rgui rgbt rgbtsg bt-cover" onclick="return false;" title="Set Cover" href="<%= image.id %>">Set Cover</a>
+					<% end %>
+				</div>
+			</div>
+			<% end %>
+		</div>
+	</div>
+	<div class="en tab-pane">
+		<div class="albumname_edit">
+			<label for="">Album Name:</label>
+			<div class="inputui rginput rgih26 w380"><span><input type="text" id='album_name_text' value="<%= @album_name %>" class="txtchange" /></span></div>
+		</div>
+		<div id='description_loader'>
+			<% @images.each do |image| %>
+			<div class="rgphoto_edit">
+				<a href="orbit_gallery?theater=<%= image.id %>"><img src="<%= image.file.thumb.url %>"></a>
+				<div class="inputui rginput rgih98 w380">
+					<span>
+						<textarea  name="description_box" class="txtchange" for="<%= image.id%>"><%= image.description %></textarea>
+					</span>
+				</div>
+				<div class="edit_fn">
+					<a class="rgui rgbt rgbtsg bt-dels" onclick="return false;" title="Delete" href="<%= image.id %>">Delete</a>
+					<% if image.id.to_s == @cover %>
+						<a class="rgui rgbt rgbtsg bt-cover setcover" onclick="return false;" title="Set Cover" href="<%= image.id %>">Set Cover</a>
+					<% else %>
+						<a class="rgui rgbt rgbtsg bt-cover" onclick="return false;" title="Set Cover" href="<%= image.id %>">Set Cover</a>
+					<% end %>
+				</div>
+			</div>
 			<% end %>
 		</div>
 	</div>
-	<% end %>
 </div>
\ No newline at end of file
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb
index f728dd601..ff2ce70dc 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb
@@ -20,21 +20,6 @@
         <a href="panel/gallery/back_end/orbit_gallery" class="btn js_history"><i class="icons-brush-large"></i>清除</a>
       </div>
     </div>
-    <div class="table-label">
-      <table class="table main-list">
-        <thead>
-          <tr>
-            <th class="span1">
-              <input id="check_all" name="check_all" type="checkbox" value="1">
-              <a href="#" class="list-remove"><i class="icon-trash"></i></a>
-            </th>
-            <th class="span2">Thumbnail</th>
-            <th class="span2">Category</th>
-            <th>Title</th>
-          </tr>
-        </thead>
-      </table>
-    </div>
   </div>
 </div>
 <table id="gallery_list" class="table main-list">
diff --git a/vendor/built_in_modules/gallery/config/locales/zh_tw.yml b/vendor/built_in_modules/gallery/config/locales/zh_tw.yml
index 2b10604d2..97e59418b 100644
--- a/vendor/built_in_modules/gallery/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/gallery/config/locales/zh_tw.yml
@@ -1,25 +1,25 @@
 zh_tw:
   gallery:
-    album_name: Album Name
-    all: All
-    select_category: "--Select a category--"
-    manage_categories: Manage Categories
-    categories: Categories
-    new_category: New Category
-    save_changes: Save Changes
-    close: Close
-    delete: Delete
-    english: English
-    chinese: Chinese
-    album_desc: Album Desc
-    add_album: Add Album
-    back_to_photos: Back to Photos
-    back_to_albums: Back to Albums
-    add_images: Add Images
-    del_album: Delete Album
-    edit: Edit
-    delete_selected: Delete Selected
-    del_album?:  "Delete this album?"
-    album_not_found: "Album not found"
-    pic_not_found: "Picture not found"
+    album_name: 相簿名稱
+    all: 全部
+    select_category: 選擇類別
+    manage_categories: 類別管理
+    categories: 類別
+    new_category: 新類別
+    save_changes: 儲存變更
+    close: 關閉
+    delete: 刪除
+    english: 英文
+    chinese: 中文
+    album_desc: 相簿描述
+    add_album: 新增相簿
+    back_to_photos: 回到照片列表
+    back_to_albums: 回到相簿列表
+    add_images: 新增照片
+    del_album: 刪除相簿
+    edit: 編輯
+    delete_selected: 刪除已選擇項目
+    del_album?:  "刪除這本相簿嗎?"
+    album_not_found: "相簿不存在"
+    pic_not_found: "照片不存在"