Finished the transition to 1 screen