Fix screen logic