Tidied up the username and logout bit.