Revert "Revert "Add missing } characters to a few grid templates.""

This reverts commit 831b790668ea93cc24cbb65651152caf7ba9e996.