add pagination & modify some detailes