Minor main refactor, indicator code rewrite, fixes #2.
Removed odd finals in ViewPager class.