JohnG. fix screen transition