added pagination
pagination fixes