add pagination and fix activity