diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index a8856c2..8bcd57c 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -201,7 +201,7 @@ function hideall() {
 <? } ?>
     <div class="relatedLinks">
       <h3 onclick="explode('WoT')">+ <?=_("CAcert Web of Trust")?></h3>
-      <ul class="menu" id="WoT"><li><a href="wot.php?id=0"><?=_("About")?></a></li><li><a href="wot.php?id=12"><?=_("Find an Assurer")?></a></li><li><a href="wot.php?id=3"><?=_("Rules")?></a></li><li><? if($_SESSION['profile']['points'] < 100) { ?><a href="wot.php?id=2"><?=_("Becoming an Assurer")?></a><? } else { ?><a href="wot.php?id=5"><?=_("Assure Someone")?></a><? } ?></li><li><a href="wot.php?id=4"><?=_("Trusted Third Parties")?></a></li><? if($_SESSION['profile']['points'] >= 50) { ?><li><a href="wot.php?id=11"><nobr><?=_("Organisation Assurance")?></nobr></a></li><? } ?></ul>
+      <ul class="menu" id="WoT"><li><a href="wot.php?id=0"><?=_("About")?></a></li><li><a href="wot.php?id=12"><?=_("Find an Assurer")?></a></li><li><a href="wot.php?id=3"><?=_("Rules")?></a></li><li><? if($_SESSION['profile']['points'] < 100) { ?><a href="wot.php?id=2"><?=_("Becoming an Assurer")?></a><? } else { ?><a href="wot.php?id=5"><?=_("Assure Someone")?></a><? } ?></li><li><a href="wot.php?id=4"><?=_("Trusted Third Parties")?></a></li><? if($_SESSION['profile']['points'] >= 50) { ?><li><a href="wot.php?id=11"><div style="whitespace:nowrap"><?=_("Organisation Assurance")?></div></a></li><? } ?></ul>
     </div>
     <div class="relatedLinks">
       <h3 onclick="explode('WoTForms')">+ <?=_("CAP/TTP Forms")?></h3><?
