add error messages
fix view account, and prepare for edit
Fix buttons and delete of accounts.  Also add more accounts to reset
add editing a user
fix merge from master