added scaffold user, updated new and edit forms