diff --git a/js/server_status.js b/js/server_status.js
index 00b4cb59e7..843e93ef69 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -691,13 +691,16 @@ $(function() {
             width:'auto',
             height:'auto',
             buttons: {
-                'Add chart to grid': function() {                  
+                'Add chart to grid': function() {
                     var type = $('input[name="chartType"]').find(':checked').val();
                     
                     if(type == 'cpu' || type == 'memory')
                         newChart = presetCharts[type + '-' + server_os];
                     
-                    if(newChart.nodes.length == 0) return;
+                    if(newChart.nodes.length == 0) {
+                        alert('Please add at least one variable to the series');
+                        return;
+                    }
                     
                     newChart.title = $('input[name="chartTitle"]').attr('value');
                     // Add a cloned object to the chart grid
@@ -714,6 +717,9 @@ $(function() {
                 $('#seriesPreview').html('');
             }
         });
+        
+        $('div#addChartDialog #seriesPreview').html('<i>'+'None.'+'</i>');
+        
         return false;
     });
     
@@ -723,8 +729,10 @@ $(function() {
             $(this).html('<img src="' + pma_theme_image + 'play.png" alt="Resume"/> Resume Monitor');
         else {
             $(this).html('<img src="' + pma_theme_image + 'pause.png" alt="Pause"/> Pause Monitor');
-            if(chartGrid == null)
+            if(chartGrid == null) {
                 initGrid();
+                $('a[href="#popupLink"]').show();
+            }
         }
         return false;
     });
@@ -734,7 +742,7 @@ $(function() {
         
         $dialog.dialog({
             width: 585,
-            height: 415
+            height: 'auto'
         }).find('img.ajaxIcon').show();
         
         var loadLogVars = function(getvars) {
@@ -787,14 +795,14 @@ $(function() {
                             str += '- <a class="set" href="#log_output-TABLE">' + 'Set log_output to TABLE' + ' </a><br />';
                         
                         if(logVars['general_log'] != 'ON')
-                            str += '- <a class="set" href="#general_log-ON">' + 'Enable general log' + ' </a><br />';
+                            str += '- <a class="set" href="#general_log-ON">' + 'Enable general_log' + ' </a><br />';
                         else 
-                            str += '- <a class="set" href="#general_log-OFF">' + 'Disable general log' + ' </a><br />';
+                            str += '- <a class="set" href="#general_log-OFF">' + 'Disable general_log' + ' </a><br />';
                         
                         if(logVars['slow_query_log'] != 'ON')
-                            str += '- <a class="set" href="#slow_query_log-ON">' +  'Enable slow query log' + ' </a><br />';
+                            str += '- <a class="set" href="#slow_query_log-ON">' +  'Enable slow_query_log' + ' </a><br />';
                         else 
-                            str += '- <a class="set" href="#slow_query_log-OFF">' +  'Disable slow query log' + ' </a><br />';
+                            str += '- <a class="set" href="#slow_query_log-OFF">' +  'Disable slow_query_log' + ' </a><br />';
                         
                         if(logVars['long_query_time'] > 2) 
                             str += '- <a class="set" href="#long_query_time-1">' + 'Set long_query_time to 1s' + ' </a><br />';
diff --git a/server_status.php b/server_status.php
index d0427360c5..9a2d18ecd7 100644
--- a/server_status.php
+++ b/server_status.php
@@ -594,7 +594,7 @@ echo __('Runtime Information');
         <div id="statustabs_charting">
             <div class="popupMenu">
                 <a href="#pauseCharts"><img src="<?php echo $GLOBALS['pmaThemeImage'];?>play.png" alt="Start"/> Start Monitor</a>
-                <a href="#popupLink"><img src="<?php echo $GLOBALS['pmaThemeImage'];?>s_cog.png" alt="Settings"/> Settings</a>
+                <a href="#popupLink" style="display:none;"><img src="<?php echo $GLOBALS['pmaThemeImage'];?>s_cog.png" alt="Settings"/> Settings</a>
                 <a href="#monitorInstructions"><img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_help.png" alt="Instructions"/> Instructions</a>
                 <ul class="popupContent">
                     <li><a href="#addNewChart"><img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_chart.png" alt="Add chart"/> Add chart</a><br></li>
@@ -620,9 +620,13 @@ echo __('Runtime Information');
                 Ok, you are good to go! Once you click 'Start monitor' your browser will refresh all displayed charts
                 in a regular interval. You may add charts and change the refresh rate under 'Settings', or remove any chart
                 using the cog icon on each respective chart.
-                <p>When you get to see a sudden spike in activity, select the relevant timespan on any chart by holding down the
+                <p>When you get to see a sudden spike in activity, select the relevant time span on any chart by holding down the
                 left mouse button and panning over the chart. This will load statistics from the logs helping you find what caused the
                 activity spike.</p>
+                <p><b>Please note:</b>
+                Enabling the general_log may increase the server load by up to 5-15%. Also be aware that generating statistics out of the logs is a 
+                very load intensive task, thus it is advisable to select only a small time span.
+                </p>
                 </p>
                 </div>
             </div>