Fixed the order for moving from screen to screen