diff --git a/css/HtmlFormat.css b/css/HtmlFormat.css
index 2b8ddd5f..cee20207 100644
--- a/css/HtmlFormat.css
+++ b/css/HtmlFormat.css
@@ -53,6 +53,11 @@ h1.pagetitle {
 	color: #2196F3;
 
 }
+
+h1.pagetitle > a {
+	color: #2196F3;
+}
+
 a.backlink, a.backlink:link, a.backlink:visited, a.itemtitle, a.itemtitle:link, a.itemtitle:visited {
 
 	color: #2196F3;
diff --git a/formats/HtmlFormat.php b/formats/HtmlFormat.php
index 9b426948..20d49014 100644
--- a/formats/HtmlFormat.php
+++ b/formats/HtmlFormat.php
@@ -45,8 +45,8 @@ EOD;
 	<meta name="robots" content="noindex, follow">
 </head>
 <body>
-	<h1 class="pagetitle">{$title}</h1>
-	<div class="buttons"><a href="./"><button class="backbutton">← back to rss-bridge</button></a><a href="./?{$atomquery}"><button class="rss-feed">RSS feed</button></a></div>
+	<h1 class="pagetitle"><a href="{$uri}" target="_blank">{$title}</a></h1>
+	<div class="buttons"><a href="./#bridge-{$_GET['bridge']}"><button class="backbutton">← back to rss-bridge</button></a><a href="./?{$atomquery}"><button class="rss-feed">RSS feed</button></a></div>
 {$entries}
 </body>
 </html>
diff --git a/index.php b/index.php
index ec74915c..94406256 100644
--- a/index.php
+++ b/index.php
@@ -67,9 +67,7 @@ $whitelist_default = array(
 	"PinterestBridge",
 	"ScmbBridge",
 	"TwitterBridge",
-	"WikipediaENBridge",
-	"WikipediaEOBridge",
-	"WikipediaFRBridge",
+	"WikipediaBridge",
 	"YoutubeBridge");
 
 if (!file_exists($whitelist_file)) {
@@ -187,7 +185,15 @@ $formats = Format::searchInformation();
     <section>
         <a href="https://github.com/sebsauvage/rss-bridge">RSS-Bridge alpha 0.2 ~ Public Domain</a><br />
 		<?= $activeFoundBridgeCount; ?>/<?= count($bridgeList) ?> active bridges. <br />
-		<a href="?show_inactive=1"><button class="small">Show inactive bridges</button></a><br />
+        <?php
+            if($activeFoundBridgeCount !== count($bridgeList)){
+                // FIXME: This should be done in pure CSS
+                if(!$showInactive)
+                    echo '<a href="?show_inactive=1"><button class="small">Show inactive bridges</button></a><br />';
+                else
+                    echo '<a href="?show_inactive=0"><button class="small">Hide inactive bridges</button></a><br />';
+            }
+        ?>
     </section>
     </body>
 </html>
