style updates of the screens (performance)
screen handling modified