Draw it all

Fix event ordering problem