diff --git a/pmd/scripts/history.js b/pmd/scripts/history.js
index f90eb9015..56460034d 100644
--- a/pmd/scripts/history.js
+++ b/pmd/scripts/history.js
@@ -25,7 +25,7 @@ function display(init,final) {
 	 str ='';
 	 for ( var i=0; i < history_array.length; i++){
 		var temp = history_array[i].get_tab() + '.' + history_array[i].get_obj_no();
-		str += '<h2 class="tiger"><a href="#"></a>' + temp + '</h2>';  				
+		str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>';  				
 		str +='<div class="toggle_container">\n';
 		while((history_array[i].get_tab() + '.' + history_array[i].get_obj_no()) == temp) {
 			str +='<div class="block"> <table>';
diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js
index 7784cfa7f..ff0acb806 100644
--- a/pmd/scripts/move.js
+++ b/pmd/scripts/move.js
@@ -973,7 +973,7 @@ function Click_option(id_this,column_name,table_name)
     // var top = Glob_Y - document.getElementById(id_this).offsetHeight - 10;
      document.getElementById(id_this).style.top  = (screen.height / 4) + 'px';
      document.getElementById(id_this).style.visibility = "visible";
-	 document.getElementById('option_col_name').innerHTML = 'column_name';
+	 document.getElementById('option_col_name').innerHTML = '<strong>Options For "' +column_name+ '" column</strong>';
 	 col_name = column_name;
 	 tab_name = table_name;
 }
@@ -1009,7 +1009,6 @@ function Table_onover(id_this,val)
 	}
 }
 
-
 function add_object() {
 	var rel = document.getElementById('rel_opt');
 	var sum = 0;
@@ -1020,11 +1019,12 @@ function add_object() {
 		    document.getElementById('hint').style.visibility = "visible";
 			return;
 		}
-		 var w = document.getElementById('rel_opt').value;
 		 var p = document.getElementsByName('Query');
-		 var where_obj = new where(w,p.value);//make where object
+		 var where_obj = new where(rel.value,p.value);//make where object
 		 history_array.push(new history(col_name,where_obj,tab_name,h_tabs[tab_name],"Where"));
 		 sum = sum + 1;
+		 rel.value = '--';
+		 p.value = "";
 	}
 	if (document.getElementById('new_name').value !="") {
 		var rename_obj = new rename(document.getElementById('new_name').value);//make Rename object
@@ -1036,6 +1036,7 @@ function add_object() {
 		var aggregate_obj = new aggregate(document.getElementById('operator').value) ;
 		history_array.push(new history(col_name,aggregate_obj,tab_name,h_tabs[tab_name],"Aggregate"));
 		sum = sum + 1;
+		document.getElementById('operator').value = '---';
 		//make aggregate operator
 	}
 	if (document.getElementById('groupby').checked == true ) {
diff --git a/pmd/styles/default/style1.css b/pmd/styles/default/style1.css
index c941b9c28..d7e81e595 100644
--- a/pmd/styles/default/style1.css
+++ b/pmd/styles/default/style1.css
@@ -464,6 +464,7 @@ h2.tiger{
 	font-size:14px;
 	padding: 50 20 50 20px;
 	margin: 0 0 5px 0;
+	width: 300px;
 	float: left;
 	color : #333;
 	text-align: center;
@@ -471,12 +472,14 @@ h2.tiger{
 
 h2.tiger a {
 	text-align: center;
+	text-decoration: none;
 	color : #333;
 	display: block;
 }
 
 h2.tiger a:hover {  
-	color: #ccc; 
+	color: #000; 
+	background-image: url(images/Header_Linked.png);
 }
 
 h2.active {
@@ -490,7 +493,8 @@ h2.active {
 	margin: 0 0 5px;
 	padding: 0;
 	border-top: 1px solid #d6d6d6;
-	background: #83B0B8 ;
+	background: #FFF ;
+	width: 300px;
 	overflow: hidden;
 	font-size: 1.2em;
 	clear: both;
diff --git a/pmd_general.php b/pmd_general.php
index 4bd67f094..ba1f54ebe 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -445,9 +445,8 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
        <thead>
         <tr>
-            <td colspan="2" align="center" nowrap="nowrap"><strong>Options For</strong></td>
+        	<td colspan="2" rowspan="2" id="option_col_name" nowrap="nowrap" align="center"></td>
         </tr>
-        <tr ><td id="option_col_name"></td></tr>
         </thead>
         <tbody id="where">
         <tr><td align="center" nowrap="nowrap"><b>Where</b></td></tr>
@@ -520,14 +519,15 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </tr>
 </tbody>
 </table>
-
- <div class="panel">
-  <div style="clear:both;"></div>
-   <div id="ab"></div>
- 
-  <div style="clear:both;"></div>
-  </div>
-  <a class="trigger" href="#">History</a>
+<?php 
+if($_REQUEST['query']) {
+	echo '<div class="panel">';
+  	echo '<div style="clear:both;"></div>';
+   	echo '<div id="ab"></div>';
+ 	echo '<div style="clear:both;"></div>';
+  	echo '</div>';
+	echo '<a class="trigger" href="#">History</a>';
+} ?>
 <!-- cache images -->
 <img src="pmd/images/2leftarrow_m.png" width="0" height="0" alt="" />
 <img src="pmd/images/rightarrow1.png" width="0" height="0" alt="" />