merged user edit form into edit view