refactor, fix group avatar