added name and changed username placement