Correct drawing splash to the incorrect canvas
Final cleanup before demo