diff --git a/dev/quux.php b/dev/quux.php
index b04a220..9d55faa 100644
--- a/dev/quux.php
+++ b/dev/quux.php
@@ -1,162 +1,163 @@
 <?php
 
     use Hypership\Geo\PointPolarZ;
 
     require_once('includes/objects/ship.php');
     require_once('includes/objects/port.php');
     require_once('includes/objects/application.php');
     require_once('includes/objects/content.php');
     require_once('includes/objects/message.php');
     require_once('includes/objects/invite.php');
     require_once('includes/cache/cache.php');
 
-    include('controllers/header.php');
-
     $case = 'YubiCloud';
 
+    $smarty->assign('PAGE_TITLE', "Quux [$case]");
+    include('controllers/header.php');
+
     switch ($case) {
         case 'YubiCloud':
             require_once('Auth/Yubico.php');
             echo '<h2>YubiKey</h2>';
             if (!array_key_exists('YubiCloud', $Config)) {
                 message_die(GENERAL_ERROR, "YubiCloud authentication not configured. Add \$Config['YubiCloud']['ClientID'] and \$Config['YubiCloud']['SecretKey'] to your config.");
             }
             if (!$key = $_GET['OTP']) {
                 message_die(GENERAL_ERROR, "Please add in URL ?OTP=, then put your cursor at right of the = and press your YubiKey button");
             }
             $yubi = new Auth_Yubico($Config['YubiCloud']['ClientID'], $Config['YubiCloud']['SecretKey']);
             if (!$data = $yubi->parsePasswordOTP($key)) {
                 message_die(GENERAL_ERROR, "This is not an YubiKey OTP.");
             }
             $prefix = $data['prefix'];
             $auth = $yubi->verify($key);
             if (@PEAR::isError($auth)) {
                 if ($auth->getMessage() == 'REPLAYED_OTP') {
                     message_die("This OTP has already been used.");
                 }
                 message_die(HACK_ERROR, "<p>Authentication failed: " . $auth->getMessage() . "</p><p>Debug: " . $yubi->getLastResponse() . "</p>");
             } else {
                 print "<p>You are authenticated!</p>";
             }
             break;
 
         case 'PointPolarZ':
             echo "<H2>PointPolarZ</H2>";
             $point = PointPolarZ::fromString("(48, 30°, 3)");
             printf("Secteur T%dC%d", $point->getSection(), $point->z);
             dprint_r($point);
             break;
 
         case 'index_scenes':
             $time[] = microtime();
             require_once('includes/geo/scene.php');
             require_once('includes/geo/sceneindex.php');
             $cache = Cache::load();
             if ($index = $cache->get('GeoSceneIndex')) {
                 $index = unserialize($index);
             } else {
                 $index = GeoSceneIndex::Load(SCENE_DIR);
                 $cache->set('GeoSceneIndex', serialize($index));
             }
             $time[] = microtime();
             echo '<H2>GeoSceneIndex</H2>';
             dprint_r($index);
             echo '<H2>Time (ms)</H2>';
             dprint_r(1000 * ($time[1] - $time[0]));
             dprint_r($time);
             break;
 
         case 'travel':
             require_once('includes/travel/travel.php');
             $travel = Travel::load();
             dieprint_r($travel);
             break;
 
         case 'spherical':
             require_once('includes/geo/galaxy.php');
             echo '<H2>Spherical coordinates test</H2>';
             echo '<table cellpadding=8>';
             echo "<tr><th>Name</th><th>Type</th><th>Cartesian coords</th><th>Spherical I</th><th>Spherical II</th><th>Pencil coordinates</th></tr>";
             $objects = GeoGalaxy::getCoordinates();
             foreach ($objects as $row) {
                 echo "<tr><th style='text-align: left'>$row[0]</th><td>$row[1]</td><td>$row[2]</td>";
                 $pt = $row[2];
                 echo '<td>(', implode(', ', $pt->toSpherical()), ')</td>';
                 echo '<td>(', implode(', ', $pt->toSphericalAlternative()), ')</td>';
                 $pt->translate(500, 300, 200, 2);
                 echo '<td>', $pt, '</td>';
                 echo '</tr>';
             }
             echo '</table>';
             break;
 
         case 'travel':
             require_once('includes/travel/travel.php');
             require_once('includes/travel/place.php');
 
             $cache = Cache::load();
             $travel = $cache->get('zed_travel');
             if ($travel == '') {
                 $travel_nocached = new Travel();
                 $travel_nocached->load_xml("content/travel.xml");
                 $cache->set('zed_travel', serialize($travel_nocached));
             } else {
                 $travel = unserialize($travel);
             }
             dieprint_r($travel);
             break;
 
         case 'perso.create.notify':
             $testperso = Perso::get(4733);
             $message = new Message();
             $message->from = 0;
             $message->to = invite::who_invited(4733);
             $url = get_server_url() . get_url('who', $testperso->nickname);
             $message->text =  sprintf(lang_get('InvitePersoCreated'), $testperso->name, $url);
             $message->send();
             dieprint_r($message);
             break;
 
         case 'pushdata';
             echo '
 <h2>/api.php/app/pushdata</h2>
 <form method="post" action="/api.php/app/pushdata?mode=file&key=37d839ba-f9fc-42ca-a3e8-28053e979b90" enctype="multipart/form-data">
     <input type="file" name="datafile" /><br />
     <input type="submit" value="Send file" />
 </form>
             ';
             break;
 
         case 'thumbnail':
             $content = new Content(1);
             dprint_r($content);
             $content->generate_thumbnail();
             break;
 
         case 'port':
             echo '<h2>Port::from_location test</h2>';
             $locations = array("B00002", "B00002123", "B00001001", "xyz: [800, 42, 220]");
             foreach ($locations as $location) {
                 dprint_r(Port::from_location($location));
             }
             break;
 
         case 'ext':
             $file = 'dev/foo.tar';
             echo "<h2>$file</h2>";
             echo "<h3>.tar.bz2</h3>";
             echo preg_match('/\.tar\.bz2$/', $file);
             echo "<h3>.tar</h3>";
             echo preg_match('/\.tar$/', $file);
             break;
 
         case 'app':
             echo Application::from_api_key("37d839ba-f9fc-42ca-a3e8-28053e979b90")->generate_userkey();
             break;
 
         case '':
             dieprint_r("No case currently selected.");
             break;
     }
 
     include('controllers/footer.php');
