moved username and logout link into navbar, where it belongs