Refactoring + ViewPager initial wiring