diff --git a/html/includes/header.inc.php b/html/includes/header.inc.php
index 7bfef43ce7..e4545a58e7 100644
--- a/html/includes/header.inc.php
+++ b/html/includes/header.inc.php
@@ -1,7 +1,7 @@
 <div id="gumax-header">
   <div id="gumax-p-logo">
     <div id="p-logo">
-      <a style="background-image: url('images/observium-logo.png');" accesskey="z"></a>
+      <a style="background-image: url('images/observium-logo.png');" accesskey="z" href=""></a>
     </div>
     <script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
   </div>
@@ -11,15 +11,17 @@
   <div id="gumax-p-login">
 
 <?php
-if($_SESSION['widescreen'] === 1){
-  echo('<a href="/?widescreen=no">Switch to Normal Width</a>');
-}else{
-  echo('<a href="/?widescreen=yes">Switch to Widescreen</a>');
+
+$toggle_url = preg_replace('/(\?|\&)widescreen=(yes|no)/', '', $_SERVER['REQUEST_URI']);
+if (strstr($toggle_url,'?')) { $toggle_url .= '&amp;'; } else { $toggle_url .= '?'; }
+
+if($_SESSION['widescreen'] === 1)
+{
+  echo('<a href="' . $toggle_url . 'widescreen=no" title="Switch to normal screen width layout">Normal width</a> | ');
+} else {
+  echo('<a href="' . $toggle_url . 'widescreen=yes" title="Switch to wide screen layout">Widescreen</a> | ');
 }
-?>
 
-
-<?php
 if ($_SESSION['authenticated'])
 {
   echo("Logged in as <b>".$_SESSION['username']."</b> (<a href='?logout=yes'>Logout</a>)");
@@ -27,13 +29,16 @@ if ($_SESSION['authenticated'])
   echo("Not logged in!");
 }
 
-if (Net_IPv6::checkIPv6($_SERVER['REMOTE_ADDR'])) { echo(" via <b>IPv6</b>"); } else { echo(" via <b>IPv4</b>"); }
+if (Net_IPv6::checkIPv6($_SERVER['REMOTE_ADDR'])) {
+  echo(' via <b>IPv6</b>');
+} else {
+  echo(' via <b>IPv4</b>');
+}
 ?>
 
   </div>
   <div style="float: right;">
 
-
 <?php
 if (isset($_SESSION['authenticated']) && $_SESSION['authenticated'])
 {
diff --git a/html/index.php b/html/index.php
index 7f4dd46cec..f16365eefb 100755
--- a/html/index.php
+++ b/html/index.php
@@ -27,9 +27,8 @@ include("includes/functions.inc.php");
 
 include("includes/authenticate.inc.php");
 
-if($_GET['widescreen'] == "yes") { $_SESSION['widescreen'] = 1; }
-if($_GET['widescreen'] == "no")  { unset($_SESSION['widescreen']); }
-
+if(strstr($_SERVER['REQUEST_URI'], 'widescreen=yes')) { $_SESSION['widescreen'] = 1; }
+if(strstr($_SERVER['REQUEST_URI'], 'widescreen=no'))  { unset($_SESSION['widescreen']); }
 
 $start = utime();