Issue #197, enhance the user-edit view

Issue #197 
@Dayna161193 @linabasheer please review