add user relation
update style
refactor