diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js
index 05a9e49b02..c853a65167 100644
--- a/js/tbl_zoom_plot.js
+++ b/js/tbl_zoom_plot.js
@@ -61,6 +61,28 @@ function scrollToChart() {
    $('html,body').animate({scrollTop: x}, 500);
 }
 
+/**
+ ** Displays the query result display section
+ ** @param modal: type of dialog
+ **/
+function ShowDialog(modal) {
+      $("#overlay").show();
+      $("#dialog").fadeIn(300);
+      $("#overlay").click(function (e)
+      {
+          HideDialog();
+      });
+}
+
+/**
+ ** Hides the query result display section
+ ** @param modal : type of dialog
+ **/
+function HideDialog() {
+    $("#overlay").hide();
+    $("#dialog").fadeOut(300);
+}
+
 $(document).ready(function() {
 
    /**
@@ -122,23 +144,12 @@ $(document).ready(function() {
 	     // avoid default click action
 	    return false;
 	 });
-    
-    /** 
-     ** Set dialog properties for the data display form
-     **/
-    $("#dataDisplay").dialog({
-        autoOpen: false,
-	title: 'Data point content',
-        modal: false, //false otherwise other dialogues like timepicker may not function properly
-        height: $('#dataDisplay').height() + 80,
-        width: $('#dataDisplay').width() + 80
-    });
-
+   
     /*
      * Handle submit of zoom_display_form 
      */
      
-    $("#submitForm").click(function(event) {
+    $("#zoom_display_form.ajax").live('submit', function(event) {
 	
         //Prevent default submission of form
         event.preventDefault();
@@ -212,7 +223,6 @@ $(document).ready(function() {
 	                PMA_ajaxShowMessage(data.error);
 	    })//End $.post
 	}//End database update
-        $("#dataDisplay").dialog("close");	
     });//End submit handler 
 
     /*
@@ -227,6 +237,9 @@ $(document).ready(function() {
          .text(PMA_messages['strShowSearchCriteria'])
 	$('#togglesearchformdiv').show();
         
+        ShowDialog(false);
+	//$('#resizer').height($('#dataDisplay').height() + 50); 
+
     	var columnNames = new Array();
     	var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF'];
     	var series = new Array();
@@ -287,7 +300,6 @@ $(document).ready(function() {
 					j++;
 				} 
 				currentData = id;
-			        $("#dataDisplay").dialog("open");	
                             },
                         }
 	            }
@@ -303,6 +315,7 @@ $(document).ready(function() {
 	    xAxis: {
 		type: 'linear',
 	        title: { text: $('#tableid_0').val() },
+		type: 'linear',
 	        max: Array.max(xCord) + 2,
 	        min: Array.min(xCord) - 2
             },
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 6cf02825a4..81327b3496 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -233,7 +233,7 @@ for($i = 0 ; $i < 4 ; $i++){
         </td>
     </tr>
 
-    <input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>"
+    <input type="hidden" name="types[<?php echo $i; ?>]"
         value="<?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?>" />
     <input type="hidden" name="collations[<?php echo $i; ?>]"
         value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" />
@@ -349,13 +349,14 @@ if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_
     <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
     <input type="hidden" name="back" value="tbl_zoom_select.php" />
 
+    <div id="overlay" class="web_dialog_overlay"></div>
+    <div id="dialog" class="web_dialog" style="display:none">
     <fieldset id="displaySection">
         <legend><?php echo __('Browse/Edit the points') ?></legend>
-	<center>
         <?php
             //JSON encode the data(query result)
             if(isset($zoom_submit) && !empty($data)){ ?>
-                <div id='resizer' style="width:600px;height:400px">
+                <div id='resizer' style="width:600px;height:400px;float:right">
 	        <?php if (isset($data)) ?><center> <a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a> </center>
                 <div id="querydata" style="display:none">
                     <?php if(isset($data)) echo json_encode($data); ?>
@@ -364,8 +365,9 @@ if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_
                 </div>
                 <?php 
 	    } ?>
-        </center>
-    <fieldset id='dataDisplay' style="display:none">
+    
+    <fieldset id='dataDisplay'>
+        <legend><?php echo __('Data point content') ?></legend>
         <fieldset>
         <table class="data">
             <thead>
@@ -394,11 +396,12 @@ if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_
         </table>
         </fieldset>
         <fieldset class="tblFooters">
-            <input type="submit" id="submitForm" name="edit_point" value="<?php echo __('Submit'); ?>" />
+            <input type="submit" id="buttonID" name="edit_point" value="<?php echo __('Submit'); ?>" />
         </fieldset>
     </fieldset>
 
     </fieldset>
+    </div>
     <input type="hidden" id="queryID" name="sql_query" />
     </form>
     </fieldset>