Improve page pagination