Various changes and updates

But i am struggling with pagination