Refactoring, added activity screen, refined view pager