Refactoring: add intent and new activity