Added usernames to Users and edited account views