fix view account, and prepare for edit