Back/forward pagination working
Cleanup