Revert "new screens"

This reverts commit 6ba3742ab731c160d5b01aeae1a6cf9860240125.