diff --git a/ui/jsp/event.jsp b/ui/jsp/event.jsp
index fe09582bac9..374ee028c04 100644
--- a/ui/jsp/event.jsp
+++ b/ui/jsp/event.jsp
@@ -124,128 +124,132 @@
 
 <!-- advanced search template (begin) -->
 <div id="advanced_search_template" class="adv_searchpopup" style="display: none;">
-    <div class="adv_searchformbox">
-        <h3>
-            Advance Search</h3>
-        <a id="advanced_search_close" href="#">Close </a>
-        <form action="#" method="post">
-        <ol>
-            <li>
-                <label>
-                    Type:</label>
-                <select class="select" id="adv_search_type">
-                    <option value=""></option>
-                    <option value="VM.CREATE">VM.CREATE</option>
-                    <option value="VM.DESTROY">VM.DESTROY</option>
-                    <option value="VM.START">VM.START</option>
-                    <option value="VM.STOP">VM.STOP</option>
-                    <option value="VM.REBOOT">VM.REBOOT</option>
-                    <option value="VM.DISABLEHA">VM.DISABLEHA</option>
-                    <option value="VM.ENABLEHA">VM.ENABLEHA</option>
-                    <option value="VM.UPGRADE">VM.UPGRADE</option>
-                    <option value="VM.RESETPASSWORD">VM.RESETPASSWORD</option>
-                    <option value="ROUTER.CREATE">ROUTER.CREATE</option>
-                    <option value="ROUTER.DESTROY">ROUTER.DESTROY</option>
-                    <option value="ROUTER.START">ROUTER.START</option>
-                    <option value="ROUTER.STOP">ROUTER.STOP</option>
-                    <option value="ROUTER.REBOOT">ROUTER.REBOOT</option>
-                    <option value="ROUTER.HA">ROUTER.HA</option>
-                    <option value="PROXY.CREATE">PROXY.CREATE</option>
-                    <option value="PROXY.DESTROY">PROXY.DESTROY</option>
-                    <option value="PROXY.START">PROXY.START</option>
-                    <option value="PROXY.STOP">PROXY.STOP</option>
-                    <option value="PROXY.REBOOT">PROXY.REBOOT</option>
-                    <option value="PROXY.HA">PROXY.HA</option>
-                    <option value="VNC.CONNECT">VNC.CONNECT</option>
-                    <option value="VNC.DISCONNECT">VNC.DISCONNECT</option>
-                    <option value="NET.IPASSIGN">NET.IPASSIGN</option>
-                    <option value="NET.IPRELEASE">NET.IPRELEASE</option>
-                    <option value="NET.RULEADD">NET.RULEADD</option>
-                    <option value="NET.RULEDELETE">NET.RULEDELETE</option>
-                    <option value="NET.RULEMODIFY">NET.RULEMODIFY</option>                   
-                    <option value="PF.SERVICE.APPLY">PF.SERVICE.APPLY</option>
-                    <option value="PF.SERVICE.REMOVE">PF.SERVICE.REMOVE</option>
-                    <option value="SECGROUP.APPLY">SECGROUP.APPLY</option>
-                    <option value="SECGROUP.REMOVE">SECGROUP.REMOVE</option>
-                    <option value="LB.CREATE">LB.CREATE</option>
-                    <option value="LB.DELETE">LB.DELETE</option>
-                    <option value="USER.LOGIN">USER.LOGIN</option>
-                    <option value="USER.LOGOUT">USER.LOGOUT</option>
-                    <option value="USER.CREATE">USER.CREATE</option>
-                    <option value="USER.DELETE">USER.DELETE</option>
-                    <option value="USER.UPDATE">USER.UPDATE</option>
-                    <option value="TEMPLATE.CREATE">TEMPLATE.CREATE</option>
-                    <option value="TEMPLATE.DELETE">TEMPLATE.DELETE</option>
-                    <option value="TEMPLATE.UPDATE">TEMPLATE.UPDATE</option>
-                    <option value="TEMPLATE.COPY">TEMPLATE.COPY</option>
-                    <option value="TEMPLATE.DOWNLOAD.START">TEMPLATE.DOWNLOAD.START</option>
-                    <option value="TEMPLATE.DOWNLOAD.SUCCESS">TEMPLATE.DOWNLOAD.SUCCESS</option>
-                    <option value="TEMPLATE.DOWNLOAD.FAILED">TEMPLATE.DOWNLOAD.FAILED</option>
-                    <option value="VOLUME.CREATE">VOLUME.CREATE</option>
-                    <option value="VOLUME.DELETE">VOLUME.DELETE</option>
-                    <option value="VOLUME.ATTACH">VOLUME.ATTACH</option>
-                    <option value="VOLUME.DETACH">VOLUME.DETACH</option>
-                    <option value="SERVICEOFFERING.CREATE">SERVICEOFFERING.CREATE</option>
-                    <option value="SERVICEOFFERING.UPDATE">SERVICEOFFERING.UPDATE</option>
-                    <option value="SERVICEOFFERING.DELETE">SERVICEOFFERING.DELETE</option>
-                    <option value="DOMAIN.CREATE">DOMAIN.CREATE</option>
-                    <option value="DOMAIN.DELETE">DOMAIN.DELETE</option>
-                    <option value="DOMAIN.UPDATE">DOMAIN.UPDATE</option>
-                    <option value="SNAPSHOT.CREATE">SNAPSHOT.CREATE</option>
-                    <option value="SNAPSHOT.DELETE">SNAPSHOT.DELETE</option>
-                    <option value="SNAPSHOTPOLICY.CREATE">SNAPSHOTPOLICY.CREATE</option>
-                    <option value="SNAPSHOTPOLICY.UPDATE">SNAPSHOTPOLICY.UPDATE</option>
-                    <option value="SNAPSHOTPOLICY.DELETE">SNAPSHOTPOLICY.DELETE</option>
-                    <option value="ISO.CREATE">ISO.CREATE</option>
-                    <option value="ISO.DELETE">ISO.DELETE</option>
-                    <option value="ISO.COPY">ISO.COPY</option>
-                    <option value="ISO.ATTACH">ISO.ATTACH</option>
-                    <option value="ISO.DETACH">ISO.DETACH</option>
-                    <option value="SSVM.CREATE">SSVM.CREATE</option>
-                    <option value="SSVM.DESTROY">SSVM.DESTROY</option>
-                    <option value="SSVM.START">SSVM.START</option>
-                    <option value="SSVM.STOP">SSVM.STOP</option>
-                    <option value="SSVM.REBOOT">SSVM.REBOOT</option>
-                    <option value="SSVM.HA">SSVM.HA</option>
-                </select>
-            </li>
-            <li>
-                <label>
-                    Level:</label>
-                <select class="select" id="adv_search_level">
-                    <option value=""></option>
-                    <option value="INFO">INFO</option>
-                    <option value="WARN">WARN</option>
-                    <option value="ERROR">ERROR</option>
-                </select>
-            </li>
-            <li id="adv_search_domain_li" style="display: none;">
-                <label>
-                    Domain:</label>
-                <select class="select" id="adv_search_domain">
-                </select>
-            </li>
-            <li id="adv_search_account_li" style="display: none;">
-                <label>
-                    Account:</label>
-                <input class="text" type="text" id="adv_search_account" />
-            </li>
-            <li>
-                <label>
-                    Start Date:</label>
-                <input class="text" type="text" id="adv_search_startdate" />
-            </li>
-            <li>
-                <label>
-                    End Date:</label>
-                <input class="text" type="text" id="adv_search_enddate" />
-            </li>
-        </ol>
-        </form>
-        <div class="adv_search_actionbox">
-            <div class="adv_searchpopup_button" id="adv_search_button">
-            </div>
-        </div>
+    <div class="adv_searchpopup_top">
+    	<h2>Advance Search</h2>
     </div>
