diff --git a/app/src/frontend/building/sidebar.tsx b/app/src/frontend/building/sidebar.tsx
index cd5308e5..e7a94c3e 100644
--- a/app/src/frontend/building/sidebar.tsx
+++ b/app/src/frontend/building/sidebar.tsx
@@ -8,7 +8,7 @@ const Sidebar: React.FC<{}> = (props) => {
 
     return (
         <Fragment>
-        <div style={{ position: "static" }} id="sidebar" className={"info-container " + (collapsed? "offscreen": "")}>
+        <div id="sidebar" className={"info-container " + (collapsed? "offscreen": "")}>
             <button className="info-container-collapse btn btn-light"
                 onClick={() => setCollapsed(!collapsed)}
                 >
diff --git a/app/src/frontend/map-app.tsx b/app/src/frontend/map-app.tsx
index fa12500a..32bb61ae 100644
--- a/app/src/frontend/map-app.tsx
+++ b/app/src/frontend/map-app.tsx
@@ -1,252 +1,186 @@
-import React, { useCallback, useEffect, useMemo, useState } from "react";
-import { Redirect, Route, Switch } from "react-router-dom";
-import loadable from "@loadable/component";
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { Redirect, Route, Switch } from 'react-router-dom';
+import loadable from '@loadable/component';
 
-import { useRevisionId } from "./api-data/use-revision";
-import { useBuildingData } from "./api-data/use-building-data";
-import { useUserVerifiedData } from "./api-data/use-user-verified-data";
-import { useUrlBuildingParam } from "./nav/use-url-building-param";
-import { useUrlCategoryParam } from "./nav/use-url-category-param";
-import { useUrlModeParam } from "./nav/use-url-mode-param";
-import BuildingView from "./building/building-view";
-import Categories from "./building/categories";
-import { EditHistory } from "./building/edit-history/edit-history";
-import MultiEdit from "./building/multi-edit";
-import Sidebar from "./building/sidebar";
-import { Building, UserVerified } from "./models/building";
-import Welcome from "./pages/welcome";
-import { PrivateRoute } from "./route";
-import { useLastNotEmpty } from "./hooks/use-last-not-empty";
-import { Category } from "./config/categories-config";
-import { BuildingMapTileset } from "./config/tileserver-config";
-import {
-  defaultMapCategory,
-  categoryMapsConfig,
-} from "./config/category-maps-config";
-import { useMultiEditData } from "./hooks/use-multi-edit-data";
-import { useAuth } from "./auth-context";
-import { sendBuildingUpdate } from "./api-data/building-update";
-
-import "mapbox-gl/dist/mapbox-gl.css";
+import { useRevisionId } from './api-data/use-revision';
+import { useBuildingData } from './api-data/use-building-data';
+import { useUserVerifiedData } from './api-data/use-user-verified-data';
+import { useUrlBuildingParam } from './nav/use-url-building-param';
+import { useUrlCategoryParam } from './nav/use-url-category-param';
+import { useUrlModeParam } from './nav/use-url-mode-param';
+import BuildingView from './building/building-view';
+import Categories from './building/categories';
+import { EditHistory } from './building/edit-history/edit-history';
+import MultiEdit from './building/multi-edit';
+import Sidebar from './building/sidebar';
+import { Building, UserVerified } from './models/building';
+import Welcome from './pages/welcome';
+import { PrivateRoute } from './route';
+import { useLastNotEmpty } from './hooks/use-last-not-empty';
+import { Category } from './config/categories-config';
+import { BuildingMapTileset } from './config/tileserver-config';
+import { defaultMapCategory, categoryMapsConfig } from './config/category-maps-config';
+import { useMultiEditData } from './hooks/use-multi-edit-data';
+import { useAuth } from './auth-context';
+import { sendBuildingUpdate } from './api-data/building-update';
 
 /**
  * Load and render ColouringMap component on client-side only.
  * This is because leaflet and react-leaflet currently don't work on the server
  * (leaflet assumes the presence of browser-specific global `window` variable).
- *
+ * 
  * The previous solution involved installing react-leaflet-universal,
  * but that doesn't work with latest react-leaflet.
- *
+ * 
  * The limitation is that ColouringMap needs to be the single entry point in the whole app
  * to all modules that import leaflet or react-leaflet.
  */
 const ColouringMap = loadable(
-  async () => (await import("./map/map")).ColouringMap,
-  { ssr: false }
+    async () => (await import('./map/map')).ColouringMap,
+    { ssr: false }  
 );
 
 interface MapAppProps {
-  building?: Building;
-  revisionId?: string;
-  user_verified?: object;
+    building?: Building;
+    revisionId?: string;
+    user_verified?: object;
 }
 
 /** Returns first argument, unless it's equal to the second argument - then returns undefined */
-function unless<V extends string, U extends V>(
-  value: V,
-  unlessValue: U
-): Exclude<V, U> {
-  return value === unlessValue ? undefined : (value as Exclude<V, U>);
+function unless<V extends string, U extends V>(value: V, unlessValue: U): Exclude<V, U> {
+    return value === unlessValue ? undefined : value as Exclude<V, U>;
 }
 
 /** Returns the new value, unless it is equal to the current value - then returns undefined */
 function setOrToggle<T>(currentValue: T, newValue: T): T {
-  if (newValue == undefined || newValue === currentValue) {
-    return undefined;
-  } else {
-    return newValue;
-  }
+    if(newValue == undefined || newValue === currentValue){
+        return undefined;
+    } else {
+        return newValue;
+    }
 }
 
-function useStateWithOptions<T>(
-  defaultValue: T,
-  options: T[]
-): [T, (x: T) => void] {
-  const [value, setValue] = useState(defaultValue);
+function useStateWithOptions<T>(defaultValue: T, options: T[]): [T, (x: T) => void] {
+    const [value, setValue] = useState(defaultValue);
 
-  const effectiveValue = options.includes(value) ? value : options[0];
-  const handleChange = useCallback((x) => setValue(x), []);
+    const effectiveValue = options.includes(value) ? value : options[0];
+    const handleChange = useCallback((x) => setValue(x), []);
 
-  return [effectiveValue, handleChange];
+    return [effectiveValue, handleChange];
 }
 
-export const MapApp: React.FC<MapAppProps> = (props) => {
-  const { user } = useAuth();
-  const [categoryUrlParam] = useUrlCategoryParam();
+export const MapApp: React.FC<MapAppProps> = props => {
+    const { user } = useAuth();
+    const [categoryUrlParam] = useUrlCategoryParam();
 
-  const [currentCategory, setCategory] = useState<Category>();
-  useEffect(
-    () => setCategory(unless(categoryUrlParam, "categories")),
-    [categoryUrlParam]
-  );
+    const [currentCategory, setCategory] = useState<Category>();
+    useEffect(() => setCategory(unless(categoryUrlParam, 'categories')), [categoryUrlParam]);
+    
+    const displayCategory = useLastNotEmpty(currentCategory) ?? defaultMapCategory;
+    
+    const [selectedBuildingId, setSelectedBuildingId] = useUrlBuildingParam('view', displayCategory);
+    
+    const [building, updateBuilding, reloadBuilding] = useBuildingData(selectedBuildingId, props.building, user != undefined);
+    const [userVerified, updateUserVerified, reloadUserVerified] = useUserVerifiedData(selectedBuildingId, props.user_verified);
+    
+    const [revisionId, updateRevisionId] = useRevisionId(props.revisionId);
+    useEffect(() => {
+        updateRevisionId(building?.revision_id)
+    }, [building]);
+    
+    const [mode] = useUrlModeParam();
+    const viewEditMode = unless(mode, 'multi-edit');
+    
+    const [multiEditData, multiEditError] = useMultiEditData();
 
-  const displayCategory =
-    useLastNotEmpty(currentCategory) ?? defaultMapCategory;
+    const selectBuilding = useCallback((selectedBuilding: Building) => {
+        const currentId = selectedBuildingId;
+        updateBuilding(selectedBuilding);
+        setSelectedBuildingId(setOrToggle(currentId, selectedBuilding?.building_id));
+    }, [selectedBuildingId, setSelectedBuildingId, updateBuilding, building]);
 
-  const [selectedBuildingId, setSelectedBuildingId] = useUrlBuildingParam(
-    "view",
-    displayCategory
-  );
+    const colourBuilding = useCallback(async (building: Building) => {
+        const buildingId = building?.building_id;
 
-  const [building, updateBuilding, reloadBuilding] = useBuildingData(
-    selectedBuildingId,
-    props.building,
-    user != undefined
-  );
-  const [userVerified, updateUserVerified, reloadUserVerified] =
-    useUserVerifiedData(selectedBuildingId, props.user_verified);
-
-  const [revisionId, updateRevisionId] = useRevisionId(props.revisionId);
-  useEffect(() => {
-    updateRevisionId(building?.revision_id);
-  }, [building]);
-
-  const [mode] = useUrlModeParam();
-  const viewEditMode = unless(mode, "multi-edit");
-
-  const [multiEditData, multiEditError] = useMultiEditData();
-
-  const selectBuilding = useCallback(
-    (selectedBuilding: Building) => {
-      const currentId = selectedBuildingId;
-      updateBuilding(selectedBuilding);
-      setSelectedBuildingId(
-        setOrToggle(currentId, selectedBuilding?.building_id)
-      );
-    },
-    [selectedBuildingId, setSelectedBuildingId, updateBuilding, building]
-  );
-
-  const colourBuilding = useCallback(
-    async (building: Building) => {
-      const buildingId = building?.building_id;
-
-      if (buildingId != undefined && multiEditError == undefined) {
-        try {
-          const updatedBuilding = await sendBuildingUpdate(
-            buildingId,
-            multiEditData
-          );
-          updateRevisionId(updatedBuilding.revision_id);
-        } catch (error) {
-          console.error({ error });
+        if(buildingId != undefined && multiEditError == undefined) {
+            try {
+                const updatedBuilding = await sendBuildingUpdate(buildingId, multiEditData);
+                updateRevisionId(updatedBuilding.revision_id);
+            } catch(error) {
+                console.error({ error });
+            }
         }
-      }
-    },
-    [multiEditError, multiEditData, currentCategory]
-  );
+    }, [multiEditError, multiEditData, currentCategory]);
 
-  const handleBuildingUpdate = useCallback(
-    (buildingId: number, updatedData: Building) => {
-      // only update current building data if the IDs match
-      if (buildingId === selectedBuildingId) {
-        updateBuilding(Object.assign({}, building, updatedData));
-      } else {
-        // otherwise, still update the latest revision ID
-        updateRevisionId(updatedData.revision_id);
-      }
-    },
-    [selectedBuildingId, building, updateBuilding, updateRevisionId]
-  );
+    const handleBuildingUpdate = useCallback((buildingId: number, updatedData: Building) => {
+        // only update current building data if the IDs match
+        if(buildingId === selectedBuildingId) {
+            updateBuilding(Object.assign({}, building, updatedData));
+        } else {
+            // otherwise, still update the latest revision ID
+            updateRevisionId(updatedData.revision_id);
+        }
+    }, [selectedBuildingId, building, updateBuilding, updateRevisionId]);
 
-  const handleUserVerifiedUpdate = useCallback(
-    (buildingId: number, updatedData: UserVerified) => {
-      // only update current building data if the IDs match
-      if (buildingId === selectedBuildingId) {
-        updateUserVerified(Object.assign({}, userVerified, updatedData)); // quickly show added verifications
-        reloadBuilding();
-        reloadUserVerified(); // but still reload from server to reflect removed verifications
-      }
-    },
-    [selectedBuildingId, updateUserVerified, reloadBuilding, userVerified]
-  );
+    const handleUserVerifiedUpdate = useCallback((buildingId: number, updatedData: UserVerified) => {
+        // only update current building data if the IDs match
+        if(buildingId === selectedBuildingId) {
+            updateUserVerified(Object.assign({}, userVerified, updatedData)); // quickly show added verifications
+            reloadBuilding();
+            reloadUserVerified(); // but still reload from server to reflect removed verifications
+        }
+    }, [selectedBuildingId, updateUserVerified, reloadBuilding, userVerified]);
 
-  const categoryMapDefinitions = useMemo(
-    () => categoryMapsConfig[displayCategory],
-    [displayCategory]
-  );
-  const availableMapStyles = useMemo(
-    () => categoryMapDefinitions.map((x) => x.mapStyle),
-    [categoryMapDefinitions]
-  );
-  const [mapColourScale, setMapColourScale] =
-    useStateWithOptions<BuildingMapTileset>(undefined, availableMapStyles);
 
-  return (
-    <>
-      <PrivateRoute path="/:mode(edit|multi-edit)" />{" "}
-      {/* empty private route to ensure auth for editing */}
-      <Sidebar>
-        <Switch>
-          <Route exact path="/">
-            <Welcome />
-          </Route>
-          <Route exact path="/multi-edit/:cat">
-            <MultiEdit category={displayCategory} />
-          </Route>
-          <Route path="/:mode/:cat">
-            <Categories
-              mode={mode || "view"}
-              building_id={selectedBuildingId}
+    const categoryMapDefinitions = useMemo(() => categoryMapsConfig[displayCategory], [displayCategory]);
+    const availableMapStyles = useMemo(() => categoryMapDefinitions.map(x => x.mapStyle), [categoryMapDefinitions]);
+    const [mapColourScale, setMapColourScale] = useStateWithOptions<BuildingMapTileset>(undefined, availableMapStyles);
+
+    return (
+        <>
+            <PrivateRoute path="/:mode(edit|multi-edit)" /> {/* empty private route to ensure auth for editing */}
+            <Sidebar>
+                <Switch>
+                    <Route exact path="/">
+                        <Welcome />
+                    </Route>
+                    <Route exact path="/multi-edit/:cat">
+                        <MultiEdit category={displayCategory} />
+                    </Route>
+                    <Route path="/:mode/:cat">
+                        <Categories mode={mode || 'view'} building_id={selectedBuildingId} />
+                        <Switch>
+                            <Route exact path="/:mode/:cat/:building/history">
+                                <EditHistory building={building} />
+                            </Route>
+                            <Route exact path="/:mode/:cat/:building?">
+                                <BuildingView
+                                    mode={viewEditMode}
+                                    cat={displayCategory}
+                                    building={building}
+                                    user_verified={userVerified ?? {}}
+                                    onBuildingUpdate={handleBuildingUpdate}
+                                    onUserVerifiedUpdate={handleUserVerifiedUpdate}
+                                    mapColourScale={mapColourScale}
+                                    onMapColourScale={setMapColourScale}
+                                />
+                            </Route>
+                        </Switch>
+                    </Route>
+                    <Route exact path="/:mode(view|edit|multi-edit)"
+                        render={props => (<Redirect to={`/${props.match.params.mode}/categories`} />)}
+                    />
+                </Switch>
+            </Sidebar>
+            <ColouringMap
+                selectedBuildingId={selectedBuildingId}
+                mode={mode || 'basic'}
+                revisionId={revisionId}
+                onBuildingAction={mode === 'multi-edit' ? colourBuilding : selectBuilding}
+                mapColourScale={mapColourScale}
+                onMapColourScale={setMapColourScale}
+                categoryMapDefinitions={categoryMapDefinitions}
             />
-            <Switch>
-              <Route exact path="/:mode/:cat/:building/history">
-                <EditHistory building={building} />
-              </Route>
-              <Route exact path="/:mode/:cat/:building?">
-                <BuildingView
-                  mode={viewEditMode}
-                  cat={displayCategory}
-                  building={building}
-                  user_verified={userVerified ?? {}}
-                  onBuildingUpdate={handleBuildingUpdate}
-                  onUserVerifiedUpdate={handleUserVerifiedUpdate}
-                  mapColourScale={mapColourScale}
-                  onMapColourScale={setMapColourScale}
-                />
-              </Route>
-            </Switch>
-          </Route>
-          <Route
-            exact
-            path="/:mode(view|edit|multi-edit)"
-            render={(props) => (
-              <Redirect to={`/${props.match.params.mode}/categories`} />
-            )}
-          />
-        </Switch>
-      </Sidebar>
-      <div
-        style={{
-          width: "100%",
-          height: "100%",
-          position: "relative",
-          float: "right",
-          overflow: "hidden",
-        }}
-      >
-        <ColouringMap
-          selectedBuildingId={selectedBuildingId}
-          mode={mode || "basic"}
-          revisionId={revisionId}
-          onBuildingAction={
-            mode === "multi-edit" ? colourBuilding : selectBuilding
-          }
-          mapColourScale={mapColourScale}
-          onMapColourScale={setMapColourScale}
-          categoryMapDefinitions={categoryMapDefinitions}
-        />
-      </div>
-    </>
-  );
+        </>
+    );
 };
diff --git a/app/src/frontend/map/layers/city-base-map-layer.tsx b/app/src/frontend/map/layers/city-base-map-layer.tsx
index 8d822499..253ff0e1 100644
--- a/app/src/frontend/map/layers/city-base-map-layer.tsx
+++ b/app/src/frontend/map/layers/city-base-map-layer.tsx
@@ -1,23 +1,17 @@
-import React, { useEffect } from "react";
-import mapboxgl from "mapbox-gl";
+import React, { useEffect } from 'react';
+import mapboxgl from 'mapbox-gl';
 
 // Set your Mapbox access token
-mapboxgl.accessToken =
-  "pk.eyJ1IjoiYWxpLWFkbGkiLCJhIjoiY2xuM2JtYjV1MGE5djJrb2d5OGp1ZWNyNiJ9.gENyP4xX6ElLAeZFlE0aDg";
+mapboxgl.accessToken = 'pk.eyJ1IjoiYWxpLWFkbGkiLCJhIjoiY2xuM2JtYjV1MGE5djJrb2d5OGp1ZWNyNiJ9.gENyP4xX6ElLAeZFlE0aDg';
 
-/*
-  Component to display a Mapbox map.
+/**
+ * Component to display a Mapbox map.
  */
-
 export function CityMap() {
-  const remote_css = fetch(
-    "https://api.tiles.mapbox.com/mapbox-gl-js/v0.53.0/mapbox-gl.css"
-  );
-
   useEffect(() => {
     const map = new mapboxgl.Map({
-      container: "map", // container ID
-      style: "mapbox://styles/mapbox/streets-v12", // style URL
+      container: 'map', // container ID
+      style: 'mapbox://styles/mapbox/streets-v12', // style URL
       center: [-73.5801403, 45.4962261], // starting position [lng, lat]
       zoom: 15, // starting zoom
     });
@@ -28,7 +22,10 @@ export function CityMap() {
     return () => map.remove();
   }, []);
 
-  return <div id="map"></div>;
+  return (
+    <div id="map" style={{ width: '100%', height: '100vh' }}></div>
+    
+  );
 }
 
-export default CityMap;
+export default CityMap;
\ No newline at end of file
diff --git a/app/src/frontend/map/map-button.css b/app/src/frontend/map/map-button.css
index 6d82e3d2..277c49a7 100644
--- a/app/src/frontend/map/map-button.css
+++ b/app/src/frontend/map/map-button.css
@@ -73,14 +73,14 @@
 }
 
 .theme-switcher {
-    top: 117px;
+    top: 77px;
 }
 .theme-switcher .btn {
     min-width: 340px;
 }
 
 .data-switcher {
-    top: 157px;
+    top: 117px;
 }
 .data-switcher .btn {
     min-width: 340px;
diff --git a/app/src/frontend/map/map.css b/app/src/frontend/map/map.css
index 98189958..244fa871 100644
--- a/app/src/frontend/map/map.css
+++ b/app/src/frontend/map/map.css
@@ -1,5 +1,5 @@
 .map-container {
-    position: fixed;
+    position: absolute;
     top: 76px; /* sync with header positioning*/
     bottom: 0;
     left: 0;
@@ -11,9 +11,7 @@
         left: 470px;
     }
 }
-.leaflet-container {
-    position: absolute;
-    height: 100%;
+.leaflet-container {height: 100%;
     width: 100%;
 }
 .leaflet-container .leaflet-control-zoom {
@@ -34,3 +32,4 @@
         display: block;
     }
 }
+
diff --git a/app/src/frontend/map/map.tsx b/app/src/frontend/map/map.tsx
index 8f343a5b..095730ec 100644
--- a/app/src/frontend/map/map.tsx
+++ b/app/src/frontend/map/map.tsx
@@ -1,209 +1,210 @@
 import React, {
-  FC,
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-  useRef,
-} from "react";
-import {
-  AttributionControl,
-  MapContainer,
-  ZoomControl,
-  useMapEvent,
-  Pane,
-  useMap,
-} from "react-leaflet";
-
-// import 'leaflet/dist/leaflet.css';
-import "./map.css";
-
-import { apiGet } from "../apiHelpers";
-import {
-  initialMapViewport,
-  mapBackgroundColor,
-  MapTheme,
-  LayerEnablementState,
-} from "../config/map-config";
-
-import mapboxgl from "mapbox-gl";
-
-import { Building } from "../models/building";
-
-import { CityMap } from "./layers/city-base-map-layer";
-import { CityBoundaryLayer } from "./layers/city-boundary-layer";
-import { BoroughBoundaryLayer } from "./layers/borough-boundary-layer";
-import { BoroughLabelLayer } from "./layers/borough-label-layer";
-import { ParcelBoundaryLayer } from "./layers/parcel-boundary-layer";
-import { HistoricDataLayer } from "./layers/historic-data-layer";
-import { HistoricMapLayer } from "./layers/historic-map-layer";
-import { FloodBoundaryLayer } from "./layers/flood-boundary-layer";
-import { ConservationAreaBoundaryLayer } from "./layers/conservation-boundary-layer";
-import { VistaBoundaryLayer } from "./layers/vista-boundary-layer";
-import { HousingBoundaryLayer } from "./layers/housing-boundary-layer";
-import { CreativeBoundaryLayer } from "./layers/creative-boundary-layer";
-import { BuildingBaseLayer } from "./layers/building-base-layer";
-import { BuildingDataLayer } from "./layers/building-data-layer";
-import { BuildingNumbersLayer } from "./layers/building-numbers-layer";
-import { BuildingHighlightLayer } from "./layers/building-highlight-layer";
-
-import { Legend } from "./legend";
-import SearchBox from "./search-box";
-import ThemeSwitcher from "./theme-switcher";
-import DataLayerSwitcher from "./data-switcher";
-import { BoroughSwitcher } from "./borough-switcher";
-import { ParcelSwitcher } from "./parcel-switcher";
-import { FloodSwitcher } from "./flood-switcher";
-import { ConservationAreaSwitcher } from "./conservation-switcher";
-import { HistoricDataSwitcher } from "./historic-data-switcher";
-import { HistoricMapSwitcher } from "./historic-map-switcher";
-import { VistaSwitcher } from "./vista-switcher";
-import { CreativeSwitcher } from "./creative-switcher";
-import { HousingSwitcher } from "./housing-switcher";
-import { BuildingMapTileset } from "../config/tileserver-config";
-import { useDisplayPreferences } from "../displayPreferences-context";
-import { CategoryMapDefinition } from "../config/category-maps-config";
-
-mapboxgl.accessToken =
-  "pk.eyJ1IjoiYWxpLWFkbGkiLCJhIjoiY2xuM2JtYjV1MGE5djJrb2d5OGp1ZWNyNiJ9.gENyP4xX6ElLAeZFlE0aDg";
-
-interface ColouringMapProps {
-  selectedBuildingId: number;
-  mode: "basic" | "view" | "edit" | "multi-edit";
-  revisionId: string;
-  onBuildingAction: (building: Building) => void;
-  mapColourScale: BuildingMapTileset;
-  onMapColourScale: (x: BuildingMapTileset) => void;
-  categoryMapDefinitions: CategoryMapDefinition[];
-}
-
-export const ColouringMap: FC<ColouringMapProps> = ({
-  mode,
-  revisionId,
-  onBuildingAction,
-  selectedBuildingId,
-  mapColourScale,
-  onMapColourScale,
-  categoryMapDefinitions,
-  children,
-}) => {
-  const { darkLightTheme, darkLightThemeSwitch, showLayerSelection } =
-    useDisplayPreferences();
-  const [position, setPosition] = useState(initialMapViewport.position);
-  const [zoom, setZoom] = useState(initialMapViewport.zoom);
-
-  const handleLocate = useCallback((lat: number, lng: number, zoom: number) => {
-    setPosition([lat, lng]);
-    setZoom(zoom);
-  }, []);
-
-  const handleClick = useCallback(
-    async (e) => {
-      const { lat, lng } = e.latlng;
-      const data = await apiGet(`/api/buildings/locate?lat=${lat}&lng=${lng}`);
-      const building = data?.[0];
-      onBuildingAction(building);
-    },
-    [onBuildingAction]
-  );
-
-  const mapContainer = useRef(null);
-  const map = useRef(null);
-  const [lng, setLng] = useState(-73.5801403);
-  const [lat, setLat] = useState(45.4962261);
-
-  useEffect(() => {
-    if (map.current) return; // initialize map only once
-    map.current = new mapboxgl.Map({
-      container: mapContainer.current,
-      style: "mapbox://styles/mapbox/streets-v12",
-      center: [lng, lat],
-      zoom: zoom,
+    FC,
+    useCallback,
+    useEffect,
+    useMemo,
+    useState,
+    useRef,
+  } from "react";
+  import {
+    AttributionControl,
+    MapContainer,
+    ZoomControl,
+    useMapEvent,
+    Pane,
+    useMap,
+  } from "react-leaflet";
+  
+  import 'leaflet/dist/leaflet.css';
+  import "./map.css";
+  
+  import { apiGet } from "../apiHelpers";
+  import {
+    initialMapViewport,
+    mapBackgroundColor,
+    MapTheme,
+    LayerEnablementState,
+  } from "../config/map-config";
+  
+  import mapboxgl from "mapbox-gl";
+  
+  import { Building } from "../models/building";
+  
+  import { CityMap } from "./layers/city-base-map-layer";
+  import { CityBoundaryLayer } from "./layers/city-boundary-layer";
+  import { BoroughBoundaryLayer } from "./layers/borough-boundary-layer";
+  import { BoroughLabelLayer } from "./layers/borough-label-layer";
+  import { ParcelBoundaryLayer } from "./layers/parcel-boundary-layer";
+  import { HistoricDataLayer } from "./layers/historic-data-layer";
+  import { HistoricMapLayer } from "./layers/historic-map-layer";
+  import { FloodBoundaryLayer } from "./layers/flood-boundary-layer";
+  import { ConservationAreaBoundaryLayer } from "./layers/conservation-boundary-layer";
+  import { VistaBoundaryLayer } from "./layers/vista-boundary-layer";
+  import { HousingBoundaryLayer } from "./layers/housing-boundary-layer";
+  import { CreativeBoundaryLayer } from "./layers/creative-boundary-layer";
+  import { BuildingBaseLayer } from "./layers/building-base-layer";
+  import { BuildingDataLayer } from "./layers/building-data-layer";
+  import { BuildingNumbersLayer } from "./layers/building-numbers-layer";
+  import { BuildingHighlightLayer } from "./layers/building-highlight-layer";
+  
+  import { Legend } from "./legend";
+  import SearchBox from "./search-box";
+  import ThemeSwitcher from "./theme-switcher";
+  import DataLayerSwitcher from "./data-switcher";
+  import { BoroughSwitcher } from "./borough-switcher";
+  import { ParcelSwitcher } from "./parcel-switcher";
+  import { FloodSwitcher } from "./flood-switcher";
+  import { ConservationAreaSwitcher } from "./conservation-switcher";
+  import { HistoricDataSwitcher } from "./historic-data-switcher";
+  import { HistoricMapSwitcher } from "./historic-map-switcher";
+  import { VistaSwitcher } from "./vista-switcher";
+  import { CreativeSwitcher } from "./creative-switcher";
+  import { HousingSwitcher } from "./housing-switcher";
+  import { BuildingMapTileset } from "../config/tileserver-config";
+  import { useDisplayPreferences } from "../displayPreferences-context";
+  import { CategoryMapDefinition } from "../config/category-maps-config";
+  
+  mapboxgl.accessToken =
+    "pk.eyJ1IjoiYWxpLWFkbGkiLCJhIjoiY2xuM2JtYjV1MGE5djJrb2d5OGp1ZWNyNiJ9.gENyP4xX6ElLAeZFlE0aDg";
+  
+  interface ColouringMapProps {
+    selectedBuildingId: number;
+    mode: "basic" | "view" | "edit" | "multi-edit";
+    revisionId: string;
+    onBuildingAction: (building: Building) => void;
+    mapColourScale: BuildingMapTileset;
+    onMapColourScale: (x: BuildingMapTileset) => void;
+    categoryMapDefinitions: CategoryMapDefinition[];
+  }
+  
+  export const ColouringMap: FC<ColouringMapProps> = ({
+    mode,
+    revisionId,
+    onBuildingAction,
+    selectedBuildingId,
+    mapColourScale,
+    onMapColourScale,
+    categoryMapDefinitions,
+    children,
+  }) => {
+    const { darkLightTheme, darkLightThemeSwitch, showLayerSelection } =
+      useDisplayPreferences();
+    const [position, setPosition] = useState(initialMapViewport.position);
+    const [zoom, setZoom] = useState(initialMapViewport.zoom);
+  
+    const handleLocate = useCallback((lat: number, lng: number, zoom: number) => {
+      setPosition([lat, lng]);
+      setZoom(zoom);
+    }, []);
+  
+    const handleClick = useCallback(
+      async (e) => {
+        const { lat, lng } = e.latlng;
+        const data = await apiGet(`/api/buildings/locate?lat=${lat}&lng=${lng}`);
+        const building = data?.[0];
+        onBuildingAction(building);
+      },
+      [onBuildingAction]
+    );
+  
+    const mapContainer = useRef(null);
+    const map = useRef(null);
+    const [lng, setLng] = useState(-73.5801403);
+    const [lat, setLat] = useState(45.4962261);
+  
+    useEffect(() => {
+      if (map.current) return; // initialize map only once
+      map.current = new mapboxgl.Map({
+        container: mapContainer.current,
+        style: "mapbox://styles/mapbox/streets-v12",
+        center: [lng, lat],
+        zoom: zoom,
+      });
+  
+      map.current.addControl(new mapboxgl.NavigationControl());
+  
+      map.current.on("move", () => {
+        setLng(map.current.getCenter().lng.toFixed(4));
+        setLat(map.current.getCenter().lat.toFixed(4));
+        setZoom(map.current.getZoom().toFixed(2));
+      });
     });
-
-    map.current.addControl(new mapboxgl.NavigationControl());
-
-    map.current.on("move", () => {
-      setLng(map.current.getCenter().lng.toFixed(4));
-      setLat(map.current.getCenter().lat.toFixed(4));
-      setZoom(map.current.getZoom().toFixed(2));
+  
+    return (
+      <div
+        ref={mapContainer}
+        className="map-container"
+        style={{
+         position: "absolute",
+          top: "0",
+          bottom: "0",
+          left: "0",
+          right: "0",
+        }}
+      >
+        {mode !== "basic" && (
+          <>
+            <Legend
+              mapColourScaleDefinitions={categoryMapDefinitions}
+              mapColourScale={mapColourScale}
+              onMapColourScale={onMapColourScale}
+            />
+            <ThemeSwitcher
+              onSubmit={darkLightThemeSwitch}
+              currentTheme={darkLightTheme}
+            />
+            <DataLayerSwitcher />
+            {showLayerSelection == "enabled" ? (
+              <>
+                <BoroughSwitcher />
+                <ParcelSwitcher />
+                <FloodSwitcher />
+                <ConservationAreaSwitcher />
+                <HistoricMapSwitcher />
+                <HistoricDataSwitcher />
+                <VistaSwitcher />
+                <HousingSwitcher />
+                <CreativeSwitcher />
+              </>
+            ) : (
+              <></>
+            )}
+            {/* TODO change remaining ones*/}
+            <SearchBox onLocate={handleLocate} />
+          </>
+        )}
+      </div>
+    );
+  };
+  
+  function ClickHandler({ onClick }: { onClick: (e) => void }) {
+    useMapEvent("click", (e) => onClick(e));
+  
+    return null;
+  }
+  
+  function MapBackgroundColor({ theme }: { theme: MapTheme }) {
+    const map = useMap();
+    useEffect(() => {
+      map.getContainer().style.backgroundColor = mapBackgroundColor[theme];
     });
-  });
-
-  return (
-    <div
-      ref={mapContainer}
-      className="map-container"
-      /*style={{
-        position: "absolute",
-        top: "0",
-        bottom: "0",
-        left: "0",
-        right: "0",
-      }}*/
-    >
-      {mode !== "basic" && (
-        <>
-          <Legend
-            mapColourScaleDefinitions={categoryMapDefinitions}
-            mapColourScale={mapColourScale}
-            onMapColourScale={onMapColourScale}
-          />
-          <ThemeSwitcher
-            onSubmit={darkLightThemeSwitch}
-            currentTheme={darkLightTheme}
-          />
-          <DataLayerSwitcher />
-          {showLayerSelection == "enabled" ? (
-            <>
-              <BoroughSwitcher />
-              <ParcelSwitcher />
-              <FloodSwitcher />
-              <ConservationAreaSwitcher />
-              <HistoricMapSwitcher />
-              <HistoricDataSwitcher />
-              <VistaSwitcher />
-              <HousingSwitcher />
-              <CreativeSwitcher />
-            </>
-          ) : (
-            <></>
-          )}
-          {/* TODO change remaining ones*/}
-          <SearchBox onLocate={handleLocate} />
-        </>
-      )}
-    </div>
-  );
-};
-
-function ClickHandler({ onClick }: { onClick: (e) => void }) {
-  useMapEvent("click", (e) => onClick(e));
-
-  return null;
-}
-
-function MapBackgroundColor({ theme }: { theme: MapTheme }) {
-  const map = useMap();
-  useEffect(() => {
-    map.getContainer().style.backgroundColor = mapBackgroundColor[theme];
-  });
-
-  return null;
-}
-
-function MapViewport({
-  position,
-  zoom,
-}: {
-  position: [number, number];
-  zoom: number;
-}) {
-  const map = useMap();
-
-  useEffect(() => {
-    map.setView(position, zoom);
-  }, [position, zoom]);
-
-  return null;
-}
+  
+    return null;
+  }
+  
+  function MapViewport({
+    position,
+    zoom,
+  }: {
+    position: [number, number];
+    zoom: number;
+  }) {
+    const map = useMap();
+  
+    useEffect(() => {
+      map.setView(position, zoom);
+    }, [position, zoom]);
+  
+    return null;
+  }
+  
\ No newline at end of file
diff --git a/app/src/frontendRoute.tsx b/app/src/frontendRoute.tsx
index a316a818..eeed875d 100644
--- a/app/src/frontendRoute.tsx
+++ b/app/src/frontendRoute.tsx
@@ -93,6 +93,7 @@ function renderHTML(context, data, req, res) {
             `<!doctype html>
     <html lang="">
     <head>
+
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta charset="utf-8" />
 
@@ -127,6 +128,8 @@ function renderHTML(context, data, req, res) {
             font-style: normal;
           }
         </style>
+        <link href="https://api.mapbox.com/mapbox-gl-js/v2.14.1/mapbox-gl.css" rel="stylesheet">
+        <script src="https://api.mapbox.com/mapbox-gl-js/v2.14.1/mapbox-gl.js"></script>
         ${
             assets.client.css
                 ? `<link rel="stylesheet" href="${assets.client.css}">`