Move boundary map into grid component