fixed order of things and overlay not updating after switching deck (#109)