diff --git a/adminer/db.inc.php b/adminer/db.inc.php
index f2ef7d45..d5a4692c 100644
--- a/adminer/db.inc.php
+++ b/adminer/db.inc.php
@@ -195,7 +195,7 @@ if ($adminer->homepage()) {
 				}
 				echo "</table>\n";
 			}
-			echo "<p class='links'><a href='" . h(ME) . "sequence='>" . lang('Create sequence') . "</a>\n";
+			echo generate_linksbar(["<a href='" . h(ME) . "sequence='>" . lang('Create sequence') . "</a>"]);
 		}
 
 		if (support("type")) {
@@ -210,7 +210,7 @@ if ($adminer->homepage()) {
 				}
 				echo "</table>\n";
 			}
-			echo "<p class='links'><a href='" . h(ME) . "type='>" . lang('Create type') . "</a>\n";
+			echo generate_linksbar(["<a href='" . h(ME) . "type='>" . lang('Create type') . "</a>"]);
 		}
 
 		if (support("event")) {
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 85add033..15f6ec3e 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -234,18 +234,18 @@ class Adminer {
 	*/
 	function selectQuery($query, $start, $failed = false) {
 		global $jush, $driver;
-		$return = "</p>\n"; // required for IE9 inline edit
 		if (!$failed && ($warnings = $driver->warnings())) {
 			$id = "warnings";
 			$return = ", <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
 				. "$return<div id='$id' class='hidden'>\n$warnings</div>\n"
 			;
 		}
-		return "<p class='links' style='margin-bottom: 25px;'><code class='jush-$jush copy-to-clipboard'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
-			. (support("sql") ? "<br><a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
-			. " | <a href='#' class='copy-to-clipboard'>" . lang('Copy to clipboard') . "</a>"
-			. $return
-		;
+		$links = [
+			(support("sql") ? "<a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : ""),
+			"<a href='#' class='copy-to-clipboard'>" . lang('Copy to clipboard') . "</a>",
+		];
+		return "<code class='jush-$jush copy-to-clipboard'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
+			. generate_linksbar($links);
 	}
 
 	/** Query printed in SQL command before execution
@@ -991,14 +991,20 @@ bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 <?php
 			}
 			$this->databasesPrint($missing);
+			$links = [];
 			if (DB == "" || !$missing) {
-				echo "<p class='links'>" . (support("sql") ? "<a href='" . h(ME) . "sql='" . bold(isset($_GET["sql"]) && !isset($_GET["import"])) . ">" . lang('SQL command') . "</a>\n | <a href='" . h(ME) . "import='" . bold(isset($_GET["import"])) . ">" . lang('Import') . "</a>\n" : "") . "";
+				if (support("sql")) {
+					$links[] = "<a href='" . h(ME) . "sql='" . bold(isset($_GET["sql"]) && !isset($_GET["import"])) . ">" . lang('SQL command') . "</a>";
+					$links[] = "<a href='" . h(ME) . "import='" . bold(isset($_GET["import"])) . ">" . lang('Import') . "</a>";
+				}
 				if (support("dump")) {
-					echo " | <a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "' id='dump'" . bold(isset($_GET["dump"])) . ">" . lang('Export') . "</a>\n";
+					$links[] = "<a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "' id='dump'" . bold(isset($_GET["dump"])) . ">" . lang('Export') . "</a>";
 				}
 			}
+			echo generate_linksbar($links);
+
 			if ($_GET["ns"] !== "" && !$missing && DB != "") {
-				echo '<br><a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create table') . "</a>\n";
+				echo generate_linksbar(['<a href="' . h(ME) . 'create="' . bold($_GET["create"] === "") . ">" . lang('Create table') . "</a>"]);
 				if (!$tables) {
 					echo "<p class='message'>" . lang('No tables.') . "\n";
 				} else {
diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index 9077d68a..7dd73950 100644
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -10,22 +10,20 @@ function connect_error() {
 		}
 
 		page_header(lang('Select database'), $error, false);
-		echo "<p class='links'>\n";
-		$links = array(
+		$actions = [
 			'database' => lang('Create database'),
 			'privileges' => lang('Privileges'),
 			'processlist' => lang('Process list'),
 			'variables' => lang('Variables'),
 			'status' => lang('Status'),
-		);
-		foreach ($links as $key => $val) {
+		];
+		$links = [];
+		foreach ($actions as $key => $val) {
 			if (support($key)) {
-				if ($key !== array_key_first($links)) {
-					echo " | ";
-				}
-				echo "<a href='" . h(ME) . "$key='>$val</a>\n";
+				$links[] = "<a href='" . h(ME) . "$key='>$val</a>";
 			}
 		}
+		echo generate_linksbar($links);
 		echo "<p>" . lang('%s version: %s through PHP extension %s', $drivers[DRIVER], "<b>" . h($connection->server_info) . "</b>", "<b>$connection->extension</b>") . "\n";
 		echo "<p>" . lang('Logged as: %s', "<b>" . h(logged_user()) . "</b>") . "\n";
 		$databases = $adminer->databases();
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 44b0a50a..f5f3f406 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -271,6 +271,18 @@ function print_fieldset($id, $legend, $visible = false) {
 	echo "<div id='fieldset-$id'" . ($visible ? "" : " class='hidden'") . ">\n";
 }
 
+function generate_linksbar($links) {
+	$linksbar = "<p class='links'>\n";
+	foreach ($links as $key => $link) {
+		if ($key !== key(array_keys($links))) {
+			$linksbar .= " | ";
+		}
+		$linksbar .= $link . "\n";
+	}
+	$linksbar .= "</p>\n";
+	return $linksbar;
+}
+
 /** Return class='active' if $bold is true
 * @param bool
 * @param string