diff --git a/js/pmd/history.js b/js/pmd/history.js
index 3cb69d5740..8837ae0617 100644
--- a/js/pmd/history.js
+++ b/js/pmd/history.js
@@ -183,8 +183,9 @@ function history_edit(index)
         document.getElementById('query_where').style.left =  '530px';
         document.getElementById('query_where').style.top  = '130px';
         document.getElementById('query_where').style.position  = 'absolute';
-        document.getElementById('query_where').style.zIndex = '9';
+        document.getElementById('query_where').style.zIndex = '103';
         document.getElementById('query_where').style.visibility = 'visible';
+        document.getElementById('query_where').style.display = 'block';
     }
     if (type == "Having") {
         document.getElementById('hQuery').value = history_array[index].get_obj().getquery();
@@ -193,22 +194,25 @@ function history_edit(index)
         document.getElementById('query_having').style.left =  '530px';
         document.getElementById('query_having').style.top  = '130px';
         document.getElementById('query_having').style.position  = 'absolute';
-        document.getElementById('query_having').style.zIndex = '9';
+        document.getElementById('query_having').style.zIndex = '103';
         document.getElementById('query_having').style.visibility = 'visible';
+        document.getElementById('query_having').style.display = 'block';
     }
     if (type == "Rename") {
         document.getElementById('query_rename_to').style.left =  '530px';
         document.getElementById('query_rename_to').style.top  = '130px';
         document.getElementById('query_rename_to').style.position  = 'absolute';
-        document.getElementById('query_rename_to').style.zIndex = '9';
+        document.getElementById('query_rename_to').style.zIndex = '103';
         document.getElementById('query_rename_to').style.visibility = 'visible';
+        document.getElementById('query_rename_to').style.display = 'block';
     }
     if (type == "Aggregate") {
         document.getElementById('query_Aggregate').style.left = '530px';
         document.getElementById('query_Aggregate').style.top  = '130px';
         document.getElementById('query_Aggregate').style.position  = 'absolute';
-        document.getElementById('query_Aggregate').style.zIndex = '9';
+        document.getElementById('query_Aggregate').style.zIndex = '103';
         document.getElementById('query_Aggregate').style.visibility = 'visible';
+        document.getElementById('query_Aggregate').style.display = 'block';
     }
 }
 
@@ -785,3 +789,25 @@ function closebox()
     document.getElementById('box').style.display = 'none';
     document.getElementById('filter').style.display = 'none';
 }
