diff --git a/search.php b/search.php
index 575c0e7c..fc84ebfe 100644
--- a/search.php
+++ b/search.php
@@ -1,104 +1,168 @@
-<?php
-define('FullTableScanTopicLimit', 50000);//当全站主题数量小于该值将会使用更消耗资源的全表扫描搜索
-require(__DIR__ . '/common.php');
-require(__DIR__ . '/language/' . ForumLanguage . '/home.php');
-include  __DIR__ . '/'. 'includes/SearchClient.class.php' ;
-
-$Page         = Request('Get', 'page');
-$Keyword      = Request('Get', 'keyword');
-$KeywordArray = explode(" ", $Keyword);
-$KeywordNum   = count($KeywordArray);
-$Error = '';
-if(!$KeywordNum){
-	AlertMsg('404 Not Found', '404 Not Found', 404);
-}
-if ($Page < 0 || $Page == 1) 
-	Redirect('search/' . $Keyword);
-if ($Page == 0)
-	$Page = 1;
-
-$limitSize = 30;
-
-//如果定义了搜索服务器，就走搜索服务
-if( defined('SearchServer') && SearchServer ) {
-	try {
-		$finds = SearchClient::searchLike( $Keyword, 'PostsIndexes' //关键字及索引
-			, ($Page-1)*$limitSize, $limitSize //页码
-			, ""//过滤条件
-			, 'PostTime desc'  //排序规则
-		);
-		if ( !empty($finds) ) {
-			$num = $finds[1];
-			$postIds = isset( $finds[0]['id'] ) ?$finds[0]['id']: null;
-			if( count($postIds ) > 0 ) {
-				$TopicsArray = $DB->query('SELECT t.`ID`, `Topic`, `Tags`, t.`UserID`, t.`UserName`, t.`LastName`, `LastTime`, `Replies` 
-					, p.Content, p.ID as pID, p.PostTime 
-					FROM ' . PREFIX . 'topics  t, '. PREFIX . 'posts p 
-					WHERE t.ID=p.TopicID and p.ID in (?) and t.IsDel=0 
-					ORDER BY p.PostTime DESC', 
-					$postIds);
-				foreach( $TopicsArray as &$row ) {
-					$excerpts = SearchClient::callProxy( 'buildExcerpts', array(
-						array($row['Topic'], $row['Content']), 'PostsIndexes'
-						, $Keyword, array( 
-							"before_match" => '<span class="search-keyword">', 
-							"after_match"=> "</span>" ) ) );
-					$row['MinContent'] = $excerpts[1];
-				}
-			}
-		}
-	}catch( Exception $e ) {
-		$Error = $e->getMessage();
-	}
-} else {
-//if($CurUserID && $Config['NumTopics'] <= FullTableScanTopicLimit){
-	if($Config['NumTopics'] <= FullTableScanTopicLimit){
-		$QueryString = str_repeat('or Topic LIKE ? or Tags LIKE ? ', $KeywordNum-1);
-		$SQLKeywordArray = array();
-		foreach ($KeywordArray as $Value) {
-			$SQLKeywordArray[] = '%'.$Value.'%';
-			$SQLKeywordArray[] = '%'.$Value.'%';
-		}
-		$TopicsArray = $DB->query('SELECT `ID`, `Topic`, `Tags`, `UserID`, `UserName`, `LastName`, `LastTime`, `Replies` FROM ' . PREFIX . 'topics 
-			WHERE Topic LIKE ? or Tags LIKE ? '.$QueryString.'
-			ORDER BY LastTime DESC 
-			LIMIT ' . ($Page - 1) * $Config['TopicsPerPage'] . ',' . $Config['TopicsPerPage'], 
-			$SQLKeywordArray
-		);
-	}else{
-		$QueryString = str_repeat('or Name LIKE ? ', $KeywordNum-1);
-		$SQLKeywordArray = array();
-		foreach ($KeywordArray as $Value) {
-			$SQLKeywordArray[] = '%'.$Value.'%';
-		}
-		$TagIDList = $DB->column('SELECT ID FROM ' . PREFIX . 'tags 
-			WHERE Name like ? '.$QueryString, 
-			$SQLKeywordArray
-		);
-		if (!$TagIDList)
-			AlertMsg('404 Not Found', '404 Not Found');
-		$TagIDArray = $DB->column('SELECT TopicID FROM ' . PREFIX . 'posttags 
-			WHERE TagID in (?) 
-			ORDER BY TopicID DESC 
-			LIMIT ' . ($Page - 1) * $Config['TopicsPerPage'] . ',' . $Config['TopicsPerPage'], 
-			$TagIDList);
-		$TopicsArray = array();
-		if($TagIDArray){
-			$TopicsArray = $DB->query('SELECT `ID`, `Topic`, `Tags`, `UserID`, `UserName`, `LastName`, `LastTime`, `Replies` FROM ' . PREFIX . 'topics 
-				force index(PRI) 
-				WHERE ID in (?) and IsDel=0 
-				ORDER BY LastTime DESC', 
-				$TagIDArray);
-		}
-	}
-}
-/*
-if($Page == 1 && !$TopicsArray){
-	AlertMsg('404 Not Found', '404 Not Found', 404);
-}
-*/
-$DB->CloseConnection();
-$PageTitle = $Lang['Search'].' '.$Keyword.' ';
-$PageTitle .= $Page > 1 ? ' Page' . $Page : '';
-$ContentFile  = $TemplatePath . 'search.php';
-include($TemplatePath . 'layout.php');
+<?php
+require(__DIR__ . '/common.php');
+require(__DIR__ . '/language/' . ForumLanguage . '/home.php');
+include __DIR__ . '/includes/SearchClient.class.php';
+
+$Page         = Request('Get', 'page');
+$Keyword      = Request('Get', 'keyword');
+$KeywordArray = array_unique(explode(" ", $Keyword));
+$Error        = '';
+
+$PostsSearch = false;//是否启用帖子搜索
+$PostsSearchOffset = array_search('post:true', $KeywordArray);
+if ($PostsSearchOffset !== false) {
+	$PostsSearch = true;
+	unset($KeywordArray[$PostsSearchOffset]);
+}
+ksort($KeywordArray);
+
+if (!$KeywordArray) {
+	AlertMsg('404 Not Found', '404 Not Found', 404);
+}
+if ($Page < 0 || $Page == 1)
+	Redirect('search/' . $Keyword);
+if ($Page == 0)
+	$Page = 1;
+
+$SQLKeywordArray = array();//查询关键字参数数组
+$AdvancedSearch = false;
+$NormalQuery = array();//普通查询条件，用OR连接
+$AdvancedQuery = array();//高级查询条件，用AND连接
+//关键词预处理
+foreach ($KeywordArray as $Key => $KeywordToken) {
+	//匹配用户名限制条件
+	preg_match('/user:(.*)/i', $KeywordToken, $SearchUserTopics);
+	if (!empty($SearchUserTopics[1]) && IsName($SearchUserTopics[1])){
+		$AdvancedSearch = true;
+		break;
+	}
+}
+
+// 禁止普通用户使用无索引的全文搜索
+if (!$AdvancedSearch && $CurUserRole < 2) {
+	$PostsSearch = false;
+}
+foreach ($KeywordArray as $Key => $KeywordToken) {
+	//匹配用户名限制条件
+	preg_match('/user:(.*)/i', $KeywordToken, $SearchUserTopics);
+	if (!empty($SearchUserTopics[1]) && IsName($SearchUserTopics[1])){
+		if ($PostsSearch) {
+			$AdvancedQuery[] = 'p.UserName = :PostUser';
+			$SQLKeywordArray['PostUser'] = $SearchUserTopics[1];
+		} else {
+			$AdvancedQuery[] = 't.UserName = :TopicUser';
+			$SQLKeywordArray['TopicUser'] = $SearchUserTopics[1];
+		}
+	} else {
+		$ParamName = substr(md5($KeywordToken), 0, 8);
+		if ($PostsSearch) {
+			$NormalQuery[] = 'p.Subject LIKE :Subject' . $ParamName . ' or p.Content LIKE :Content' . $ParamName;
+			$SQLKeywordArray['Subject' . $ParamName] = '%' . $KeywordToken . '%';
+			$SQLKeywordArray['Content' . $ParamName] = '%' . $KeywordToken . '%';
+		} else {
+			$NormalQuery[] = 't.Topic LIKE :Topic' . $ParamName . ' or t.Tags LIKE :Tag' . $ParamName;
+			$SQLKeywordArray['Topic' . $ParamName] = '%' . $KeywordToken . '%';
+			$SQLKeywordArray['Tag' . $ParamName] = '%' . $KeywordToken . '%';
+		}
+	}
+}
+
+$SearchCondition = array();
+$Temp = implode(' AND ', $AdvancedQuery);
+if (!empty($Temp)) {
+	$SearchCondition[] = $Temp;
+}
+$Temp = implode(' OR ', $NormalQuery);
+if (!empty($Temp)) {
+	$SearchCondition[] = '(' . $Temp . ')';
+}
+unset($Temp);
+$SearchConditionQuery = implode(' AND ', $SearchCondition);
+
+//如果定义了搜索服务器，并且不是高级搜索，就走搜索服务
+if (defined('SearchServer') && SearchServer && !$AdvancedSearch) {
+	try {
+		$finds = SearchClient::searchLike($Keyword, 'PostsIndexes' //关键字及索引
+			, ($Page - 1) * $Config['TopicsPerPage'], $Config['TopicsPerPage']
+			, "" //过滤条件
+			, 'PostTime desc' //排序规则
+		);
+		if (!empty($finds)) {
+			$num     = $finds[1];
+			$PostIdList = isset($finds[0]['id']) ? $finds[0]['id'] : null;
+			if (count($PostIdList) > 0) {
+				$TopicsArray = $DB->query('SELECT 				
+						t.`ID`,
+						t.`Topic`,
+						t.`Tags`,
+						t.`LastName`,
+						t.`Replies`,
+						p.`UserID`,
+						p.`UserName`,
+						p.`Content`,
+						p.`ID` AS PostID,
+						p.`PostTime` AS LastTime
+					FROM ' . PREFIX . 'topics  t, ' . PREFIX . 'posts p 
+					WHERE t.ID=p.TopicID and p.ID in (?) and t.IsDel=0 
+					ORDER BY p.PostTime DESC', $PostIdList);
+				foreach ($TopicsArray as &$row) {
+					$excerpts          = SearchClient::callProxy('buildExcerpts', array(
+						array(
+							$row['Topic'],
+							$row['Content']
+						),
+						'PostsIndexes',
+						$Keyword,
+						array(
+							"before_match" => '<span class="search-keyword">',
+							"after_match" => "</span>"
+						)
+					));
+					$row['MinContent'] = $excerpts[1];
+				}
+			}
+		}
+	}
+	catch (Exception $e) {
+		$Error = $e->getMessage();
+	}
+} else {
+	if ($PostsSearch) {
+		$SearchFields = 'SELECT 
+				t.`ID`,
+				t.`Topic`,
+				t.`Tags`,
+				t.`LastName`,
+				t.`Replies`,
+				p.`UserID`,
+				p.`UserName`,
+				p.`Content`,
+				p.`ID` AS PostID,
+				p.`PostTime` AS LastTime
+			FROM ' . PREFIX . 'posts p 
+			LEFT JOIN  ' . PREFIX . 'topics t 
+			ON t.ID=p.TopicID';
+	} else {
+		$SearchFields = 'SELECT t.`ID`, t.`Topic`, t.`Tags`, t.`UserID`, t.`UserName`, t.`LastName`, t.`LastTime`, t.`Replies` 
+			FROM ' . PREFIX . 'topics t ';
+	}
+		$TopicsArray = $DB->query($SearchFields . ' 
+			WHERE ' . $SearchConditionQuery . ' 
+			ORDER BY LastTime DESC 
+			LIMIT ' . ($Page - 1) * $Config['TopicsPerPage'] . ', ' . $Config['TopicsPerPage'], $SQLKeywordArray);
+		if ($PostsSearch) {
+			foreach ($TopicsArray as &$Topic) {
+				$Topic['MinContent'] = strip_tags(mb_substr($Topic['Content'], 0, 300, 'utf-8'),'<p><br>');
+			}
+		}
+}
+/*
+if($Page == 1 && !$TopicsArray){
+AlertMsg('404 Not Found', '404 Not Found', 404);
+}
+*/
+$DB->CloseConnection();
+$PageTitle = $Lang['Search'] . ' ' . $Keyword . ' ';
+$PageTitle .= $Page > 1 ? ' Page' . $Page : '';
+$ContentFile = $TemplatePath . 'search.php';
+include($TemplatePath . 'layout.php');
diff --git a/static/editor/dialogs/video/video.js b/static/editor/dialogs/video/video.js
index 5069b5d3..7e8a23b6 100644
--- a/static/editor/dialogs/video/video.js
+++ b/static/editor/dialogs/video/video.js
@@ -74,16 +74,13 @@
 		dialog.onok = function(){
 			$G("preview").innerHTML = "";
 			var currentTab =  findFocus("tabHeads","tabSrc");
-			switch(currentTab){
+			switch(currentTab) {
 				case "video":
 					return insertSingle();
-					break;
 				case "videoSearch":
 					return insertSearch("searchList");
-					break;
 				case "upload":
 					return insertUpload();
-					break;
 			}
 		};
 		dialog.oncancel = function(){
@@ -139,8 +136,8 @@
 			if(img.getAttribute("selected")){
 				videoObjs.push({
 					url:img.getAttribute("ue_video_url"),
-					width:420,
-					height:280,
+					width:650,
+					height:380,
 					align:"none"
 				});
 			}
@@ -273,8 +270,8 @@
 		$G("preview").innerHTML = '<div class="previewMsg"><span>'+lang.urlError+'</span></div>'+
 		'<embed class="previewVideo" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer"' +
 			' src="' + conUrl + '"' +
-			' width="' + 420  + '"' +
-			' height="' + 280  + '"' +
+			' width="' + 650  + '"' +
+			' height="' + 380  + '"' +
 			' wmode="transparent" play="true" loop="false" menu="false" allowscriptaccess="never" allowfullscreen="true" >' +
 		'</embed>';
 	}
@@ -284,8 +281,8 @@
 	function insertUpload(){
 		var videoObjs=[],
 			uploadDir = editor.getOpt('videoUrlPrefix'),
-			width = $G('upload_width').value || 420,
-			height = $G('upload_height').value || 280,
+			width = $G('upload_width').value || 650,
+			height = $G('upload_height').value || 380,
 			align = findFocus("upload_alignment","name") || 'none';
 		for(var key in uploadVideoList) {
 			var file = uploadVideoList[key];
diff --git a/styles/default/template/layout.php b/styles/default/template/layout.php
index af43817d..de1ee5f9 100644
--- a/styles/default/template/layout.php
+++ b/styles/default/template/layout.php
@@ -1,5 +1,8 @@
 <?php
 if (!defined('InternalAccess')) exit('error: 403 Access Denied');
+
+$LayoutPageTitle = ($CurUserID && $CurUserInfo['NewMessage']?str_replace('{{NewMessage}}', $CurUserInfo['NewMessage'], $Lang['New_Message']):'') . $PageTitle . ($UrlPath=='index'?'':' - '.$Config['SiteName']);
+
 header("Cache-Control: no-store, no-cache, must-revalidate, max-age=0");
 header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");
@@ -32,10 +35,7 @@
 }
 ?>
 	<meta name="msapplication-TileImage" content="<?php echo $Config['WebsitePath']; ?>/static/img/retinahd_icon.png" />
-	<title><?php
-echo $CurUserID && $CurUserInfo['NewMessage']?str_replace('{{NewMessage}}', $CurUserInfo['NewMessage'], $Lang['New_Message']):'';
-echo $PageTitle;
-echo $UrlPath=='index'?'':' - '.$Config['SiteName']; ?></title>
+	<title><?php echo $LayoutPageTitle; ?></title>
 	<!--link rel="dns-prefetch" href="//<?php echo $Config['MainDomainName']; ?>" />
 	<link rel="prefetch" href="//<?php echo $Config['MainDomainName']; ?>" /-->  
 	<link rel="apple-touch-icon-precomposed" href="<?php echo $Config['WebsitePath']; ?>/static/img/apple-touch-icon-57x57-precomposed.png" />
@@ -63,9 +63,9 @@
 <body>
 	<!-- content wrapper start -->
 	<div class="wrapper">
-		<div class="navBar">
-			<div class="navPanel">
-				<div class="innerNavPanel">
+		<div class="nav-bar">
+			<div class="nav-panel">
+				<div class="inner-nav-panel">
 					<div class="logo">
 						<a href="<?php echo $Config['WebsitePath']; ?>/">
 							<img src="<?php echo $Config['WebsitePath']; ?>/static/img/logo.png" alt="<?php echo $Lang['Home']; ?>" />
@@ -76,15 +76,9 @@
 						<input type="text" id="SearchInput" onkeydown="javascript:if((event.keyCode==13)&&(this.value!='')){$('#SearchButton').trigger('click');}" placeholder="<?php echo $Lang['Search']; ?>"<?php echo $UrlPath=='search'&&!empty($Keyword)?' value="'.$Keyword.'"':'';?> />
 						<a href="###" id="SearchButton"><div class="icon icon-search"></div></a>
 					</div>
-					
-					
 	<?php
 	if($CurUserID){
 	?>
-					
-					
-					
-
 					<a href="<?php echo $Config['WebsitePath']; ?>/settings" title="<?php echo $Lang['Settings']; ?>"<?php echo $UrlPath=='settings'?' class="buttons-active"':''; ?>><div class="icon icon-settings"></div></a>
 					<a href="<?php echo $Config['WebsitePath']; ?>/notifications#notifications1" title="<?php echo $Lang['Notifications']; ?>"<?php echo $UrlPath=='notifications'?' class="buttons-active"':''; ?> onclick="javascript:ShowNotification(0);"><div class="icon icon-notifications"></div><span class="icon-messages-num" id="MessageNumber">0</span></a>
 	<?php
@@ -123,16 +117,27 @@
 			</div>
 		</div>
 		<!-- main start -->
+		<div class="main-content"></div>
 <?php
 }else{
-	echo '<title>';
-	echo $CurUserID && $CurUserInfo['NewMessage']?str_replace('{{NewMessage}}', $CurUserInfo['NewMessage'], $Lang['New_Message']):'';
-	echo $PageTitle;
-	echo $UrlPath=='index'?'':' - '.$Config['SiteName'];
-	echo '</title>';
+?>
+		<title><?php echo $LayoutPageTitle; ?></title>
+<?php
 }
 ?>
 		<div class="main" id="main">
+<?php
+			if ($IsMobile && $Config['MobileDomainName']) {
+?>
+			<div class="swtich-to-mobile">
+				<a href="<?php echo $CurProtocol . $Config['MainDomainName']; ?>/view-mobile?callback=<?php echo urlencode($RequestURI); ?>">
+					<?php echo $Lang['Mobile_Version']; ?>
+				</a>
+			</div>
+<?php
+			}
+?>
+			
 			<?php
 			include($ContentFile);
 			?>
@@ -150,13 +155,6 @@
 			<p>
 			<?php echo $Config['SiteName']; ?> Powered By © 2006-2016 <a href="http://www.94cb.com" target="_blank">Carbon Forum</a> V<?php echo $Config['Version']; ?>
 			<a href="<?php echo $Config['WebsitePath']; ?>/statistics"><?php echo $Lang['Statistics']; ?></a>
-			<?php
-			if ($IsMobile && $Config['MobileDomainName']) {
-			?>
-			&nbsp;&nbsp;<a href="<?php echo $CurProtocol . $Config['MainDomainName']; ?>/view-mobile?callback=<?php echo urlencode($RequestURI); ?>"><?php echo $Lang['Mobile_Version']; ?></a>
-			<?php
-			}
-			?>
 			<br />
 <?php
 $MicroTime = explode(' ', microtime());
diff --git a/styles/default/template/search.php b/styles/default/template/search.php
index 327a05be..183ba724 100644
--- a/styles/default/template/search.php
+++ b/styles/default/template/search.php
@@ -7,7 +7,7 @@ function KeywordHighlight($Content)
 	if ($KeywordArray) {
 		$KeywordHighlightArray = array();
 		foreach ($KeywordArray as $Value) {
-			$KeywordHighlightArray[] = '<span class="red">' . $Value . '</span>';
+			$KeywordHighlightArray[] = '<span class="search-keyword">' . $Value . '</span>';
 		}
 		return str_ireplace($KeywordArray, $KeywordHighlightArray, $Content);
 	} else {
@@ -38,11 +38,23 @@ function KeywordHighlight($Content)
 			</div>
 			<div class="item-content">
 				<h2>
-					<a href="<?php echo $Config['WebsitePath']; ?>/t/<?php echo $Topic['ID']; ?>"><?php echo KeywordHighlight($Topic['Topic']); ?></a>
+<?php
+if (empty($Topic['PostID'])):
+?>
+					<a href="<?php echo $Config['WebsitePath']; ?>/t/<?php echo $Topic['ID']; ?>">	
+<?php
+else:
+?>
+					<a href="/goto/<?php echo $Topic['ID']; ?>-<?php echo $Topic['PostID']; ?>#Post<?php echo $Topic['PostID']; ?>">
+<?php
+endif
+?>
+						<?php echo KeywordHighlight($Topic['Topic']); ?>
+					</a>
 				</h2>
                 <?php if( isset($Topic['MinContent']) ) { ?>
                 <div class="topic-dec">
-                    <?php echo $Topic['MinContent']; ?>
+                    <?php echo $PostsSearch ? KeywordHighlight($Topic['MinContent']) : $Topic['MinContent']; ?>
                 </div>
                 <?php } ?>
 				<span class="item-tags">
diff --git a/styles/default/template/sider.php b/styles/default/template/sider.php
index c39f399c..e57cec4f 100644
--- a/styles/default/template/sider.php
+++ b/styles/default/template/sider.php
@@ -47,13 +47,13 @@
 		<span class="float-right"><a href="<?php echo $Config['WebsitePath']; ?>/login?logout=<?php echo $CurUserCode; ?>"><?php echo $Lang['Log_Out']; ?></a></span>
 	</div>
 	<div class="sider-box-content">
-		<div class="User-Pannel-Avatar">
+		<div class="user-pannel-avatar">
 			<a href="<?php echo $Config['WebsitePath']; ?>/u/<?php echo urlencode($CurUserName); ?>">
 				<?php echo GetAvatar($CurUserID, $CurUserName, 'large'); ?>
 			</a>
 		</div>
-		<div class="User-Pannel">
-			<div class="User-Pannel-Name">
+		<div class="user-pannel">
+			<div class="user-pannel-name">
 				<a href="<?php echo $Config['WebsitePath']; ?>/u/<?php echo urlencode($CurUserName); ?>"><?php echo $CurUserName; ?></a>
 			</div>
 			<ul>
diff --git a/styles/default/template/tags.php b/styles/default/template/tags.php
index 6c4d32c7..b3e64a2a 100644
--- a/styles/default/template/tags.php
+++ b/styles/default/template/tags.php
@@ -42,7 +42,7 @@
 				</div>
 				<div class="c"></div>
 			</div>
-			<p class="fs14"><?php echo ($Tag['Description']? mb_strlen($Tag['Description']) > 60 ? mb_substr($Tag['Description'], 0, 60, 'utf-8').'……' : $Tag['Description'] : '' ); ?></p>
+			<p class="fs14"><?php echo ($Tag['Description']? mb_strlen($Tag['Description']) > 60 ? mb_substr($Tag['Description'], 0, 60, 'utf-8').'……' : $DescStr : '' ); ?></p>
 		</div>
 <?php
 }
diff --git a/styles/default/theme/style.css b/styles/default/theme/style.css
index 903ea142..03fc8a9e 100644
--- a/styles/default/theme/style.css
+++ b/styles/default/theme/style.css
@@ -22,45 +22,45 @@ body {
 	color: #000000;
 	line-height: 1.5;
 	background: #F9F9F9;
-	margin: 0px;
-	padding: 0px;
+	margin: 0;
+	padding: 0;
 }
 /* title */
 .topic-content h1, .comment-content h1 {
 	color: #555;
 	font-size: 180%;
 	font-weight: bold;
-	padding: 15px 0px 15px 0px;
-	margin: 10px 0px 10px 0px;
+	padding: 15px 0 15px 0;
+	margin: 10px 0 10px 0;
 	border-bottom: 1px dashed #33B5E5;
 }
 .topic-content h2, .comment-content h2 {
 	color: #555;
 	font-size: 160%;
 	font-weight: bold;
-	padding: 15px 0px 15px 10px;
-	margin: 10px 0px 10px 0px;
+	padding: 15px 0 15px 10px;
+	margin: 10px 0 10px 0;
 	border-bottom: 1px dashed #33B5E5;
 }
 .topic-content h3, .comment-content h3 {
 	color: #555;
 	font-size: 140%;
 	font-weight: bold;
-	padding: 5px 0px 5px 20px;
-	margin: 10px 0px 10px 0px;
+	padding: 5px 0 5px 20px;
+	margin: 10px 0 10px 0;
 }
 .topic-content h4, .comment-content h4 {
 	color: #555;
 	font-size: 120%;
 	font-weight: bold;
 	padding: 5px 5px 5px 30px;
-	margin: 10px 0px 5px 0px;
+	margin: 10px 0 5px 0;
 }
 /* text*/
 p {
 	line-height: 1.5;
-	margin: 5px 0px 10px 0px;
-	padding: 0px;
+	margin: 5px 0 10px 0;
+	padding: 0;
 }
 /* links*/
 a, a:link, a:visited, a:active {
@@ -205,8 +205,8 @@ blockquote {
 }
 /* tabs */
 ul.resp-tabs-list {
-	margin: 0px;
-	padding: 0px;
+	margin: 0;
+	padding: 0;
 }
 .resp-tabs-list li {
 	font-size: 14px;
@@ -280,11 +280,11 @@ h2.resp-accordion {
 /* other*/
 .wrapper {
 	min-width:980px;
-	margin:0px auto;
-	padding: 0px;
+	margin:0 auto;
+	padding: 0;
 }
 /****** Nav Panel ******/
-.navBar{
+.nav-bar{
 	position: fixed;
 	width: 100%;
 	padding: 0 auto;
@@ -296,16 +296,16 @@ h2.resp-accordion {
 	opacity: 0.9;
 	z-index: 9999;
 }
-.navPanel {
+.nav-panel {
 	min-width:960px;
 	background: #f9f9f9;
-	padding: 0px 10px 0px 10px;
+	padding: 0 10px 0 10px;
 	border-bottom: 1px solid #4fc3f7;
 	box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.07);
 }
-.innerNavPanel {
+.inner-nav-panel {
 	width:960px;
-	margin:0px auto;
+	margin:0 auto;
 }
 /* logo */
 .logo {
@@ -320,7 +320,7 @@ h2.resp-accordion {
 	height: 40px;
 }
 .logo img:hover {
-	box-shadow: 0px 0px 15px rgba(0, 0, 0, 0.3);
+	box-shadow: 0 0 15px rgba(0, 0, 0, 0.3);
 	transition: box-shadow 0.5s ease-in-out;
 	-moz-transition: border-bottom 0.5s; /* Firefox 4 */
 	-webkit-transition: border-bottom 0.5s; /* Safari and Chrome */
@@ -399,7 +399,7 @@ h2.resp-accordion {
 /* sorry for this ie6 hack*/
  * html .buttons img {
 	float: left;
-	margin: 5px 5px 5px 0px;
+	margin: 5px 5px 5px 0;
 }
 .emptyProgressBar{
 	height: 3px;
@@ -412,15 +412,22 @@ h2.resp-accordion {
 }
 
 .progressBar .bar1{
-	width: 0%;
+	width: 0;
 	height: 3px;
 	background-color: #4fc3f7;
 }
 
+.swtich-to-mobile {
+	margin: 10px auto 20px auto;
+	text-align: center;
+	font-size: 60px;
+	box-shadow: 2px 2px 5px #d3d6da;
+}
+
 .Copyright {
 	min-width:960px;
 	margin: auto;
-	padding: 0px;
+	padding: 0;
 	text-align:center;
 }
 .hide {
@@ -433,7 +440,7 @@ h2.resp-accordion {
 	float:left;
 }
 .float-right {
-	float:right !important;
+	float: right !important;
 }
 .text-center {
 	text-align:center;
@@ -499,7 +506,7 @@ img .avatar {
 	font-size:12px;
 	background-color:#000;
 	border-radius:5px;
-	box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.15);
+	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.15);
 }
 .title {
 	background: #ECECEC;
@@ -540,7 +547,7 @@ img .avatar {
 	box-shadow: 2px 2px 5px #d3d6da;
 }
 .without-title {
-	border-top: 0px solid #E2E2E9;
+	border-top: 0 solid #E2E2E9;
 }
 .home-box-list {
 	width:670px;
@@ -608,7 +615,7 @@ img .avatar {
 	font-weight: bold;
 }
 .topic-tags .edittag{
-	vertical-align: center;
+	vertical-align: central;
 	cursor:pointer;
 	font-style: italic;
 	border:none;
@@ -725,6 +732,7 @@ img .avatar {
 	cursor: pointer;
 	transition:background-color 0.2s ease-in-out;
 }
+/* comment */
 .comment-item {
 	border-bottom: 1px solid #EFEFEF;
 	padding:0 10px 0 10px;
@@ -888,23 +896,23 @@ img .avatar {
 	max-width: 250px;
 }
 /* User Pannel*/
-.User-Pannel-Avatar{
+.user-pannel-avatar{
 	width: 128px;
 	padding: 0 61px;
 }
-.User-Pannel-Avatar img{
+.user-pannel-avatar img{
 	margin-top: 10px;
 	max-width: 128px;
 	max-height: 128px;
 	border-radius: 50%;
 }
-.User-Pannel-Name{
+.user-pannel-name{
 	font-size: 16px;
 	text-align: center;
 	font-weight: bold;
 	padding: 8px 0;
 }
-.User-Pannel ul{
+.user-pannel ul{
 	height: 42px !important;
 	overflow: hidden !important;
 	margin: 10px 0 0 0 !important;
@@ -914,7 +922,7 @@ img .avatar {
 	display: block !important;
 	clear: both !important;
 }
-.User-Pannel li{
+.user-pannel li{
 	display: inline !important;
 	float: left;
 	width: 82px !important;
@@ -926,7 +934,7 @@ img .avatar {
 	padding: 0 !important;
 	clear: none !important
 }
-.User-Pannel li strong{
+.user-pannel li strong{
 	color: #333;
 	display: block !important;
 	font-weight: bold !important;
@@ -934,11 +942,11 @@ img .avatar {
 	width: 82px !important;
 	overflow: hidden !important;
 }
-.User-Pannel li span{
+.user-pannel li span{
 	font-size: 12px !important;
 	color:#808080;
 }
-.User-Pannel li strong:hover{
+.user-pannel li strong:hover{
 	color: #4fc3f7;
 }
 /* FORM end*/
diff --git a/styles/mobile/template/tags.php b/styles/mobile/template/tags.php
index 9347cd9b..b556f4e3 100644
--- a/styles/mobile/template/tags.php
+++ b/styles/mobile/template/tags.php
@@ -22,7 +22,7 @@
 				<?php echo $Tag['Name']; ?>    (<?php echo $Tag['TotalPosts']; ?>)
 			</a>
 		</h2>
-		<p><?php echo ($Tag['Description']? mb_strlen($Tag['Description']) > 60 ? mb_substr($Tag['Description'], 0, 60, 'utf-8').'……' : $Tag['Description'] : '' ); ?>
+		<p><?php echo ($Tag['Description']? mb_strlen($Tag['Description']) > 60 ? mb_substr($Tag['Description'], 0, 60, 'utf-8').'……' : $DescStr : '' ); ?>
 		</p>
 		</div>