Added new screens and formatting