merge People function and fix ui