merged navbar information with master
change logout link