Add pager activity and check in refactoring