JohnG. Fix screen loading