continue refactoring images and pager