Update profile form, re-arrange fields and add delete user