+    
+    <div class="adv_searchpopup_mid">
+        <div class="adv_searchformbox">
+            <form action="#" method="post">
+            <ol>
+                <li>
+                    <label>
+                        Type:</label>
+                    <select class="select" id="adv_search_type">
+                        <option value=""></option>
+                        <option value="VM.CREATE">VM.CREATE</option>
+                        <option value="VM.DESTROY">VM.DESTROY</option>
+                        <option value="VM.START">VM.START</option>
+                        <option value="VM.STOP">VM.STOP</option>
+                        <option value="VM.REBOOT">VM.REBOOT</option>
+                        <option value="VM.DISABLEHA">VM.DISABLEHA</option>
+                        <option value="VM.ENABLEHA">VM.ENABLEHA</option>
+                        <option value="VM.UPGRADE">VM.UPGRADE</option>
+                        <option value="VM.RESETPASSWORD">VM.RESETPASSWORD</option>
+                        <option value="ROUTER.CREATE">ROUTER.CREATE</option>
+                        <option value="ROUTER.DESTROY">ROUTER.DESTROY</option>
+                        <option value="ROUTER.START">ROUTER.START</option>
+                        <option value="ROUTER.STOP">ROUTER.STOP</option>
+                        <option value="ROUTER.REBOOT">ROUTER.REBOOT</option>
+                        <option value="ROUTER.HA">ROUTER.HA</option>
+                        <option value="PROXY.CREATE">PROXY.CREATE</option>
+                        <option value="PROXY.DESTROY">PROXY.DESTROY</option>
+                        <option value="PROXY.START">PROXY.START</option>
+                        <option value="PROXY.STOP">PROXY.STOP</option>
+                        <option value="PROXY.REBOOT">PROXY.REBOOT</option>
+                        <option value="PROXY.HA">PROXY.HA</option>
+                        <option value="VNC.CONNECT">VNC.CONNECT</option>
+                        <option value="VNC.DISCONNECT">VNC.DISCONNECT</option>
+                        <option value="NET.IPASSIGN">NET.IPASSIGN</option>
+                        <option value="NET.IPRELEASE">NET.IPRELEASE</option>
+                        <option value="NET.RULEADD">NET.RULEADD</option>
+                        <option value="NET.RULEDELETE">NET.RULEDELETE</option>
+                        <option value="NET.RULEMODIFY">NET.RULEMODIFY</option>                   
+                        <option value="PF.SERVICE.APPLY">PF.SERVICE.APPLY</option>
+                        <option value="PF.SERVICE.REMOVE">PF.SERVICE.REMOVE</option>
+                        <option value="SECGROUP.APPLY">SECGROUP.APPLY</option>
+                        <option value="SECGROUP.REMOVE">SECGROUP.REMOVE</option>
+                        <option value="LB.CREATE">LB.CREATE</option>
+                        <option value="LB.DELETE">LB.DELETE</option>
+                        <option value="USER.LOGIN">USER.LOGIN</option>
+                        <option value="USER.LOGOUT">USER.LOGOUT</option>
+                        <option value="USER.CREATE">USER.CREATE</option>
+                        <option value="USER.DELETE">USER.DELETE</option>
+                        <option value="USER.UPDATE">USER.UPDATE</option>
+                        <option value="TEMPLATE.CREATE">TEMPLATE.CREATE</option>
+                        <option value="TEMPLATE.DELETE">TEMPLATE.DELETE</option>
+                        <option value="TEMPLATE.UPDATE">TEMPLATE.UPDATE</option>
+                        <option value="TEMPLATE.COPY">TEMPLATE.COPY</option>
+                        <option value="TEMPLATE.DOWNLOAD.START">TEMPLATE.DOWNLOAD.START</option>
+                        <option value="TEMPLATE.DOWNLOAD.SUCCESS">TEMPLATE.DOWNLOAD.SUCCESS</option>
+                        <option value="TEMPLATE.DOWNLOAD.FAILED">TEMPLATE.DOWNLOAD.FAILED</option>
+                        <option value="VOLUME.CREATE">VOLUME.CREATE</option>
+                        <option value="VOLUME.DELETE">VOLUME.DELETE</option>
+                        <option value="VOLUME.ATTACH">VOLUME.ATTACH</option>
+                        <option value="VOLUME.DETACH">VOLUME.DETACH</option>
+                        <option value="SERVICEOFFERING.CREATE">SERVICEOFFERING.CREATE</option>
+                        <option value="SERVICEOFFERING.UPDATE">SERVICEOFFERING.UPDATE</option>
+                        <option value="SERVICEOFFERING.DELETE">SERVICEOFFERING.DELETE</option>
+                        <option value="DOMAIN.CREATE">DOMAIN.CREATE</option>
+                        <option value="DOMAIN.DELETE">DOMAIN.DELETE</option>
+                        <option value="DOMAIN.UPDATE">DOMAIN.UPDATE</option>
+                        <option value="SNAPSHOT.CREATE">SNAPSHOT.CREATE</option>
+                        <option value="SNAPSHOT.DELETE">SNAPSHOT.DELETE</option>
+                        <option value="SNAPSHOTPOLICY.CREATE">SNAPSHOTPOLICY.CREATE</option>
+                        <option value="SNAPSHOTPOLICY.UPDATE">SNAPSHOTPOLICY.UPDATE</option>
+                        <option value="SNAPSHOTPOLICY.DELETE">SNAPSHOTPOLICY.DELETE</option>
+                        <option value="ISO.CREATE">ISO.CREATE</option>
+                        <option value="ISO.DELETE">ISO.DELETE</option>
+                        <option value="ISO.COPY">ISO.COPY</option>
+                        <option value="ISO.ATTACH">ISO.ATTACH</option>
+                        <option value="ISO.DETACH">ISO.DETACH</option>
+                        <option value="SSVM.CREATE">SSVM.CREATE</option>
+                        <option value="SSVM.DESTROY">SSVM.DESTROY</option>
+                        <option value="SSVM.START">SSVM.START</option>
+                        <option value="SSVM.STOP">SSVM.STOP</option>
+                        <option value="SSVM.REBOOT">SSVM.REBOOT</option>
+                        <option value="SSVM.HA">SSVM.HA</option>
+                    </select>
+                </li>
+                <li>
+                    <label>
+                        Level:</label>
+                    <select class="select" id="adv_search_level">
+                        <option value=""></option>
+                        <option value="INFO">INFO</option>
+                        <option value="WARN">WARN</option>
+                        <option value="ERROR">ERROR</option>
+                    </select>
+                </li>
+                <li id="adv_search_domain_li" style="display: none;">
+                    <label>
+                        Domain:</label>
+                    <select class="select" id="adv_search_domain">
+                    </select>
+                </li>
+                <li id="adv_search_account_li" style="display: none;">
+                    <label>
+                        Account:</label>
+                    <input class="text" type="text" id="adv_search_account" />
+                </li>
+                <li>
+                    <label>
+                        Start Date:</label>
+                    <input class="text" type="text" id="adv_search_startdate" />
+                </li>
+                <li>
+                    <label>
+                        End Date:</label>
+                    <input class="text" type="text" id="adv_search_enddate" />
+                </li>
+            </ol>
+            </form>
+            <div class="adv_search_actionbox">
+                <div class="adv_searchpopup_button" id="adv_search_button">
+                </div>
+            </div>
+         </div>
+    </div>
+    <div class="adv_searchpopup_bot"></div>
 </div>
 <!-- advanced search template (end) -->
