Begin the great shuffle to match the new UI layout.