Fix slide ordering on scenario 1, clean up