diff --git a/common.inc.php b/common.inc.php
index a580fa5b..23486356 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -122,23 +122,6 @@ if(!$_SESSION['conferences_id']) {
 
 }
 ?>
-     </div>
-     <div id="header-conferences">
-<?
- $q=mysql_query("SELECT * FROM conferences WHERE status='running' ORDER BY name");
- if(mysql_num_rows($q)) {
-	 echo "<ul class=\"conferencenav\">";
-	 while($r=mysql_fetch_object($q)) {
-		 if($_SESSION['conferences_id']==$r->id)
-			 $cl="class=\"selected\"";
-		 else
-			 $cl="";
-		 echo "<li $cl><a $cl href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=switchconference&amp;switchconference=$r->id\">$r->name</a></li>\n";
-	 }
-	 echo "</ul>\n";
- }
- ?>
-
      </div>
      <div id="header-login">
 <?
@@ -183,10 +166,28 @@ if(isset($_SESSION['roles']) && $_SESSION['username']) {
 }
 ?>
      </div>
+     <div id="header-conferences">
+<?
+ $q=mysql_query("SELECT * FROM conferences WHERE status='running' ORDER BY name");
+ if(mysql_num_rows($q)) {
+   echo "<ul class=\"conferencenav\">";
+   while($r=mysql_fetch_object($q)) {
+     if($_SESSION['conferences_id']==$r->id)
+       $cl="class=\"selected\"";
+     else
+       $cl="";
+     echo "<li $cl><a $cl href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=switchconference&amp;switchconference=$r->id\">$r->name</a></li>\n";
+   }
+   echo "</ul>\n";
+ }
+ ?>
+
+     </div>
+     
     </div>
    </div>
    <div id="navigation-section" class="clear">
-    <div id="primarymenu" class="clear">
+    <div id="channel-menu" class="clear">
      <ul class="primarynav">
 <?
 //if they arent logged in, we need _some_ sort of navigation
@@ -286,7 +287,7 @@ if(array_key_exists('users_id', $_SESSION)) {
 ?>
 </ul>
     </div>
-    <div id="secondarymenu" class="clear">
+    <div id="division-menu" class="clear">
     </div>
    </div>
 
@@ -350,7 +351,7 @@ if(is_array($nav)) {
 ?>
 
 <div id="main" class="clear">
- <div id="tertiarymenu">
+ <div id="topic-menu">
  </div>
 <?
 
diff --git a/nav.php b/nav.php
index 07ffe78b..8a0c5e8a 100644
--- a/nav.php
+++ b/nav.php
@@ -56,9 +56,10 @@
 		 unset($_SESSION['nav']['tertiary']);
 		 unset($_SESSION['nav']['tertiarylink']);
 		 $q=mysql_query("SELECT * FROM rolestasks WHERE pid='$id' AND level=2 AND conferencetype='{$conference['type']}' ORDER By ord,task");
-			 echo "<ul class=\"tertiary_nav\">";
+			 echo "<ul class=\"topic-menu sfiab-menu\">";
 		 while($r=mysql_fetch_object($q)) {
-				 echo "<li id=\"tertiarylink_nav_{$r->id}\"><a href=\"".$config['SFIABDIRECTORY']."$r->link\">".i18n($r->task)."</a></li>\n";
+        $link_style = 'link'; // Sep 09, 2010 MK: Class name needs to be derived from the data to allow for subtitles, separators etc.
+				echo "<li id=\"tertiarylink_nav_{$r->id}\" class=\"$link_style\"><a href=\"".$config['SFIABDIRECTORY']."$r->link\">".i18n($r->task)."</a></li>\n";
 			 /*
 			 if($r->link) {
 			 echo "<h3 id=\"tertiary_nav_{$r->id}\"><a href=\"{$config['SFIABDIRECTORY']}$r->link\">".i18n("$r->task")."</a></h3>\n";
@@ -67,7 +68,7 @@
 			 }
 			 */
 			 /*
-			 echo "<ul class=\"tertiary_nav\">";
+			 echo "<ul class=\"topic-menu sfiab-menu\">";
 			 $q2=mysql_query("SELECT * FROM rolestasks WHERE pid='$r->id' AND level=3 AND conferencetype='{$conference['type']}' ORDER BY ord,task");
 			 while($r2=mysql_fetch_object($q2)) {
 				 echo "<li id=\"tertiarylink_nav_{$r2->id}\"><a href=\"".$config['SFIABDIRECTORY']."$r2->link\">".i18n($r2->task)."</a></li>\n";