\ No newline at end of file
diff --git a/ui/jsp/globalsetting.jsp b/ui/jsp/globalsetting.jsp
index 742ec2c9aca..a57bf37d542 100644
--- a/ui/jsp/globalsetting.jsp
+++ b/ui/jsp/globalsetting.jsp
@@ -49,7 +49,7 @@
 	            		<div class="grid_header_title">Description</div>
 	                </div>                
 	                <div class="grid_header_cell" style="width:15%; border:none;">
-	            		<div id="action_link" class="grid_actionbox" id="account_action_link">
+	            		<div id="action_link" class="grid_actionbox">
 	                        <div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
 	                            <ul class="actionsdropdown_boxlist" id="action_list">
 	                                <li><%=t.t("no.available.actions")%></li>
diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index 8b51ca7c920..0ffc6635356 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -1473,139 +1473,151 @@
 
 <!-- advanced search templates (begin) -->
 <div id="advanced_search_template_general" class="adv_searchpopup" style="display: none;">
-    <div class="adv_searchformbox">
-        <h3>
-            Advance Search</h3>
-        <a id="advanced_search_close" href="#">Close </a>
-        <form action="#" method="post">
-        <ol>
-            <li>
-                <label>
-                    Name:</label>
-                <input class="text" type="text" name="adv_search_name" id="adv_search_name" />
-            </li>           
-            <li>
-                <label>
-                    Status:</label>
-                <select class="select" id="adv_search_state">
-                    <option value=""></option>
-                    <option value="Creating">Creating</option>
-                    <option value="Starting">Starting</option>
-                    <option value="Running">Running</option>
-                    <option value="Stopping">Stopping</option>
-                    <option value="Stopped">Stopped</option>
-                    <option value="Destroyed">Destroyed</option>
-                    <option value="Expunging">Expunging</option>
-                    <option value="Migrating">Migrating</option>
-                    <option value="Error">Error</option>
-                    <option value="Unknown">Unknown</option>
-                </select>
-            </li>            
-            <li>
-                <label>
-                    Zone:</label>
-                <select class="select" id="adv_search_zone">
-                </select>
-            </li>            
-            <li id="adv_search_domain_li" style="display: none;">
-                <label>
-                    Domain:</label>
-                <select class="select" id="adv_search_domain">
-                </select>
-            </li>
-            <li id="adv_search_account_li" style="display: none;">
-                <label>
-                    Account:</label>
-                <input class="text" type="text" id="adv_search_account" />
-            </li>
-        </ol>
-        </form>
-        <div class="adv_search_actionbox">
-            <div class="adv_searchpopup_button" id="adv_search_button">
+   	<div class="adv_searchpopup_top">
+    	<h2>Advance Search</h2>
+    </div>
+    
+    <div class="adv_searchpopup_mid">
+        <div class="adv_searchformbox">
+            <form action="#" method="post">
+            <ol>
+                <li>
+                    <label>
+                        Name:</label>
+                    <input class="text" type="text" name="adv_search_name" id="adv_search_name" />
+                </li>           
+                <li>
+                    <label>
+                        Status:</label>
+                    <select class="select" id="adv_search_state">
+                        <option value=""></option>
+                        <option value="Creating">Creating</option>
+                        <option value="Starting">Starting</option>
+                        <option value="Running">Running</option>
+                        <option value="Stopping">Stopping</option>
+                        <option value="Stopped">Stopped</option>
+                        <option value="Destroyed">Destroyed</option>
+                        <option value="Expunging">Expunging</option>
+                        <option value="Migrating">Migrating</option>
+                        <option value="Error">Error</option>
+                        <option value="Unknown">Unknown</option>
+                    </select>
+                </li>            
+                <li>
+                    <label>
+                        Zone:</label>
+                    <select class="select" id="adv_search_zone">
+                    </select>
+                </li>            
+                <li id="adv_search_domain_li" style="display: none;">
+                    <label>
+                        Domain:</label>
+                    <select class="select" id="adv_search_domain">
+                    </select>
+                </li>
+                <li id="adv_search_account_li" style="display: none;">
+                    <label>
+                        Account:</label>
+                    <input class="text" type="text" id="adv_search_account" />
+                </li>
+            </ol>
+            </form>
+            <div class="adv_search_actionbox">
+                <div class="adv_searchpopup_button" id="adv_search_button">
+                </div>
             </div>
         </div>
     </div>
