Refactor loading layer, add loading to maps too