only edit your own account, sort order
remove dead code, sort order fixed