diff --git a/src/main/webapp/scripts/directives/navbar.js b/src/main/webapp/scripts/directives/navbar.js
index 06116055f..f318bbe24 100644
--- a/src/main/webapp/scripts/directives/navbar.js
+++ b/src/main/webapp/scripts/directives/navbar.js
@@ -47,6 +47,8 @@ pinpointApp.directive('navbar', [ 'navbarConfig', '$rootScope', '$http',
                 $timeout(function () {
                     if ($routeParams.queryEndTime) {
                         setDateTime($routeParams.queryEndTime);
+                    } else {
+                        setDateTime();
                     }
                 });
 
diff --git a/src/main/webapp/scripts/directives/nodeInfoDetails.js b/src/main/webapp/scripts/directives/nodeInfoDetails.js
index d1a8645b0..ae8df0b0e 100644
--- a/src/main/webapp/scripts/directives/nodeInfoDetails.js
+++ b/src/main/webapp/scripts/directives/nodeInfoDetails.js
@@ -6,7 +6,7 @@ pinpointApp.constant('nodeInfoDetailsConfig', {
 });
 
 pinpointApp
-    .directive('nodeInfoDetails', [ 'nodeInfoDetailsConfig', '$rootScope', '$templateCache', function (config, $rootScope, $templateCache) {
+    .directive('nodeInfoDetails', [ 'nodeInfoDetailsConfig', function (config) {
         return {
             restrict: 'EA',
             replace: true,
@@ -14,6 +14,7 @@ pinpointApp
             link: function postLink(scope, element, attrs) {
 
                 var reset = function () {
+                    scope.nodeName = null;
                     scope.nodeCategory = null;
                     scope.unknownGroup = null;
                     scope.hosts = null;
@@ -25,6 +26,7 @@ pinpointApp
                 };
 
                 var showDetailInformation = function (query, data) {
+                    scope.nodeName = data.text;
                     scope.nodeCategory = data.category;
                     scope.unknownGroup = data.textArr;
                     scope.hosts = data.hosts;
diff --git a/src/main/webapp/views/nodeInfoDetails.html b/src/main/webapp/views/nodeInfoDetails.html
index dbd7f5e3b..1c208a9e9 100644
--- a/src/main/webapp/views/nodeInfoDetails.html
+++ b/src/main/webapp/views/nodeInfoDetails.html
@@ -10,11 +10,16 @@
 		</div>
 
 		<div ng-switch-when="USER">
-			<img src="/images/icons/USER.png" width="20" height="10" /> USER
+            <div class="alert alert-info text-center">
+			    <img src="/images/icons/USER.png" width="20" height="10" /> USER
+            </div>
 		</div>
 
 		<div ng-switch-default>
 			<div ng-show="showHosts">
+                <div class="alert alert-info text-center">
+                    <img ng-src="/images/icons/{{nodeCategory}}.png" width="20" height="10" /> {{nodeName}}
+                </div>
 				<h5>Hosts</h5>
 				<ul>
 					<li ng-repeat="host in hosts">
diff --git a/src/main/webapp/views/servermap.html b/src/main/webapp/views/servermap.html
index 0462f39c3..53149d554 100644
--- a/src/main/webapp/views/servermap.html
+++ b/src/main/webapp/views/servermap.html
@@ -5,26 +5,26 @@
 	<div ng-include=" 'loading' "></div>
 
     <ul ng-style="nodeContextMenuStyle" class="nodeContextMenu dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="z-index:10">
-        <li><a tabindex="-1" ng-click="passingTransactionList()"><i class="icon-map-marker"></i> Passing Transaction List</a></li>
+        <li><a href tabindex="-1" ng-click="passingTransactionList()"><i class="icon-map-marker"></i> Passing Transaction List</a></li>
         <li class="divider"></li>
-        <li><a tabindex="-1" ng-click="passingTransactionResponseToScatterChart()"><i class="icon-list"></i> Passing Transaction Response to Scatter Chart</a></li>
+        <li><a href tabindex="-1" ng-click="passingTransactionResponseToScatterChart()"><i class="icon-list"></i> Passing Transaction Response to Scatter Chart</a></li>
     </ul>
 
     <ul ng-style="linkContextMenuStyle" class="linkContextMenu dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="z-index:10">
-        <li><a tabindex="-1" ng-click="passingTransactionMap()"><i class="icon-map-marker"></i> Passing Transaction Map</a></li>
+        <li><a href tabindex="-1" ng-click="passingTransactionMap()"><i class="icon-map-marker"></i> Passing Transaction Map</a></li>
         <li class="divider"></li>
-        <li><a tabindex="-1" ng-click="passingTransactionList()"><i class="icon-list"></i> Passing Transaction List</a></li>
+        <li><a href tabindex="-1" ng-click="passingTransactionList()"><i class="icon-list"></i> Passing Transaction List</a></li>
     </ul>
 
     <ul ng-style="backgroundContextMenuStyle" class="backgroundContextMenu dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="z-index:10">
-        <li><a ng-click="toggleMergeUnknowns()"><i class="icon-ok" ng-class="{'icon-white': !mergeUnknowns}"></i> Merge unknowns</a></li>
-        <li><a ng-click="toggleHideIndirectAccess()"><i class="icon-ok" ng-class="{'icon-white': !hideIndirectAccess}"></i> Hide indirect access</a></li>
+        <li><a href ng-click="toggleMergeUnknowns()"><i class="icon-ok" ng-class="{'icon-white': !mergeUnknowns}"></i> Merge unknowns</a></li>
+        <li><a href ng-click="toggleHideIndirectAccess()"><i class="icon-ok" ng-class="{'icon-white': !hideIndirectAccess}"></i> Hide indirect access</a></li>
         <li class="divider"></li>
         <li class="dropdown-submenu">
-            <a tabindex="-1">Link Label Text Type</a>
+            <a tabindex="-1" href>Link Label Text Type</a>
             <ul class="dropdown-menu">
-                <li><a class="labelTextType" ng-click="toggleLinkLableTextType('totalRequestCount')"><i class="icon-ok" ng-class="{'icon-white': !totalRequestCount}"></i> Total Request Count</a></li>
-                <li><a class="labelTextType" ng-click="toggleLinkLableTextType('tps')"><i class="icon-ok" ng-class="{'icon-white': !tps}"></i> TPS</a></li>
+                <li><a href class="labelTextType" ng-click="toggleLinkLableTextType('totalRequestCount')"><i class="icon-ok" ng-class="{'icon-white': !totalRequestCount}"></i> Total Request Count</a></li>
+                <li><a href class="labelTextType" ng-click="toggleLinkLableTextType('tps')"><i class="icon-ok" ng-class="{'icon-white': !tps}"></i> TPS</a></li>
             </ul>
         </li>
     </ul>