Added a few screens and xml