ScrollablePage bug fixes