Changed screen to window