Use build-in page control and a bit clean up