More work on viewpager