Move the logout link to the Settings menu and add the username to the link