Added more screens and updates