2 files changed, 29 insertions, 13 deletions
diff --git a/views/default/css.php b/views/default/css.php
index a53d12069..9b5fa6126 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -27,17 +27,30 @@ body {
     text-align:center;
 }
 
+#container {
+    width:990px;
+    border-left:2px solid #555;
+    border-right:2px solid #555;
+    margin:auto;
+}
+
 #header {
-    background:#000;
-    color:#fff;
     margin:0 0 20px 0;
     padding:10px;
+    text-align:left;
+    position:relative;
+    border-bottom:1px solid #555;
 }
 
-#container {
-    width:990px;
-    border:1px solid #000;
-    margin:auto;
+#topmenu {
+    position:absolute;
+    top:2px;
+    right:10px;
+}
+
+#topmenu li {
+    display:inline;
+    list-style:none;
 }
 
 #sidebar_toolbox {
@@ -53,9 +66,7 @@ body {
 #mainContent_nosidebar {
     margin:0 0 0 180px;
     width:750px;
-    background:#000;
     padding:20px;
-    color:#fff;
 }
 
 #login-box {
@@ -68,8 +79,7 @@ body {
 }
 
 #footer {
-    background:#555;
-    color:#fff;
+    border-top:1px solid #555;
     margin:20px 0 0 0;
     padding:10px;
 }
 \ No newline at end of file
diff --git a/views/default/navigation/topmenu.php b/views/default/navigation/topmenu.php
index 571e3e7dc..4f50a409c 100644
--- a/views/default/navigation/topmenu.php
+++ b/views/default/navigation/topmenu.php
@@ -15,11 +15,17 @@
 	 
 ?>
 
+<?php
+     if($_SESSION['id'] != -1){
+?>
 <div id="topmenu">
     <ul>
-        <li><a href=""><?php echo elgg_echo('dashboard'); ?></a></li>
+        <li><a href="<?php echo $vars['url']; ?>mod/dashboard/"><?php echo elgg_echo('dashboard'); ?></a></li>
         <li><a href=""><?php echo elgg_echo('profile'); ?></a></li>
         <li><a href=""><?php echo elgg_echo('account'); ?></a></li>
-        <li><a href=""><?php echo elgg_echo('logout'); ?></a></li>
+        <li><a href="<?php echo $vars['url']; ?>action/logout"><?php echo elgg_echo('logout'); ?></a></li>
     </ul>
-</div>
-\ No newline at end of file
+</div>
+<?php
+    }
+?>
+\ No newline at end of file