Add page up and page down and cleanup API