Added new screens, new structure.