Rework fade in/out to use transistion screen