diff --git a/app/src/frontend/map/map.tsx b/app/src/frontend/map/map.tsx
index b505b048..0f362885 100644
--- a/app/src/frontend/map/map.tsx
+++ b/app/src/frontend/map/map.tsx
@@ -157,10 +157,40 @@ export const ColouringMap: FC<ColouringMapProps> = ({
           <CityMap theme={darkLightTheme} />
           <BuildingBaseLayer theme={darkLightTheme} />
         </Pane>
+        <Pane
+          name="cc-overlay-pane-shown-behind-buildings"
+          style={{ zIndex: 199 }}
+        >
+          <ConservationAreaBoundaryLayer />
+        </Pane>
 
         {mapColourScale && (
           <BuildingDataLayer tileset={mapColourScale} revisionId={revisionId} />
         )}
+        <Pane name="cc-overlay-pane" style={{ zIndex: 300 }}>
+          <CityBoundaryLayer />
+          <HistoricDataLayer revisionId={revisionId} />
+          <HistoricMapLayer revisionId={revisionId} />
+          <BoroughBoundaryLayer />
+          <ParcelBoundaryLayer />
+          <FloodBoundaryLayer />
+          <VistaBoundaryLayer />
+          <HousingBoundaryLayer />
+          <CreativeBoundaryLayer />
+          <BuildingNumbersLayer revisionId={revisionId} />
+          {selectedBuildingId && (
+            <BuildingHighlightLayer
+              selectedBuildingId={selectedBuildingId}
+              baseTileset={mapColourScale}
+            />
+          )}
+        </Pane>
+        <Pane name="cc-label-overlay-pane" style={{ zIndex: 1000 }}>
+          <BoroughLabelLayer />
+        </Pane>
+
+        <ZoomControl position="topright" />
+        <AttributionControl prefix="" />
       </MapContainer>
       {mode !== "basic" && (
         <>