Cleanup #3

Add minor fixes and refinements to the sample app for improved pagination and navigation experience.