* wip * wip * wip * wip * wip * wip * Merge * wip * wip * wip * wip * wip * wip
* improve user-integration display in the user page * delete unnecessary comma