- FIX: Refactor building intent to start new activity