Replaced grid with natural wrapping to retain template instances