Separate map layers from map component