diff --git a/app/View/Elements/navbar.ctp b/app/View/Elements/navbar.ctp
index d9c497b..57e60c7 100755
--- a/app/View/Elements/navbar.ctp
+++ b/app/View/Elements/navbar.ctp
@@ -1,20 +1,16 @@
-<?php
-if(!empty($isLoggedin)){
-?>
 <ul>
-    <?php if(!empty($isStaff)){ ?>
-        <li<?php if(isset($MENU_ADMIN)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.admin'),'/admin/');?></li>
-    <?php } ?>
     <li<?php if(isset($MENU_START)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.startpage'),array('controller'=>'home','action'=>'home'));?></li>
     <?php if(!$COMPANY): ?>
-    <li<?php if(isset($MENU_SEARCH)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'opening'));?></li>
+        <li<?php if(isset($MENU_SEARCH)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'opening'));?></li>
 	<?php elseif($COMPANY): ?>
-	<li<?php if(isset($MENU_SEARCH)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'worker'));?></li>
+	    <li<?php if(isset($MENU_SEARCH)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'worker'));?></li>
     <?php endif; ?>
     <li<?php if(isset($MENU_SERVICE)){?> class="active"<?php } ?>><?=$this->Html->link(__('dreamjob.service'),'/service/');?></li>
-    <li><?=$this->Html->link(__('dreamjob.logout'),array('controller'=>'home','action'=>'logout'));?></li>
+    <?php if(!empty($isLoggedin)){  ?>
+       <li><?=$this->Html->link(__('dreamjob.logout'),array('controller'=>'home','action'=>'logout'));?></li>
+    <?php } ?>
 </ul>
-<?php }else{ ?>
+<?php if(empty($isLoggedin)){  ?>
 <div>
 <?php
 	echo $this->Form->create(null, array('inputDefaults'=> array('div' => false,'label'=>false,
@@ -50,4 +46,4 @@ if(!empty($isLoggedin)){
         <li><a href="#">Separated link</a></li>
         <li><a href="#">One more separated link</a></li>
     </ul>
-</li> */?>            
+</li> */?>
\ No newline at end of file