Added more UI screens