Added username field to User Add/Edit forms, and displayed username instead of email on all pages