Fixing data
Adding a button to control pagination