+    <div class="adv_searchpopup_bot"></div>
 </div>
 
 <div id="advanced_search_template_nostate" class="adv_searchpopup" style="display: none;">
-    <div class="adv_searchformbox">
-        <h3>
-            Advance Search</h3>
-        <a id="advanced_search_close" href="#">Close </a>
-        <form action="#" method="post">
-        <ol>
-            <li>
-                <label>
-                    Name:</label>
-                <input class="text" type="text" name="adv_search_name" id="adv_search_name" />
-            </li>            
-            <li>
-                <label>
-                    Zone:</label>
-                <select class="select" id="adv_search_zone">
-                </select>
-            </li>            
-            <li id="adv_search_domain_li" style="display: none;">
-                <label>
-                    Domain:</label>
-                <select class="select" id="adv_search_domain">
-                </select>
-            </li>
-            <li id="adv_search_account_li" style="display: none;">
-                <label>
-                    Account:</label>
-                <input class="text" type="text" id="adv_search_account" />
-            </li>
-        </ol>
-        </form>
-        <div class="adv_search_actionbox">
-            <div class="adv_searchpopup_button" id="adv_search_button">
-            </div>
-        </div>
+    	<div class="adv_searchpopup_top">
+    	<h2>Advance Search</h2>
     </div>
+    
+    <div class="adv_searchpopup_mid">
+        <div class="adv_searchformbox">
+            <form action="#" method="post">
+            <ol>
+                <li>
+                    <label>
+                        Name:</label>
+                    <input class="text" type="text" name="adv_search_name" id="adv_search_name" />
+                </li>            
+                <li>
+                    <label>
+                        Zone:</label>
+                    <select class="select" id="adv_search_zone">
+                    </select>
+                </li>            
+                <li id="adv_search_domain_li" style="display: none;">
+                    <label>
+                        Domain:</label>
+                    <select class="select" id="adv_search_domain">
+                    </select>
+                </li>
+                <li id="adv_search_account_li" style="display: none;">
+                    <label>
+                        Account:</label>
+                    <input class="text" type="text" id="adv_search_account" />
+                </li>
+            </ol>
+            </form>
+            <div class="adv_search_actionbox">
+                <div class="adv_searchpopup_button" id="adv_search_button">
+                </div>
+            </div>
+         </div>
+    </div>
+     <div class="adv_searchpopup_bot"></div>
 </div>
 
 <div id="advanced_search_template_nodomainaccount" class="adv_searchpopup" style="display: none;">
