Screen now returns old layer on switch