+
+AJAX.registerTeardown('pmd/history.js', function () {
+    $("#ok_edit_rename").unbind('click');
+    $("#ok_edit_having").unbind('click');
+    $("#ok_edit_Aggr").unbind('click');
+    $("#ok_edit_where").unbind('click');
+});
+
+AJAX.registerOnload('pmd/history.js', function () {
+    $("#ok_edit_rename").click(function() {
+        edit('Rename');
+    });
+    $("#ok_edit_having").click(function() {
+        edit('Having');
+    });
+    $("#ok_edit_Aggr").click(function() {
+        edit('Aggregate');
+    });
+    $("#ok_edit_where").click(function() {
+        edit('Where');
+    });
+});
\ No newline at end of file
diff --git a/js/pmd/move.js b/js/pmd/move.js
index 54060be329..5e24b7001f 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -1051,6 +1051,7 @@ function Start_relation()
 
 function Click_field(T, f, PK) // table field
 {
+    PK = parseInt(PK);
     if (ON_relation) {
         if (!click_field) {
             //.style.display=='none'        .style.display = 'none'
@@ -1488,7 +1489,7 @@ function Show_left_menu(id_this) // max/min all tables
 //------------------------------------------------------------------------------
 function Top_menu_right(id_this)
 {
-    if (id_this.alt == ">") {
+    if (id_this.alt === ">") {
         moveTopMenuToRight(id_this);
         id_this.alt = "<";
         id_this.src = pmaThemeImage + "pmd/2leftarrow_m.png";
@@ -1638,6 +1639,7 @@ function Select_all(id_this, owner)
 
 function Table_onover(id_this, val, buil)
 {
+    buil = parseInt(buil);
     if (!val) {
         document.getElementById("id_zag_" + id_this).className = "tab_zag_2";
         if (buil) {
@@ -1754,3 +1756,203 @@ function add_object()
     Close_option();
     panel(0);
 }
+
+AJAX.registerTeardown('pmd/move.js', function () {
+    $("#key_Show_left_menu").unbind('click');
+    $("#enterFullscreen").unbind('click');
+    $("#exitFullscreen").unbind('click');
+    $("#newPage").unbind('click');
+    $("#editPage").unbind('click');
+    $("#savePos").unbind('click');
+    $("#SaveAs").unbind('click');
+    $("#delPages").unbind('click');
+    $("#StartTableNew").unbind('click');
+    $("#rel_button").unbind('click');
+    $("#StartTableNew").unbind('click');
+    $("#display_field_button").unbind('click');
+    $("#reloadPage").unbind('click');
+    $("#angular_direct_button").unbind('click');
+    $("#grid_button").unbind('click');
+    $("#key_SB_all").unbind('click');
+    $("#SmallTabInvert").unbind('click');
+    $("#relLineInvert").unbind('click');
+    $("#exportPages").unbind('click');
+    $("#query_builder").unbind('click');
+    $("#key_Left_Right").unbind('click');
+    $("#canvas").unbind('click');
+    $("#key_HS_all").unbind('click');
+    $("#key_HS").unbind('click');
+    $('.scroll_tab_struct').unbind('click');
+    $('.scroll_tab_checkbox').unbind('click');
+    $('#id_scroll_tab tr').off('click', '.pmd_Tabs2,.pmd_Tabs');
+    $('.pmd_tab').off('click', '.select_all_1');
+    $('.pmd_tab').off('click', '.small_tab,.small_tab2');
+    $('.pmd_tab').off('click', '.small_tab_pref_1');
+    $('.tab_zag_noquery').unbind('mouseover');
+    $('.tab_zag_noquery').unbind('mouseout');
+    $('.tab_zag_query').unbind('mouseover');
+    $('.tab_zag_query').unbind('mouseout');
+    $('.pmd_tab').off('click','.tab_field_2,.tab_field_3,.tab_field');
+    $('.pmd_tab').off('click', '.select_all_store_col');
+    $('.pmd_tab').off('click', '.small_tab_pref_click_opt');
+    $("input#del_button").unbind('click');
+    $("input#cancel_button").unbind('click');
+    $("input#ok_add_object").unbind('click');
+    $("input#cancel_close_option").unbind('click');
+    $("input#ok_new_rel_panel").unbind('click');
+    $("input#cancel_new_rel_panel").unbind('click');
+});
+
+AJAX.registerOnload('pmd/move.js', function () {
+    $("#key_Show_left_menu").click(function() {
+        Show_left_menu(this);
+        return false;
+    });
+    $("#enterFullscreen").click(function() {
+        Enter_fullscreen();
+        return false;
+    });
+    $("#exitFullscreen").click(function() {
+        Exit_fullscreen();
+        return false;
+    });
+    $("#newPage").click(function() {
+        New();
+        return false;
+    });
+    $("#editPage").click(function() {
+        Edit_pages();
+        return false;
+    });
+    $("#savePos").click(function() {
+        Save3();
+        return false;
+    });
+    $("#SaveAs").click(function() {
+        Save_as();
+        return false;
+    });
+    $("#delPages").click(function() {
+        Delete_pages();
+        return false;
+    });
+    $("#StartTableNew").click(function() {
+        Start_table_new();
+        return false;
+    });
+    $("#rel_button").click(function() {
+        Start_relation();
+        return false;
+    });
+    $("#display_field_button").click(function() {
+        Start_display_field();
+        return false;
+    });
+    $("#reloadPage").click(function() {
+        $("#designer_tab").click();
+    });
+    $("#angular_direct_button").click(function() {
+        Angular_direct();
+        return false;
+    });
+    $("#grid_button").click(function() {
+        Grid();
+        return false;
+    });
+    $("#key_SB_all").click(function() {
+        Small_tab_all(this);
+        return false;
+    });
+    $("#SmallTabInvert").click(function() {
+        Small_tab_invert();
+        return false;
+    });
+    $("#relLineInvert").click(function() {
+        Relation_lines_invert();
+        return false;
+    });
+    $("#exportPages").click(function() {
+        Export_pages();
+        return false;
+    });
+    $("#query_builder").click(function() {
+        build_query('SQL Query on Database', 0);
+    });
+    $("#key_Left_Right").click(function() {
+        Top_menu_right(this);
+        return false;
+    });
+    $("#canvas").click(function() {
+        Canvas_click(this);
+    });
+    $("#key_HS_all").click(function() {
+        Hide_tab_all(this);
+        return false;
+    });
+    $("#key_HS").click(function() {
+        No_have_constr(this);
+        return false;
+    });
+    $('.scroll_tab_struct').click(function() {
+        Start_tab_upd($(this).attr('table_name'));
+    });
+    $('.scroll_tab_checkbox').click(function() {
+        VisibleTab(this,$(this).val());
+    });
+    $('#id_scroll_tab tr').on('click', '.pmd_Tabs2,.pmd_Tabs', function() {
+        Select_tab($(this).attr('pmd_url_table_name'));
+    });
+    $('.pmd_tab').on('click', '.select_all_1', function() {
+        Select_all($(this).attr('pmd_url_table_name'), $(this).attr('pmd_out_owner'));
+    });
+    $('.pmd_tab').on('click', '.small_tab,.small_tab2', function() {
+        Small_tab($(this).attr('table_name'), 1);
+    });
+    $('.pmd_tab').on('click', '.small_tab_pref_1', function() {
+        Start_tab_upd($(this).attr('table_name_small'));
+    });
+    $('.tab_zag_noquery').mouseover(function() {
+        Table_onover($(this).attr('table_name'),0, $(this).attr('query_set'));
+    });
+    $('.tab_zag_noquery').mouseout(function() {
+        Table_onover($(this).attr('table_name'),1, $(this).attr('query_set'));
+    });
+    $('.tab_zag_query').mouseover(function() {
+        Table_onover($(this).attr('table_name'),0, 1);
+    });
+    $('.tab_zag_query').mouseout(function() {
+        Table_onover($(this).attr('table_name'),1, 1);
+    });
+    $('.pmd_tab').on('click','.tab_field_2,.tab_field_3,.tab_field', function() {
+        var params = ($(this).attr('click_field_param')).split(",");
+        Click_field(params[0], params[1], params[2]);
+    });
+    $('.pmd_tab').on('click', '.select_all_store_col', function() {
+        var params = ($(this).attr('store_column_param')).split(",");
+        store_column(params[0], params[1], params[2]);
+    });
+    $('.pmd_tab').on('click', '.small_tab_pref_click_opt', function() {
+        var params = ($(this).attr('Click_option_param')).split(",");
+        Click_option(params[0], params[1], params[2]);
+    });
+    $("input#del_button").click(function() {
+        Upd_relation();
+    });
+    $("input#cancel_button").click(function() {
+        document.getElementById('layer_upd_relation').style.display = 'none';
+        Re_load();
+    });
+    $("input#ok_add_object").click(function() {
+        add_object();
+    });
+    $("input#cancel_close_option").click(function() {
+        Close_option();
+    });
+    $("input#ok_new_rel_panel").click(function() {
+        New_relation();
+    });
+    $("input#cancel_new_rel_panel").click(function() {
+        document.getElementById('layer_new_relation').style.display = 'none';
+    });
+
+});
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 935156e131..58d374b8cb 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -1014,7 +1014,7 @@ function PMA_checkAndFixPMATablesInCurrentDb()
 }
 
 /**
- * Creates some globals from $_POST variables matching a pattern 
+ * Creates some globals from $_POST variables matching a pattern
  *
  * @param array $post_patterns The patterns to search for
  *
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
index e069000a77..21355a234b 100644
--- a/libraries/db_designer.lib.php
+++ b/libraries/db_designer.lib.php
@@ -230,8 +230,7 @@ function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page)
 {
     $html  = '<div class="pmd_header" id="top_menu">';
 
-    $html .= '<a href="#" onclick="Show_left_menu('
-        . 'document.getElementById(\'key_Show_left_menu\')' . '); return false" ';
+    $html .= '<a href="#" ';
     $html .= 'class="M_butt first" target="_self">';
     $html .= '<img id="key_Show_left_menu" ';
     $html .= 'title="' . __('Show/Hide left menu') . '" alt="v" ';
@@ -240,7 +239,6 @@ function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page)
     $html .= '</a>';
 
     $html .= '<a href="#" id="enterFullscreen" ';
-    $html .= 'onclick="Enter_fullscreen(); return false" ';
     $html .= 'class="M_butt" target="_self">';
     $html .= '<img title="' . __('View in fullscreen') . '" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/viewInFullscreen.png')
@@ -248,7 +246,6 @@ function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page)
     $html .= '</a>';
 
     $html .= '<a href="#" id="exitFullscreen" ';
-    $html .= 'onclick="Exit_fullscreen(); return false" ';
     $html .= 'class="M_butt hide" target="_self">';
     $html .= '<img title="' . __('Exit fullscreen') . '" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/exitFullscreen.png')
@@ -260,35 +257,35 @@ function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page)
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png')
             . '" />';
 
-        $html .= '<a href="#" onclick="New(); return false" ';
+        $html .= '<a id="newPage" href="#" ';
         $html .= 'class="M_butt" target="_self">';
         $html .= '<img title="' . __('New page') . '"alt="" ';
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/page_add.png')
             . '" />';
         $html .= '</a>';
 
-        $html .= '<a href="#" onclick="Edit_pages(); return false" ';
+        $html .= '<a href="#" id="editPage" ';
         $html .= 'class="M_butt ajax" target="_self">';
         $html .= '<img title="' . __('Open page') . '" alt="" ';
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/page_edit.png')
             . '" />';
         $html .= '</a>';
 
-        $html .= '<a href="#" onclick="Save3(); return false" ';
+        $html .= '<a href="#" id="savePos" ';
         $html .= 'class="M_butt" target="_self">';
         $html .= '<img title="' . __('Save position') . '" alt="" ';
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/save.png')
             . '" />';
         $html .= '</a>';
 
-        $html .= '<a href="#" onclick="Save_as(); return false" ';
+        $html .= '<a href="#" id="SaveAs" ';
         $html .= 'class="M_butt ajax" target="_self">';
         $html .= '<img title="' . __('Save positions as') . '" alt="" ';
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/save_as.png')
             . '" />';
         $html .= '</a>';
 
-        $html .= '<a href="#" onclick="Delete_pages(); return false" ';
+        $html .= '<a href="#" id="delPages" ';
         $html .= 'class="M_butt ajax" target="_self">';
         $html .= '<img title="' . __('Delete pages') . '" alt="" ';
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/page_delete.png')
@@ -299,27 +296,27 @@ function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page)
     $html .= '<img class="M_bord" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png') . '" />';
 
-    $html .= '<a href="#" onclick="Start_table_new(); return false" ';
+    $html .= '<a href="#" id="StartTableNew" ';
     $html .= 'class="M_butt" target="_self">';
     $html .= '<img title="' . __('Create table') . '" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/table.png') . '" />';
     $html .= '</a>';
 
-    $html .= '<a href="#" onclick="Start_relation(); return false" class="M_butt" ';
+    $html .= '<a href="#" class="M_butt" ';
     $html .= 'id="rel_button" target="_self">';
     $html .= '<img title="' . __('Create relation') . '" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/relation.png')
         . '" />';
     $html .= '</a>';
 
-    $html .= '<a href="#" onclick="Start_display_field(); return false" ';
+    $html .= '<a href="#" ';
     $html .= 'class="M_butt" id="display_field_button" target="_self">';
     $html .= '<img title="' . __('Choose column to display') . '" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/display_field.png')
         . '" />';
     $html .= '</a>';
 
-    $html .= '<a href="#" onclick="location.reload(); return false" class="M_butt" ';
+    $html .= '<a href="#" id="reloadPage" class="M_butt" ';
     $html .= 'target="_self">';
     $html .= '<img title="' . __('Reload') . '" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/reload.png') . '" />';
@@ -334,7 +331,7 @@ function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page)
     $html .= '<img class="M_bord" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png') . '" />';
 
-    $html .= '<a href="#" onclick="Angular_direct(); return false" ';
+    $html .= '<a href="#" ';
     $html .= 'class="M_butt" id="angular_direct_button" target="_self">';
     $html .= '<img alt="" ';
     $html .= 'title="' . __('Angular links') . ' / ' . __('Direct links') . '" ';
@@ -342,31 +339,30 @@ function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page)
         . '" />';
     $html .= '</a>';
 
-    $html .= '<a href="#" onclick="Grid(); return false" class="M_butt" ';
+    $html .= '<a href="#" class="M_butt" ';
     $html .= 'id="grid_button" target="_self">';
-    $html .= '<img title="' . __('Snap to grid') . '>" alt="" ';
+    $html .= '<img title="' . __('Snap to grid') . '" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/grid.png') . '" />';
     $html .= '</a>';
 
     $html .= '<img class="M_bord" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png') . '" />';
 
-    $html .= '<a href="#" onclick="Small_tab_all('
-        . 'document.getElementById("key_SB_all")); return false" ';
+    $html .= '<a href="#" ';
     $html .= 'class="M_butt" target="_self">';
     $html .= '<img id="key_SB_all" title="' . __('Small/Big All') . '" alt="v" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png')
         . '" />';
     $html .= '</a>';
 
-    $html .= '<a href="#" onclick="Small_tab_invert(); return false" ';
+    $html .= '<a href="#" id="SmallTabInvert" ';
     $html .= 'class="M_butt" target="_self" >';
     $html .= '<img title="' . __('Toggle small/big') . '" alt="key" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/bottom.png')
         . '" />';
     $html .= '</a>';
 
-    $html .= '<a href="#" onclick="Relation_lines_invert(); return false"';
+    $html .= '<a href="#" id="relLineInvert" ';
     $html .= 'class="M_butt" target="_self" >';
     $html .= '<img title="' . __('Toggle relation lines') . '" alt="key" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/toggle_lines.png')
@@ -388,7 +384,7 @@ function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page)
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png')
             . '" />';
 
-        $html .= '<a href="#" onclick="Export_pages(); return false" ';
+        $html .= '<a href="#" id="exportPages" ';
         $html .= 'class="M_butt" target="_self" >';
         $html .= '<img title="' . __('Export schema') . '" alt="key" ';
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/export.png')
@@ -402,14 +398,13 @@ function PMA_getDesignerPageTopMenu($visualBuilder, $selected_page)
         $html .= '<a href="#" onclick="build_query(\'SQL Query on Database\', 0)" ';
         $html .= 'onmousedown="return false;" class="M_butt" target="_self">';
         $html .= '<img alt="key" width="20" height="20" ';
-        $html .= 'title="' .  __('Build Query') . '" ';
-        $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/query_builder.png')
+        $html .= 'title="' .  __('Build Query') . '" src="';
+        $html .= $_SESSION['PMA_Theme']->getImgPath('pmd/query_builder.png')
             . '" />';
         $html .= '</a>';
     }
 
-    $html .= '<a href="#" onclick="Top_menu_right('
-        . 'document.getElementById("key_Left_Right")); return false" ';
+    $html .= '<a href="#" ';
     $html .= 'class="M_butt last" target="_self">';
     $html .= '<img id="key_Left_Right" alt=">" title="' . __('Move Menu') . '"';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/2rightarrow_m.png')
@@ -430,7 +425,7 @@ function PMA_getHTMLCanvas()
 {
     $html  = '<div id="osn_tab">';
     $html .= '<canvas class="pmd" id="canvas" width="100" height="100" ';
-    $html .= 'onclick="Canvas_click(this)"></canvas>';
+    $html .= '></canvas>';
     $html .= '</div>';
 
     return $html;
@@ -448,19 +443,17 @@ function PMA_getHTMLTableList($tab_pos, $display_page)
 {
     $html  = '<div id="layer_menu" style="display:none;">';
 
-    $html .= '<div class="center" style="padding-top:5px;">';
+    $html .= '<div class="center" style="padding-top:28px;">';
 
     $html .= '<a href="#" class="M_butt" target="_self" ';
-    $html .= 'onclick="Hide_tab_all(document.getElementById(\'key_HS_all\')); ';
-    $html .= 'return false">';
+    $html .= '>';
     $html .= '<img title="' . __('Hide/Show all') . '" alt="v" id="key_HS_all" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow1.png')
         . '" />';
     $html .= '</a>';
 
     $html .= '<a href="#" class="M_butt" target="_self" ';
-    $html .= 'onclick="No_have_constr(document.getElementById(\'key_HS\')); ';
-    $html .= 'return false">';
+    $html .= '>';
     $html .= '<img alt="v" id="key_HS" ';
     $html .= 'title="' . __('Hide/Show Tables with no relation') . '"';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/downarrow2.png')
@@ -481,15 +474,15 @@ function PMA_getHTMLTableList($tab_pos, $display_page)
         $html .= '<td title="' . __('Structure') . '" width="1px" ';
         $html .= 'onmouseover="this.className=\'L_butt2_2\'" ';
         $html .= 'onmouseout="this.className=\'L_butt2_1\'" class="L_butt2_1">';
-        $html .= '<img onclick="Start_tab_upd(\'';
-        $html .= $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i] . '\');" alt="" ';
+        $html .= '<img alt="" ';
+        $html .= 'table_name="' . $GLOBALS['PMD_URL']['TABLE_NAME_SMALL'][$i] . '"'
+                . ' class="scroll_tab_struct" ';
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/exec.png')
             . '"/>';
         $html .= '</td>';
 
         $html .= '<td width="1px">';
-        $html .= '<input onclick="VisibleTab(this,\'';
-        $html .= $GLOBALS['PMD_URL']["TABLE_NAME"][$i] . '\')" ';
+        $html .= '<input class="scroll_tab_checkbox" ';
         $html .= 'title="' . __('Hide') . '" ';
         $html .= 'id="check_vis_' . $GLOBALS['PMD_URL']["TABLE_NAME"][$i] . '" ';
         $html .= 'style="margin:0px;" type="checkbox" ';
@@ -506,8 +499,8 @@ function PMA_getHTMLTableList($tab_pos, $display_page)
         $html .= '<td class="pmd_Tabs" ';
         $html .= 'onmouseover="this.className=\'pmd_Tabs2\'" ';
         $html .= 'onmouseout="this.className=\'pmd_Tabs\'" ';
-        $html .= 'onclick="Select_tab(\'';
-        $html .= $GLOBALS['PMD_URL']["TABLE_NAME"][$i] . '\');">';
+        $html .= 'pmd_url_table_name="'
+            . $GLOBALS['PMD_URL']['TABLE_NAME'][$i] . '">';
         $html .= $GLOBALS['PMD_OUT']["TABLE_NAME"][$i];
         $html .= '</td>';
 
@@ -517,9 +510,11 @@ function PMA_getHTMLTableList($tab_pos, $display_page)
     $html .= '</table>';
     $html .= '</div>'; // end id_scroll_tab
 
-    $html .= '<div class="center">' . __('Number of tables:') . ' ' . $name_cnt . '</div>';
+    $html .= '<div class="center">' . __('Number of tables:')
+        . ' ' . $name_cnt . '</div>';
     $html .= '<div class="floatright">';
-    $html .= '<div id="layer_menu_sizer" onmousedown="layer_menu_cur_click=1"></div>';
+    $html .= '<div id="layer_menu_sizer" onmousedown="layer_menu_cur_click=1">'
+        . '</div>';
     $html .= '</div>';
 
     $html .= '</div>'; // end layer_menu
@@ -570,21 +565,23 @@ function PMA_getDatabaseTables(
 
         if (isset($_REQUEST['query'])) {
             $html .= '<td class="select_all">';
-            $html .= '<input type="checkbox" style="margin: 0px;" ';
+            $html .= '<input class="select_all_1" type="checkbox" '
+                . 'style="margin: 0px;" ';
             $html .= 'value="select_all_' . htmlspecialchars($t_n_url) . '" ';
             $html .= 'id="select_all_' . htmlspecialchars($t_n_url) . '" ';
-            $html .= 'title="select all" ';
-            $html .= 'onclick="Select_all(\'' . htmlspecialchars($t_n_url) . '\',';
-            $html .= '\'' . htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]) . '\'';
-            $html .= ')">';
+            $html .= 'title="select all" pmd_url_table_name="'
+                . htmlspecialchars($t_n_url) . '" ';
+            $html .= 'pmd_out_owner="'
+                . htmlspecialchars($GLOBALS['PMD_OUT']['OWNER'][$i]) . '">';
             $html .= '</td>';
         }
 
         $html .= '<td class="small_tab" ';
         $html .= 'id="id_hide_tbody_' . $t_n_url . '" ';
-        $html .= 'onmouseover="this.className=\'small_tab2\';" ';
+        $html .= 'table_name="' . htmlspecialchars($t_n_url)
+            . '" onmouseover="this.className=\'small_tab2\';" ';
         $html .= 'onmouseout="this.className=\'small_tab\';" ';
-        $html .= 'onclick="Small_tab(\'' . $t_n_url . '\', 1)">';
+        $html .= '>';
 
         // no space alloawd here, between tags and content !!!
         // JavaScript function does require this
@@ -596,38 +593,37 @@ function PMA_getDatabaseTables(
 
         $html .= '</td>';
 
-        $html .= '<td class="small_tab_pref" ';
-        $html .= 'onmouseover="this.className=\'small_tab_pref2\';" ';
-        $html .= 'onmouseout="this.className=\'small_tab_pref\';" ';
-        $html .= 'onclick="Start_tab_upd(\''
-            . $GLOBALS['PMD']["TABLE_NAME_SMALL"][$i] . '\');">';
+        $html .= '<td class="small_tab_pref small_tab_pref_1" ';
+        $html .= 'table_name_small="' . $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]
+            . '" onmouseover="this.className='
+                . '\'small_tab_pref2 small_tab_pref_1\';" ';
+        $html .= 'onmouseout="this.className=\'small_tab_pref small_tab_pref_1\';" ';
+        $html .= '>';
         $html .= '<img alt="" ';
         $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png')
             . '" />';
         $html .= '</td>';
 
-        $html .= '<td id="id_zag_' . $t_n_url . '" class="tab_zag nowrap" ';
+        $html .= '<td id="id_zag_' . htmlspecialchars($t_n_url)
+            . '" class="tab_zag nowrap tab_zag_noquery" ';
         $html .= 'onmousedown="cur_click=document.getElementById(\''
             . $t_n_url . '\');" ';
-        $html .= 'onmouseover="Table_onover(\''
-            . $t_n_url . '\',0,' . (isset($_REQUEST['query']) ? 1 : 0 ) . ')" ';
-        $html .= 'onmouseout="Table_onover(\''
-            . $t_n_url . '\',1,' . (isset($_REQUEST['query']) ? 1 : 0 ) . ')">';
+        $html .= 'table_name="' . htmlspecialchars($t_n_url) . ''
+            . '" query_set="' . (isset($_REQUEST['query']) ? 1 : 0 ) . '" ';
+        $html .= '>';
         $html .= '<span class="owner">';
         $html .= $GLOBALS['PMD_OUT']["OWNER"][$i] . '.';
         $html .= '</span>';
-        $html .= $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i];
+        $html .= $GLOBALS['PMD_OUT']['TABLE_NAME_SMALL'][$i];
         $html .= '</td>';
 
         if (isset($_REQUEST['query'])) {
-            $html .= '<td class="tab_zag" ';
+            $html .= '<td class="tab_zag tab_zag_query" ';
             $html .= 'id="id_zag_' . htmlspecialchars($t_n_url) . '_2" ';
-            $html .= 'onmouseover="Table_onover(\''
-                . htmlspecialchars($t_n_url) . '\',0,1)" ';
+            $html .= 'table_name="' . htmlspecialchars($t_n_url) . '" ';
             $html .= 'onmousedown="cur_click=document.getElementById(\''
                 . htmlspecialchars($t_n_url) . '\');" ';
-            $html .= 'onmouseout="Table_onover(\''
-                . htmlspecialchars($t_n_url) . '\',1,1)">';
+            $html .= '>';
         }
 
         $html .= '</tr>';
@@ -660,9 +656,9 @@ function PMA_getDatabaseTables(
             $html .= 'onmouseover="old_class = this.className; ';
             $html .= 'this.className = \'tab_field_2\';" ';
             $html .= 'onmouseout="this.className = old_class;" ';
-            $html .= 'onmousedown="Click_field(';
-            $html .= '\'' . $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i] . '\',';
-            $html .= '\'' . urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '\',';
+            $html .= 'click_field_param="';
+            $html .= $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i] . ',';
+            $html .= urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . ',';
 
             $tmpColumn = $t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j];
 
@@ -673,21 +669,22 @@ function PMA_getDatabaseTables(
                 // index is a primary key
                 $html .= (isset($tables_all_keys[$tmpColumn]) ? 1 : 0);
             }
-            $html .= ')"';
+            $html .= '"';
             $html .= '>';
 
             if (isset($_REQUEST['query'])) {
                 $html .= '<td class="select_all">';
-                $html .= '<input value="' . htmlspecialchars($t_n_url)
+                $html .= '<input class="select_all_store_col" value="'
+                    . htmlspecialchars($t_n_url)
                     . urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '"';
                 $html .= 'type="checkbox" id="select_' . htmlspecialchars($t_n_url)
                     . '._' . urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '" ';
                 $html .= 'style="margin: 0px;" title="select_'
                     . urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '" ';
-                $html .= 'onclick="store_column(\''
-                    . urlencode($GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]) . '\',\''
-                    . htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]) . '\',\''
-                    . urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '\')"></td>';
+                $html .= 'store_column_param="'
+                    . urlencode($GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]) . ','
+                    . htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]) . ','
+                    . urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '"></td>';
             }
 
             $html .= '<td width="10px" colspan="3"';
@@ -736,12 +733,14 @@ function PMA_getDatabaseTables(
             $html .= "</div>\n</td>\n";
 
             if (isset($_REQUEST['query'])) {
-                $html .= '<td class="small_tab_pref" ';
-                $html .= 'onmouseover="this.className=\'small_tab_pref2\';" ';
-                $html .= 'onmouseout="this.className=\'small_tab_pref\';" ';
-                $html .= 'onclick="Click_option(\'pmd_optionse\',\''
-                    . urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) . '\',\''
-                    . $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i] . '\')" >';
+                $html .= '<td class="small_tab_pref small_tab_pref_click_opt" ';
+                $html .= 'onmouseover="this.className='
+                    . '\'small_tab_pref2 small_tab_pref_click_opt\';" ';
+                $html .= 'onmouseout="this.className='
+                    . '\'small_tab_pref small_tab_pref_click_opt\';" ';
+                $html .= 'Click_option_param="pmd_optionse,'
+                    . urlencode($tab_column[$t_n]['COLUMN_NAME'][$j]) . ','
+                    . $GLOBALS['PMD_OUT']['TABLE_NAME_SMALL'][$i] . '" >';
                 $html .=  '<img src="'
                     . $_SESSION['PMA_Theme']->getImgPath('pmd/exec_small.png')
                     . '" title="options" alt="" /></td> ';
@@ -812,11 +811,13 @@ function PMA_getNewRelationPanel()
     $html .= '<tbody>';
     $html .= '<tr>';
     $html .= '<td colspan="2" class="center nowrap">';
-    $html .= '<input type="button" class="butt" name="Button" ';
-    $html .= 'value="' . __('OK') . '" onclick="New_relation()" />';
-    $html .= '<input type="button" class="butt" name="Button" ';
+    $html .= '<input type="button" id="ok_new_rel_panel" class="butt" '
+        . 'name="Button" ';
+    $html .= 'value="' . __('OK') . '" />';
+    $html .= '<input type="button" id="cancel_new_rel_panel" '
+        . 'class="butt" name="Button" ';
     $html .= 'value="' . __('Cancel') . '" ';
-    $html .= 'onclick="document.getElementById(\'layer_new_relation\').style.display = \'none\';" />';
+    $html .= '/>';
     $html .= '</td>';
     $html .= '</tr>';
     $html .= '</tbody>';
@@ -861,11 +862,11 @@ function PMA_getDeleteRelationPanel()
     $html .= '</tr>';
     $html .= '<tr>';
     $html .= '<td colspan="3" class="center nowrap">';
-    $html .= '<input name="Button" type="button" class="butt" ';
-    $html .= 'onclick="Upd_relation()" value="' . __('Delete') . '" />';
-    $html .= '<input type="button" class="butt" name="Button" ';
+    $html .= '<input id="del_button" name="Button" type="button" class="butt" ';
+    $html .= 'value="' . __('Delete') . '" />';
+    $html .= '<input id="cancel_button" type="button" class="butt" name="Button" ';
     $html .= 'value="' . __('Cancel') . '" ';
-    $html .= 'onclick="document.getElementById(\'layer_upd_relation\').style.display = \'none\'; Re_load();" />';
+    $html .= '/>';
     $html .= '</td>';
     $html .= '</tr>';
     $html .= '</table></td>';
@@ -1005,11 +1006,11 @@ function PMA_getOptionsPanel()
     $html .= '<tbody>';
     $html .= '<tr>';
     $html .= '<td colspan="2" class="center nowrap">';
-    $html .= '<input type="button" class="butt" name="Button" ';
-    $html .= 'value="' . __('OK') . '" onclick="add_object()" />';
-    $html .= '<input type="button" class="butt" name="Button" ';
-    $html .= 'value="' . __('Cancel') . '" ';
-    $html .= 'onclick="Close_option()" />';
+    $html .= '<input type="button" id="ok_add_object" class="butt" name="Button" ';
+    $html .= 'value="' . __('OK') . '" />';
+    $html .= '<input type="button" id="cancel_close_option" class="butt" ';
+    $html .= 'name="Button" value="' . __('Cancel') . '" ';
+    $html .= '/>';
     $html .= '</td>';
     $html .= '</tr>';
     $html .= '</tbody>';
@@ -1067,11 +1068,12 @@ function PMA_getRenameToPanel()
     $html .= '<tbody>';
     $html .= '<tr>';
     $html .= '<td colspan="2" class="center nowrap">';
-    $html .= '<input type="button" class="butt" name="Button" ';
-    $html .= 'value="' . __('OK') . '" onclick="edit(\'Rename\')" />';
+    $html .= '<input type="button" id="ok_edit_rename" class="butt" name="Button" ';
+    $html .= 'value="' . __('OK') . '" />';
     $html .= '<input type="button" class="butt" name="Button" ';
     $html .= 'value="' . __('Cancel') . '" ';
-    $html .= 'onclick="document.getElementById(\'query_rename_to\').style.display = \'none\';" />';
+    $html .= 'onclick="document.getElementById(\'query_rename_to\').style.display'
+        . ' = \'none\';" />';
     $html .= '</td>';
     $html .= '</tr>';
     $html .= '</tbody>';
@@ -1155,11 +1157,12 @@ function PMA_getHavingQueryPanel()
     $html .= '<tbody>';
     $html .= '<tr>';
     $html .= '<td colspan="2" class="center nowrap">';
-    $html .= '<input type="button" class="butt" name="Button" ';
-    $html .= 'value="' . __('OK') . '" onclick="edit(\'Having\')" />';
+    $html .= '<input type="button" id="ok_edit_having" class="butt" name="Button" ';
+    $html .= 'value="' . __('OK') . '" />';
     $html .= '<input type="button" class="butt" name="Button" ';
     $html .= 'value="' . __('Cancel') . '" ';
-    $html .= 'onclick="document.getElementById(\'query_having\').style.display = \'none\';" />';
+    $html .= 'onclick="document.getElementById(\'query_having\').style.display'
+        . ' = \'none\';" />';
     $html .= '</td>';
     $html .= '</tr>';
     $html .= '</tbody>';
@@ -1223,11 +1226,12 @@ function PMA_getAggregateQueryPanel()
     $html .= '<tbody>';
     $html .= '<tr>';
     $html .= '<td colspan="2" class="center nowrap">';
-    $html .= '<input type="button" class="butt" name="Button" ';
-    $html .= 'value="' . __('OK') . '" onclick="edit(\'Aggregate\')" />';
+    $html .= '<input type="button" id="ok_edit_Aggr" class="butt" name="Button" ';
+    $html .= 'value="' . __('OK') . '" />';
     $html .= '<input type="button" class="butt" name="Button"';
     $html .= 'value="' . __('Cancel') . '" ';
-    $html .= 'onclick="document.getElementById(\'query_Aggregate\').style.display = \'none\';" />';
+    $html .= 'onclick="document.getElementById(\'query_Aggregate\').style.display'
+        . ' = \'none\';" />';
     $html .= '</td>';
     $html .= '</tr>';
     $html .= '</tbody>';
@@ -1299,11 +1303,12 @@ function PMA_getWhereQueryPanel()
     $html .= '<tbody>';
     $html .= '<tr>';
     $html .= '<td colspan="2" class="center nowrap">';
-    $html .= '<input type="button" class="butt" name="Button" ';
-    $html .= 'value="' . __('OK') . '" onclick="edit(\'Where\')" />';
+    $html .= '<input type="button" id="ok_edit_where" class="butt" name="Button" ';
+    $html .= 'value="' . __('OK') . '" />';
     $html .= '<input type="button" class="butt" name="Button" ';
     $html .= 'value="' . __('Cancel') . '" ';
-    $html .= 'onclick="document.getElementById(\'query_where\').style.display = \'none\'" />';
+    $html .= 'onclick="document.getElementById(\'query_where\').style.display'
+        . ' = \'none\'" />';
     $html .= '</td>';
     $html .= '</tr>';
 
diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php
index a23d5d4a6d..65bcf2852b 100644
--- a/themes/pmahomme/css/pmd.css.php
+++ b/themes/pmahomme/css/pmd.css.php
@@ -374,8 +374,9 @@ a.M_butt:hover {
     background: #FFF;
     border: 1px solid gray;
     width: 350 px;
-    height: auto;
-    padding: 30px 170px 30px;
+    max-height: 500px;
+    overflow:scroll;
+    padding: 30px;
     padding-<?php echo $left; ?>: 30px;
     color: #FFF;
     z-index: 102;
@@ -446,7 +447,6 @@ h2.active {
     padding: 0;
     border-top: 1px solid #d6d6d6;
     background: #FFF;
-    width: 250px;
     overflow: hidden;
     font-size: 1.2em;
     clear: both;