-    <div class="adv_searchformbox">
-        <h3>
-            Advance Search</h3>
-        <a id="advanced_search_close" href="#">Close </a>
-        <form action="#" method="post">
-        <ol>
-            <li>
-                <label>
-                    Name:</label>
-                <input class="text" type="text" name="adv_search_name" id="adv_search_name" />
-            </li>           
-            <li>
-                <label>
-                    Status:</label>
-                <select class="select" id="adv_search_state">
-                    <option value=""></option>
-                    <option value="Creating">Creating</option>
-                    <option value="Starting">Starting</option>
-                    <option value="Running">Running</option>
-                    <option value="Stopping">Stopping</option>
-                    <option value="Stopped">Stopped</option>
-                    <option value="Destroyed">Destroyed</option>
-                    <option value="Expunging">Expunging</option>
-                    <option value="Migrating">Migrating</option>
-                    <option value="Error">Error</option>
-                    <option value="Unknown">Unknown</option>
-                </select>
-            </li>            
-            <li>
-                <label>
-                    Zone:</label>
-                <select class="select" id="adv_search_zone">
-                </select>
-            </li>   
-        </ol>
-        </form>
-        <div class="adv_search_actionbox">
-            <div class="adv_searchpopup_button" id="adv_search_button">
-            </div>
-        </div>
+   <div class="adv_searchpopup_top">
+    	<h2>Advance Search</h2>
     </div>
