moved logout link and username info into settings