intents activity organization improved