Fixed all issues with pagination/animation