Refactor mapLayers to create layers up front