Added optimised pagination

Fixed back button and pagination
Merge pull request #20 from isflorin/dev

Added optimised pagination
Merge pull request #21 from isflorin/test

Test