Some refactoring, ViewPager attached properties added.