diff --git a/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/cross/CrossAnalyzer.java b/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/cross/CrossAnalyzer.java
index 21923985c3fd26a65bea17e2a0afa2b0fcf4d1b5..8e8c892f4f8098f9447ac54c0161eacaaba35c99 100644
--- a/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/cross/CrossAnalyzer.java
+++ b/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/cross/CrossAnalyzer.java
@@ -60,7 +60,7 @@ public class CrossAnalyzer extends AbstractMessageAnalyzer<CrossReport> implemen
 	}
 
 	public CrossInfo parseCorssTransaction(Transaction t, MessageTree tree) {
-		if (m_serverConfigManager.shouldDiscard(t)) {
+		if (m_serverConfigManager.discardTransaction(t)) {
 			return null;
 		} else {
 			String type = t.getType();
diff --git a/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/dependency/DependencyAnalyzer.java b/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/dependency/DependencyAnalyzer.java
index 80dba03a1b3fbec5d833ceb8f110df8110621163..0ac05e6adecb40d13de7369e6721e5c4f18c8c86 100644
--- a/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/dependency/DependencyAnalyzer.java
+++ b/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/dependency/DependencyAnalyzer.java
@@ -169,7 +169,7 @@ public class DependencyAnalyzer extends AbstractMessageAnalyzer<DependencyReport
 	}
 
 	private void processTransaction(DependencyReport report, MessageTree tree, Transaction t) {
-		if (m_serverConfigManager.shouldDiscard(t)) {
+		if (m_serverConfigManager.discardTransaction(t)) {
 			return;
 		} else {
 			processTransactionType(report, t);
diff --git a/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/matrix/MatrixAnalyzer.java b/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/matrix/MatrixAnalyzer.java
index 9a34b77bbe4749742ea83ca776e2a7c2280b3493..361c70b355017135172ca5f71e4884f0ef7cbc4e 100644
--- a/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/matrix/MatrixAnalyzer.java
+++ b/cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/matrix/MatrixAnalyzer.java
@@ -65,7 +65,7 @@ public class MatrixAnalyzer extends AbstractMessageAnalyzer<MatrixReport> implem
 		if (message instanceof Transaction) {
 			String messageType = message.getType();
 
-			if (m_serverConfigManager.shouldDiscard((Transaction) message)) {
+			if (m_serverConfigManager.discardTransaction((Transaction) message)) {
 				return;
 			}
 			if (messageType.equals("URL") || messageType.equals("Service") || messageType.equals("PigeonService")) {
diff --git a/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionAnalyzer.java b/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionAnalyzer.java
index c261b4bed36db5457f328747678530c417af74ca..faa44a7b6be26375e06c8a37311b83998690ea13 100644
--- a/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionAnalyzer.java
+++ b/cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionAnalyzer.java
@@ -142,7 +142,7 @@ public class TransactionAnalyzer extends AbstractMessageAnalyzer<TransactionRepo
 	}
 
 	protected void processTransaction(TransactionReport report, MessageTree tree, Transaction t) {
-		if (m_serverConfigManager.shouldDiscard(t)) {
+		if (m_serverConfigManager.discardTransaction(t)) {
 			return;
 		} else {
 			String ip = tree.getIpAddress();
diff --git a/cat-core/src/main/java/com/dianping/cat/ServerConfigManager.java b/cat-core/src/main/java/com/dianping/cat/ServerConfigManager.java
index e4a2d418f048ee716274f69b6582f9f62135a396..c567a783235ec7e73f68f6ae92b091640db9ae0f 100644
--- a/cat-core/src/main/java/com/dianping/cat/ServerConfigManager.java
+++ b/cat-core/src/main/java/com/dianping/cat/ServerConfigManager.java
@@ -51,22 +51,6 @@ public class ServerConfigManager implements Initializable, LogEnabled {
 		return 2280;
 	}
 
-	public boolean isHdfsOn() {
-		return !m_config.getStorage().isHdfsDisabled();
-	}
-
-	public boolean isSerialWrite() {
-		return false;
-	}
-	
-	public boolean isClientCall(String type){
-		return "PigeonCall".equals(type) || "Call".equals(type);
-	}
-	
-	public boolean isServerService(String type){
-		return "PigeonService".equals(type) || "Service".equals(type);
-	}
-
 	public String getConsoleDefaultDomain() {
 		if (m_config != null) {
 			return m_config.getConsole().getDefaultDomain();
@@ -75,19 +59,6 @@ public class ServerConfigManager implements Initializable, LogEnabled {
 		}
 	}
 
-	public String getConsoleRemoteServers() {
-		if (m_config != null) {
-			ConsoleConfig console = m_config.getConsole();
-			String remoteServers = console.getRemoteServers();
-
-			if (remoteServers != null && remoteServers.length() > 0) {
-				return remoteServers;
-			}
-		}
-
-		return "";
-	}
-
 	public List<Pair<String, Integer>> getConsoleEndpoints() {
 		if (m_config != null) {
 			ConsoleConfig console = m_config.getConsole();
@@ -109,6 +80,27 @@ public class ServerConfigManager implements Initializable, LogEnabled {
 		}
 	}
 
+	public String getConsoleRemoteServers() {
+		if (m_config != null) {
+			ConsoleConfig console = m_config.getConsole();
+			String remoteServers = console.getRemoteServers();
+
+			if (remoteServers != null && remoteServers.length() > 0) {
+				return remoteServers;
+			}
+		}
+
+		return "";
+	}
+
+	public String getEmailAccount() {
+		return "book.robot.dianping@gmail.com";
+	}
+
+	public String getEmailPassword() {
+		return "xudgtsnoxivwclna";
+	}
+
 	public String getHdfsBaseDir(String id) {
 		if (m_config != null) {
 			HdfsConfig hdfsConfig = m_config.getStorage().findHdfs(id);
@@ -178,6 +170,10 @@ public class ServerConfigManager implements Initializable, LogEnabled {
 		return null;
 	}
 
+	public String getHttpSmsApi() {
+		return "";
+	}
+
 	public Map<String, Domain> getLongConfigDomains() {
 		if (m_config != null) {
 			LongConfig longConfig = m_config.getConsumer().getLongConfig();
@@ -228,6 +224,15 @@ public class ServerConfigManager implements Initializable, LogEnabled {
 		}
 	}
 
+	@Override
+	public void initialize() throws InitializationException {
+		m_unusedTypes.add("Service");
+		m_unusedTypes.add("PigeonService");
+		m_unusedNames.add("piegonService:heartTaskService:heartBeat");
+		m_unusedNames.add("piegonService:heartTaskService:heartBeat()");
+		m_unusedNames.add("pigeon:HeartBeatService:null");
+	}
+
 	public void initialize(File configFile) throws Exception {
 		if (configFile != null && configFile.canRead()) {
 			m_logger.info(String.format("Loading configuration file(%s) ...", configFile.getCanonicalPath()));
@@ -256,10 +261,26 @@ public class ServerConfigManager implements Initializable, LogEnabled {
 
 	}
 
+	public boolean isClientCall(String type) {
+		return "PigeonCall".equals(type) || "Call".equals(type);
+	}
+
+	public boolean isHdfsOn() {
+		return !m_config.getStorage().isHdfsDisabled();
+	}
+
 	public boolean isInitialized() {
 		return m_config != null;
 	}
 
+	public boolean isJobMachine() {
+		if (m_config != null) {
+			return m_config.isJobMachine();
+		} else {
+			return true;
+		}
+	}
+
 	public boolean isLocalMode() {
 		if (m_config != null) {
 			return m_config.isLocalMode();
@@ -268,12 +289,39 @@ public class ServerConfigManager implements Initializable, LogEnabled {
 		}
 	}
 
-	public boolean isJobMachine() {
-		if (m_config != null) {
-			return m_config.isJobMachine();
+	public boolean isOfflineServer(String ip) {
+		if (ip != null && ip.startsWith("192.")) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	public boolean isOnlineServer(String ip) {
+		if (ip != null && ip.startsWith("10.")) {
+			return true;
 		} else {
+			return false;
+		}
+	}
+
+	public boolean isSerialWrite() {
+		return false;
+	}
+
+	public boolean isServerService(String type) {
+		return "PigeonService".equals(type) || "Service".equals(type);
+	}
+
+	public boolean discardTransaction(Transaction t) {
+		// pigeon default heartbeat is no use
+		String type = t.getType();
+		String name = t.getName();
+
+		if (m_unusedTypes.contains(type) && m_unusedNames.contains(name)) {
 			return true;
 		}
+		return false;
 	}
 
 	private long toLong(String str, long defaultValue) {
@@ -303,52 +351,4 @@ public class ServerConfigManager implements Initializable, LogEnabled {
 		return !domain.equals("PhoenixAgent") && !domain.equals(Constants.FRONT_END);
 	}
 
-	public boolean shouldDiscard(Transaction t) {
-		// pigeon default heartbeat is no use
-		String type = t.getType();
-		String name = t.getName();
-
-		if (m_unusedTypes.contains(type) && m_unusedNames.contains(name)) {
-			return true;
-		}
-		return false;
-	}
-
-	public boolean isOnlineServer(String ip) {
-		if (ip != null && ip.startsWith("10.")) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public boolean isOfflineServer(String ip) {
-		if (ip != null && ip.startsWith("192.")) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	@Override
-	public void initialize() throws InitializationException {
-		m_unusedTypes.add("Service");
-		m_unusedTypes.add("PigeonService");
-		m_unusedNames.add("piegonService:heartTaskService:heartBeat");
-		m_unusedNames.add("piegonService:heartTaskService:heartBeat()");
-		m_unusedNames.add("pigeon:HeartBeatService:null");
-	}
-	
-	public String getEmailAccount(){
-		return "book.robot.dianping@gmail.com";
-	}
-	
-	public String getEmailPassword(){
-		return "xudgtsnoxivwclna";
-	}
-	
-	public String getHttpSmsApi(){
-		return "";
-	}
-
 }
diff --git a/cat-core/src/main/java/com/dianping/cat/storage/DefaultBucketManager.java b/cat-core/src/main/java/com/dianping/cat/storage/DefaultBucketManager.java
index cfe6f2017e1ebfbd4b84694d2fe652c304ee2803..2232b3a9a014bdc454de905e28f37d2282bb37a3 100644
--- a/cat-core/src/main/java/com/dianping/cat/storage/DefaultBucketManager.java
+++ b/cat-core/src/main/java/com/dianping/cat/storage/DefaultBucketManager.java
@@ -58,10 +58,6 @@ public class DefaultBucketManager extends ContainerHolder implements BucketManag
 		String path;
 		Date date = new Date(timestamp);
 
-//		if (type == MessageTree.class) {
-//			path = m_pathBuilder.getMessagePath(name, date);
-//		} else {
-//		}
 		path = m_pathBuilder.getReportPath(name, date);
 
 		Entry entry = new Entry(type, path, namespace);
@@ -86,7 +82,7 @@ public class DefaultBucketManager extends ContainerHolder implements BucketManag
 		return getBucket(String.class, timestamp, name, "report");
 	}
 
-	static class Entry {
+	public static class Entry {
 		private String m_namespace;
 
 		private String m_path;
diff --git a/cat-home/src/main/webapp/WEB-INF/tags/body.tag b/cat-home/src/main/webapp/WEB-INF/tags/body.tag
index 24f68866130fe9b906d16af07b3e679e4e21d260..8bcc03ccfeff6b744955f1acafa35dedf39c5f1b 100755
--- a/cat-home/src/main/webapp/WEB-INF/tags/body.tag
+++ b/cat-home/src/main/webapp/WEB-INF/tags/body.tag
@@ -58,7 +58,7 @@
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal"
 					aria-hidden="true">×</button>
-				<h4 id="myModalLabel" class="text-success">用户登录</h4>
+				<h4 id="myModalLabel" class="text-success text-center">用户登录</h4>
 			</div>
 			<div class="control-group">
 				<label class="control-label text-success" for="account">用户名</label>
@@ -111,11 +111,6 @@
 				$('#frequent').html("常用");
 			}
 		}
-		function buildHref(domain){
-			var href = '<a href="?op=history&domain='+domain+'&date=${model.date}">&nbsp;[&nbsp;'+domain+'&nbsp;]&nbsp;</a>';
-			return href;
-		}
-		
 		$(document).ready(function() {
 			var domains= getcookie('CAT_DOMAINS');
 			var domainArray =domains.split("|");
diff --git a/cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag b/cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag
index 7a0b2d86670eddd53a979d6d3bfc0d31d633f72b..4cf19049f96e2fa542a0ef16c2728a14e4ee3fb5 100755
--- a/cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag
+++ b/cat-home/src/main/webapp/WEB-INF/tags/historyReport.tag
@@ -9,6 +9,12 @@
 <%@ attribute name="subtitle" fragment="true"%>
 
 <a:body>
+<script>
+	function buildHref(domain){
+		var href = '<a href="?op=history&domain='+domain+'&date=${model.date}">&nbsp;[&nbsp;'+domain+'&nbsp;]&nbsp;</a>';
+		return href;
+	}
+</script>
 <div class="report">
 	<table class="header">
 		<tr>
diff --git a/cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag b/cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag
index 2aa1ae9c9328a1cd3e742ef1585604d0e12d292d..995d7ad510609e54920c7f5c7bde828109a1df3c 100755
--- a/cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag
+++ b/cat-home/src/main/webapp/WEB-INF/tags/hourlyReport.tag
@@ -9,6 +9,13 @@
 <%@ attribute name="subtitle" fragment="true"%>
 
 <a:body>
+<script>
+	function buildHref(domain){
+		var href = '<a href="?domain='+domain+'&date=${model.date}">&nbsp;[&nbsp;'+domain+'&nbsp;]&nbsp;</a>';
+		return href;
+	}
+</script>
+
 <div class="report">
 	<table class="header">
 		<tr>