Started tidying up the logout section