Issues: Improve pagination buttons