diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 2ec0d820d..1417f2da5 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -281,3 +281,11 @@ form.clock {
 .nowrap {
     white-space: nowrap;
 }
+
+li {
+    padding-bottom: 1em;
+}
+
+li form {
+    display: inline;
+}
diff --git a/server_databases.php b/server_databases.php
index 82cd65cd6..a32257fd7 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -346,7 +346,7 @@ if (count($statistics) > 0) {
            . '            </b>' . "\n"
            . '            <br />' . "\n"
            . '            ' . $strDatabasesStatsHeavyTraffic . "\n"
-           . '        </li><br /><br />' . "\n";
+           . '        </li>' . "\n";
     } else if ($is_superuser && !empty($dbstats)) {
         echo '        <li>' . "\n"
            . '            <b>' . "\n"
@@ -354,7 +354,7 @@ if (count($statistics) > 0) {
            . '                    ' . $strDatabasesStatsDisable . "\n"
            . '                </a>' . "\n"
            . '            </b>' . "\n"
-           . '        </li><br /><br />' . "\n";
+           . '        </li>' . "\n";
     }
     if ($is_superuser || $cfg['AllowUserDropDatabase']) {
         echo '        <li>' . "\n"
diff --git a/server_status.php b/server_status.php
index 38335dcfb..daa7e8ed8 100644
--- a/server_status.php
+++ b/server_status.php
@@ -138,7 +138,6 @@ unset($tmp_array);
             </tr>
         </table>
     </li>
-    <br />
     <li>
         <!-- Queries -->
         <?php echo sprintf($strQueryStatistics, number_format($serverStatus['Questions'], 0, $number_decimal_separator, $number_thousands_separator)) . "\n"; ?>
@@ -223,7 +222,6 @@ unset($serverStatus['Uptime']);
 
 if (!empty($serverStatus)) {
 ?>
-    <br />
     <li>
         <!-- Other status variables -->
         <b><?php echo $strMoreStatusVars; ?></b><br />
diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php
index e3e53025c..0c835af97 100644
--- a/tbl_properties_structure.php
+++ b/tbl_properties_structure.php
@@ -720,7 +720,7 @@ echo "\n";
 
     <!-- Printable view of the table -->
     <li>
-        <div style="margin-bottom: 10px"><a href="tbl_printview.php?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a></div>
+        <a href="tbl_printview.php?<?php echo $url_query; ?>"><?php echo $strPrintView; ?></a>
     </li>
 
     <!-- Add some new fields -->
@@ -749,9 +749,7 @@ if ($cfg['Server']['relation']) {
     ?>
     <!-- Work on Relations -->
     <li>
-        <div style="margin-bottom: 10px">
-            <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php echo $strRelationView; ?></a>
-        </div>
+        <a href="tbl_relation.php?<?php echo $url_query; ?>"><?php echo $strRelationView; ?></a>
     </li>
     <?php
 }
@@ -760,11 +758,9 @@ echo "\n";
 
     <!-- Let MySQL propose the optimal structure -->
     <li>
-        <div style="margin-bottom: 10px">
         <a href="sql.php?<?php echo $url_query; ?>&amp;session_max_rows=all&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>">
             <?php echo $strStructPropose; ?></a>
         <?php echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n"; ?>
-        </div>
     </li>
 
 <?php