Page navigation bug fixes.

Page navigation bug fixes.