Adding more screens for data display