Fix overlay structure