Refactoring (using ViewPager)