+    
+    <div class="adv_searchpopup_mid">
+        <div class="adv_searchformbox">
+            <form action="#" method="post">
+            <ol>
+                <li>
+                    <label>
+                        Name:</label>
+                    <input class="text" type="text" name="adv_search_name" id="adv_search_name" />
+                </li>           
+                <li>
+                    <label>
+                        Status:</label>
+                    <select class="select" id="adv_search_state">
+                        <option value=""></option>
+                        <option value="Creating">Creating</option>
+                        <option value="Starting">Starting</option>
+                        <option value="Running">Running</option>
+                        <option value="Stopping">Stopping</option>
+                        <option value="Stopped">Stopped</option>
+                        <option value="Destroyed">Destroyed</option>
+                        <option value="Expunging">Expunging</option>
+                        <option value="Migrating">Migrating</option>
+                        <option value="Error">Error</option>
+                        <option value="Unknown">Unknown</option>
+                    </select>
+                </li>            
+                <li>
+                    <label>
+                        Zone:</label>
+                    <select class="select" id="adv_search_zone">
+                    </select>
+                </li>   
+            </ol>
+            </form>
+            <div class="adv_search_actionbox">
+                <div class="adv_searchpopup_button" id="adv_search_button">
+                </div>
+            </div>
+         </div>
+    </div>
+    <div class="adv_searchpopup_bot"></div>
 </div>
 <!-- advanced search templates (end) -->
\ No newline at end of file