@@ -214,7 +214,7 @@ function hideall() {
 
 	$extra2 = "?assurer=".urlencode($name)."&date=now&maxpoints=".maxpoints();
 ?>
-      <ul class="menu" id="WoTForms"><li><a href="/cap.php<?=$extra?>">A4 - <?=_("WoT Form")?></a></li><li><a href="/cap.php<?=$extra?>&format=letter">US - <?=_("WoT Form")?></a></li><li><nobr><a href="/ttp.php<?=$extra?>">A4 - <?=_("TTP Form")?></a></nobr></li><li><nobr><a href="/ttp.php<?=$extra?>&format=letter">US - <?=_("TTP Form")?></a></nobr></li><? if($_SESSION['profile']['points'] > 100) { ?><li><nobr><a href="/cap.php<?=$extra2?>">A4 - <?=_("Assurance Form")?></a></nobr></li><li><nobr><a href="/cap.php<?=$extra2?>&format=letter">US - <?=_("Assurance Form")?></a></nobr></li><? } ?><li><nobr><a href="/ttp.php">A4 - <?=_("Blank TTP Form")?></a></nobr></li><li><nobr><a href="/ttp.php?format=letter">US - <?=_("Blank TTP Form")?></a></nobr></li><li><nobr><a href="/cap.php">A4 - <?=_("Blank CAP Form")?></a></nobr></li><li><nobr><a href="/cap.php?format=letter">US - <?=_("Blank CAP Form")?></a></nobr></li></ul>
+      <ul class="menu" id="WoTForms"><li><a href="/cap.php<?=$extra?>">A4 - <?=_("WoT Form")?></a></li><li><a href="/cap.php<?=$extra?>&format=letter">US - <?=_("WoT Form")?></a></li><li><div style="whitespace:nowrap"><a href="/ttp.php<?=$extra?>">A4 - <?=_("TTP Form")?></a></div></li><li><div style="whitespace:nowrap"><a href="/ttp.php<?=$extra?>&format=letter">US - <?=_("TTP Form")?></a></div></li><? if($_SESSION['profile']['points'] > 100) { ?><li><div style="whitespace:nowrap"><a href="/cap.php<?=$extra2?>">A4 - <?=_("Assurance Form")?></a></div></li><li><div style="whitespace:nowrap"><a href="/cap.php<?=$extra2?>&format=letter">US - <?=_("Assurance Form")?></a></div></li><? } ?><li><div style="whitespace:nowrap"><a href="/ttp.php">A4 - <?=_("Blank TTP Form")?></a></div></li><li><div style="whitespace:nowrap"><a href="/ttp.php?format=letter">US - <?=_("Blank TTP Form")?></a></div></li><li><div style="whitespace:nowrap"><a href="/cap.php">A4 - <?=_("Blank CAP Form")?></a></div></li><li><div style="whitespace:nowrap"><a href="/cap.php?format=letter">US - <?=_("Blank CAP Form")?></a></div></li></ul>
     </div>
 <? if($_SESSION['profile']['admin'] == 1 || $_SESSION['profile']['locadmin'] == 1) { ?>
     <div class="relatedLinks">
diff --git a/includes/general_stuff.php b/includes/general_stuff.php
index aacb033..aac9e92 100644
--- a/includes/general_stuff.php
+++ b/includes/general_stuff.php
@@ -77,12 +77,12 @@ google_color_border = "FFFFFF";
       <h3><?=_("My Account")?></h3>
       <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4"><?=_("Password Login")?></a> 
       <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=5"><?=_("Lost Password")?></a>
-      <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4&noauto=1"><?=_("Net Cafe Login")?></a> 
+      <a href="https://<?=$_SESSION['_config']['normalhostname']?>/index.php?id=4&amp;noauto=1"><?=_("Net Cafe Login")?></a> 
       <a href="https://<?=$_SESSION['_config']['securehostname']?>/index.php?id=4"><?=_("Certificate Login")?></a>
     </div>
     <div class="relatedLinks">
       <h3 onclick="explode('misc')"><?=_("Miscellaneous")?></h3>
-      <ul class="menu" id="misc"><li><a href="news.php"><?=_("CAcert News")?></a></li><li><a href="help.php"><?=_("Howto Information")?></a></li><li><a href="http://wiki.CAcert.org"><?=_("Wiki Documentation")?></li><li><a href="index.php?id=19"><?=_("Point System")?></a></li><li><a href="http://bugs.CAcert.org"><?=_("Bug Database")?></a></li><li><a href="logos.php"><?=_("CAcert Logos")?></a></li><li><a href="stats.php"><?=_("CAcert Statistics")?></a></li><li><a href="http://my.rsscache.com/blog.CAcert.org/feed/"><?=_("RSS News Feed")?></a></li><li><? if($_SESSION['profile']['admin'] == 1) { ?><a href="index.php?id=5"><?=_("OCSP Details")?></a><? } ?></li><li><a href="index.php?id=7"><?=_("Credits")?></a></li><li><a href="index.php?id=8"><?=_("CAcert Board")?></a></li><li><a href="https://lists.cacert.org/cgi-bin/mailman/listinfo"><?=_("Mailing Lists")?></a></li></ul>
+      <ul class="menu" id="misc"><li><a href="news.php"><?=_("CAcert News")?></a></li><li><a href="help.php"><?=_("Howto Information")?></a></li><li><a href="http://wiki.CAcert.org"><?=_("Wiki Documentation")?></a></li><li><a href="index.php?id=19"><?=_("Point System")?></a></li><li><a href="http://bugs.CAcert.org"><?=_("Bug Database")?></a></li><li><a href="logos.php"><?=_("CAcert Logos")?></a></li><li><a href="stats.php"><?=_("CAcert Statistics")?></a></li><li><a href="http://my.rsscache.com/blog.CAcert.org/feed/"><?=_("RSS News Feed")?></a></li><li><? if($_SESSION['profile']['admin'] == 1) { ?><a href="index.php?id=5"><?=_("OCSP Details")?></a><? } ?></li><li><a href="index.php?id=7"><?=_("Credits")?></a></li><li><a href="index.php?id=8"><?=_("CAcert Board")?></a></li><li><a href="https://lists.cacert.org/cgi-bin/mailman/listinfo"><?=_("Mailing Lists")?></a></li></ul>
     </div>
     <div class="relatedLinks">
       <h3 onclick="explode('trans')"><?=_("Translations")?></h3>