Adding screens and transitions