Rework screen logic

This feels janky but it does what I want it to.