Added pagination... still have an issue with animating