Pagination design has been added
Tided up code, removed un-needed code, reduced the amount of API requests