diff --git a/skins/zed/header.tpl b/skins/zed/header.tpl
index 57a1126..dddd6da 100644
--- a/skins/zed/header.tpl
+++ b/skins/zed/header.tpl
@@ -1,68 +1,68 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title>{$PAGE_TITLE} - {#SiteTitle#}</title>
+    <title>{if isset($PAGE_TITLE)}{$PAGE_TITLE} - {/if}{#SiteTitle#}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <link rel="stylesheet" type="text/css" href="{#StaticContentURL#}/css/960.css" media="screen" />
     <link rel="stylesheet" href="{#StaticContentURL#}/css/zed/theme.css" />
     <script type="text/javascript" src="{#StaticContentURL#}/js/misc.js"></script>
 {foreach from=$PAGE_CSS item=css}
     <link rel="stylesheet" href="{#StaticContentURL#}/css/{$css}" />
 {/foreach}
 {foreach from=$PAGE_JS item=js}
     <script src="{#StaticContentURL#}/js/{$js}"></script>
 {/foreach}
 {if $DOJO}
 
     <!-- DOJO -->
     <script type="text/javascript" src="{#StaticContentURL#}/js/dojo/dojo/dojo.js" djConfig="isDebug:false, parseOnLoad: true" ></script>
 {if isset($DIJIT)}
     <link rel="stylesheet" type="text/css" href="{#StaticContentURL#}/css/zed/forms.css" />
 {/if}
 {/if}
 </head>
 <body{if isset($DIJIT)} class="tundra"{/if}>
 <!-- Header -->
 <div id="header">
     <div id="header_content">
         <div class="container_16">
             <div class="grid_9">
                 <div class="wall" id="header_wall">
                     {$WALL_TEXT}
                     <br />
                     <span class="wall_info">- - <a href="{$WALL_USER_URL}">{$WALL_USER}</a></span>
                 </div>
                 <div class="clear"></div>
                 <div id="HypershipTime">{get_hypership_time()}</div>
             </div>
             <div class="grid_7">
                 <a href="{get_url()}"><img src="{#StaticContentURL#}/img/zed/logo.png" alt="Zed logo" border="0" /></a>
             </div>
             <div class="clear"></div>
         </div>
     </div>
 </div>
 <div class="clear"></div>
 
 <!-- Content -->
 <div class="container_16">
 {if isset($WAP)}
 
     <!-- WAP -->
     <div class="grid_16 alpha omega">
         <div class="wap">{$WAP}</div>
     </div>
     <div class="clear"></div>
 {/if}
 {if isset($NOTIFY)}
 
     <!-- Notify -->
     <div class="grid_16 alpha omega">
         <div class="notify">{$NOTIFY}</div>
     </div>
     <div class="clear"></div>
 {/if}
 
 {if isset($SmartLine_STDOUT) || isset($SmartLine_STDERR)}
 {include file="smartline_results.tpl"}
 {/if}