diff --git a/db_export.php b/db_export.php
index 8d96e7cd7..fda601cf6 100644
--- a/db_export.php
+++ b/db_export.php
@@ -52,11 +52,6 @@ if (!empty($selected_tbl) && empty($table_select)) {
 }
 
 foreach ($tables as $each_table) {
-    // ok we show also views
-    //if (is_null($each_table['Engine'])) {
-        // Don't offer to export views yet.
-    //    continue;
-    //}
     if (! empty($unselectall) 
             || (! empty($table_select) && !in_array($each_table['Name'], $table_select))) {
         $is_selected = '';
@@ -68,6 +63,7 @@ foreach ($tables as $each_table) {
         . $is_selected . '>'
         . str_replace(' ', '&nbsp;', $table_html) . '</option>' . "\n";
 } // end for
+
 $multi_values .= "\n";
 $multi_values .= '</select></div><br />';
 
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 700af46d3..50e1e1629 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -932,6 +932,9 @@ function PMA_DBI_get_variable($var, $type = PMA_DBI_GETVAR_SESSION, $link = null
 }
 
 /**
+ *  Function called just after a connection to the MySQL database server has been established
+ *  It sets the connection collation, and determins the version of MySQL which is running.
+ *
  * @uses    ./libraries/charset_conversion.lib.php
  * @uses    PMA_DBI_QUERY_STORE
  * @uses    PMA_MYSQL_INT_VERSION to set it
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 457bcaa21..44c6cbbc1 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -195,8 +195,9 @@ echo PMA_pluginGetJavascript($export_list);
                 echo $GLOBALS['cfg']['Export']['file_template_server'];
             }
         }
-        echo '" />';
+        echo '"';
     ?>
+    />
 
     (
     <input type="checkbox" name="remember_template"
diff --git a/view_create.php b/view_create.php
index 41699dbe1..07164a52d 100644
--- a/view_create.php
+++ b/view_create.php
@@ -171,7 +171,7 @@ $url_params['reload'] = 1;
                 echo ' id="view_with_' . str_replace(' ', '_', htmlspecialchars($option)) . '"';
                 echo ' value="' . htmlspecialchars($option) . '" />';
                 echo '<label for="view_with_' . str_replace(' ', '_', htmlspecialchars($option)) . '">';
-                echo htmlspecialchars($option) . '</label>';
+                echo htmlspecialchars($option) . '</label>&nbsp;';
             }
             ?>
         </td>