Fix animation and overlay issues