More testing and fixing
Changed pagination