Moved overlay setup to OverlayCreator