Updated with ViewPager Indicator