bug fix and page picker testing