Added 2 screens and a task component