diff --git a/src/modules/map/components/cesium/CesiumBackgroundLayer.vue b/src/modules/map/components/cesium/CesiumBackgroundLayer.vue
new file mode 100644
index 0000000000..ce169cbecf
--- /dev/null
+++ b/src/modules/map/components/cesium/CesiumBackgroundLayer.vue
@@ -0,0 +1,26 @@
+<script setup>
+import { computed } from 'vue'
+import { useStore } from 'vuex'
+
+import CesiumInternalLayer from '@/modules/map/components/cesium/CesiumInternalLayer.vue'
+
+const store = useStore()
+
+const backgroundLayersFor3D = computed(() => store.getters.backgroundLayersFor3D)
+const projection = computed(() => store.state.position.projection)
+</script>
+
+<template>
+    <!--
+       z-index can be set to zero for all, as only the WMTS
+       background layer is an imagery layer (and requires one), all other BG layer are
+       primitive layer and will ignore this prop
+    -->
+    <CesiumInternalLayer
+        v-for="(bgLayer, index) in backgroundLayersFor3D"
+        :key="bgLayer.id"
+        :layer-config="bgLayer"
+        :projection="projection"
+        :z-index="index"
+    />
+</template>
diff --git a/src/modules/map/components/cesium/CesiumMap.vue b/src/modules/map/components/cesium/CesiumMap.vue
index d59adc1839..1f8e3791f1 100644
--- a/src/modules/map/components/cesium/CesiumMap.vue
+++ b/src/modules/map/components/cesium/CesiumMap.vue
@@ -11,40 +11,8 @@
         @touchcancel="clearLongPressTimer"
         @contextmenu="onContextMenu"
     >
-        <div v-if="viewerCreated">
-            <!--
-               Adding background layer, z-index can be set to zero for all, as only the WMTS
-               background layer is an imagery layer (and requires one), all other BG layer are
-               primitive layer and will ignore this prop
-            -->
-            <CesiumInternalLayer
-                v-for="bgLayer in backgroundLayersFor3D"
-                :key="bgLayer.id"
-                :layer-config="bgLayer"
-                :projection="projection"
-                :z-index="0"
-            />
-            <!--
-               Adding all other layers
-               Layers split between imagery and primitive type for correct zIndex ordering.
-               Only imagery layers require a z-index, we start to count them at 1 because of the
-               background WMTS layer
-            -->
-            <CesiumInternalLayer
-                v-for="(layer, index) in visibleImageryLayers"
-                :key="layer.id"
-                :layer-config="layer"
-                :projection="projection"
-                :z-index="index + startingZIndexForImageryLayers"
-                :is-time-slider-active="isTimeSliderActive"
-            />
-            <CesiumInternalLayer
-                v-for="layer in visiblePrimitiveLayers"
-                :key="layer.id"
-                :layer-config="layer"
-                :projection="projection"
-            />
-        </div>
+        <CesiumBackgroundLayer v-if="viewerCreated" />
+        <CesiumVisibleLayers v-if="viewerCreated" />
         <CesiumPopover
             v-if="viewerCreated && showFeaturesPopover"
             :coordinates="popoverCoordinates"
@@ -102,22 +70,18 @@ import proj4 from 'proj4'
 import { mapActions, mapGetters, mapState } from 'vuex'
 
 import { extractOlFeatureGeodesicCoordinates } from '@/api/features/features.api'
-import ExternalLayer from '@/api/layers/ExternalLayer.class'
-import GeoAdminAggregateLayer from '@/api/layers/GeoAdminAggregateLayer.class'
 import GeoAdminGeoJsonLayer from '@/api/layers/GeoAdminGeoJsonLayer.class'
-import GeoAdminWMSLayer from '@/api/layers/GeoAdminWMSLayer.class'
-import GeoAdminWMTSLayer from '@/api/layers/GeoAdminWMTSLayer.class'
 import GPXLayer from '@/api/layers/GPXLayer.class'
 import KMLLayer from '@/api/layers/KMLLayer.class'
-import LayerTypes from '@/api/layers/LayerTypes.enum'
 import { get3dTilesBaseUrl, getWmsBaseUrl, getWmtsBaseUrl } from '@/config/baseUrl.config'
 import { DEFAULT_PROJECTION } from '@/config/map.config'
 import { IS_TESTING_WITH_CYPRESS } from '@/config/staging.config'
 import FeatureEdit from '@/modules/infobox/components/FeatureEdit.vue'
 import FeatureList from '@/modules/infobox/components/FeatureList.vue'
+import CesiumBackgroundLayer from '@/modules/map/components/cesium/CesiumBackgroundLayer.vue'
 import CesiumGeolocationFeedback from '@/modules/map/components/cesium/CesiumGeolocationFeedback.vue'
-import CesiumInternalLayer from '@/modules/map/components/cesium/CesiumInternalLayer.vue'
 import CesiumPopover from '@/modules/map/components/cesium/CesiumPopover.vue'
+import CesiumVisibleLayers from '@/modules/map/components/cesium/CesiumVisibleLayers.vue'
 import {
     CAMERA_MAX_PITCH,
     CAMERA_MAX_ZOOM_DISTANCE,
@@ -145,12 +109,13 @@ import { wrapDegrees } from '@/utils/numberUtils.js'
 const dispatcher = { dispatcher: 'CesiumMap.vue' }
 export default {
     components: {
+        CesiumVisibleLayers,
+        CesiumBackgroundLayer,
         CesiumGeolocationFeedback,
         FontAwesomeIcon,
         CesiumPopover,
         FeatureEdit,
         FeatureList,
-        CesiumInternalLayer,
     },
     provide() {
         return {
@@ -172,7 +137,6 @@ export default {
             cameraPosition: (state) => state.position.camera,
             uiMode: (state) => state.ui.mode,
             projection: (state) => state.position.projection,
-            isFullScreenMode: (state) => state.ui.fullscreenMode,
             isTimeSliderActive: (state) => state.ui.isTimeSliderActive,
             layersConfig: (state) => state.layers.config,
         }),
@@ -182,7 +146,6 @@ export default {
             'resolution',
             'hasDevSiteWarning',
             'visibleLayers',
-            'backgroundLayersFor3D',
             'showFeatureInfoInTooltip',
         ]),
         isProjectionWebMercator() {
@@ -191,25 +154,6 @@ export default {
         isDesktopMode() {
             return this.uiMode === UIModes.DESKTOP
         },
-        visibleImageryLayers() {
-            return this.visibleLayers
-                .filter(
-                    (l) =>
-                        l instanceof GeoAdminWMTSLayer ||
-                        l instanceof GeoAdminWMSLayer ||
-                        l instanceof GeoAdminAggregateLayer ||
-                        l instanceof ExternalLayer
-                )
-                .map((visibleLayer) => {
-                    if (visibleLayer.idIn3d) {
-                        return (
-                            this.layersConfig.find((layer) => layer.id === visibleLayer.idIn3d) ??
-                            visibleLayer
-                        )
-                    }
-                    return visibleLayer
-                })
-        },
         isFeatureInfoInTooltip() {
             return this.showFeatureInfoInTooltip
         },
@@ -227,11 +171,6 @@ export default {
         editFeature() {
             return this.selectedFeatures.find((feature) => feature.isEditable)
         },
-        startingZIndexForImageryLayers() {
-            return this.backgroundLayersFor3D.find((layer) => layer.type === LayerTypes.WMTS)
-                ? 1
-                : 0
-        },
     },
     watch: {
         selectedFeatures: {
diff --git a/src/modules/map/components/cesium/CesiumVectorLayer.vue b/src/modules/map/components/cesium/CesiumVectorLayer.vue
index 333324506f..b5f9c231be 100644
--- a/src/modules/map/components/cesium/CesiumVectorLayer.vue
+++ b/src/modules/map/components/cesium/CesiumVectorLayer.vue
@@ -1,8 +1,9 @@
 <script setup>
-import { computed, inject, onBeforeUnmount, onMounted, toRefs } from 'vue'
+import { Cesium3DTileset } from 'cesium'
+import { computed, inject, toRefs } from 'vue'
 
 import GeoAdmin3DLayer from '@/api/layers/GeoAdmin3DLayer.class'
-import { loadTileSetAndApplyStyle } from '@/modules/map/components/cesium/utils/primitiveLayerUtils'
+import useAddPrimitiveLayer from '@/modules/map/components/cesium/utils/useAddPrimitiveLayer.composable'
 
 const props = defineProps({
     layerConfig: {
@@ -29,20 +30,8 @@ const url = computed(() => {
     return `${baseUrl.value}${rootFolder}${layerId.value}${timeFolder}/tileset.json`
 })
 
-let layer
-
-onMounted(async () => {
-    layer = getViewer().scene.primitives.add(
-        await loadTileSetAndApplyStyle(url.value, {
-            withEnhancedLabelStyle: layerId.value === 'ch.swisstopo.swissnames3d.3d',
-        })
-    )
-})
-onBeforeUnmount(() => {
-    const viewer = getViewer()
-    layer.show = false
-    viewer.scene.primitives.remove(layer)
-    viewer.scene.requestRender()
+useAddPrimitiveLayer(getViewer(), Cesium3DTileset.fromUrl(url.value), {
+    withEnhancedLabelStyle: layerId.value === 'ch.swisstopo.swissnames3d.3d',
 })
 </script>
 
diff --git a/src/modules/map/components/cesium/CesiumVisibleLayers.vue b/src/modules/map/components/cesium/CesiumVisibleLayers.vue
new file mode 100644
index 0000000000..5542aecdf4
--- /dev/null
+++ b/src/modules/map/components/cesium/CesiumVisibleLayers.vue
@@ -0,0 +1,74 @@
+<script setup>
+import { computed } from 'vue'
+import { useStore } from 'vuex'
+
+import ExternalLayer from '@/api/layers/ExternalLayer.class'
+import GeoAdminAggregateLayer from '@/api/layers/GeoAdminAggregateLayer.class'
+import GeoAdminGeoJsonLayer from '@/api/layers/GeoAdminGeoJsonLayer.class'
+import GeoAdminWMSLayer from '@/api/layers/GeoAdminWMSLayer.class'
+import GeoAdminWMTSLayer from '@/api/layers/GeoAdminWMTSLayer.class'
+import GPXLayer from '@/api/layers/GPXLayer.class'
+import KMLLayer from '@/api/layers/KMLLayer.class'
+import CesiumInternalLayer from '@/modules/map/components/cesium/CesiumInternalLayer.vue'
+
+const store = useStore()
+
+const visibleLayers = computed(() => store.getters.visibleLayers)
+const layersConfig = computed(() => store.state.layers.config)
+const projection = computed(() => store.state.position.projection)
+const backgroundLayersFor3D = computed(() => store.getters.backgroundLayersFor3D)
+
+const visibleImageryLayers = computed(() =>
+    visibleLayers.value.filter(isImageryLayer).map((imageryLayer) => {
+        if (imageryLayer.idIn3d) {
+            return (
+                layersConfig.value.find((layer) => layer.id === imageryLayer.idIn3d) ?? imageryLayer
+            )
+        }
+        return imageryLayer
+    })
+)
+const visiblePrimitiveLayers = computed(() => visibleLayers.value.filter(isPrimitiveLayer))
+
+const startingZIndexForImageryLayers = computed(
+    () => backgroundLayersFor3D.value.filter(isImageryLayer).length
+)
+
+function isImageryLayer(layer) {
+    return (
+        layer instanceof GeoAdminWMTSLayer ||
+        layer instanceof GeoAdminWMSLayer ||
+        layer instanceof GeoAdminAggregateLayer ||
+        layer instanceof ExternalLayer
+    )
+}
+
+function isPrimitiveLayer(layer) {
+    return (
+        layer instanceof GeoAdminGeoJsonLayer ||
+        layer instanceof KMLLayer ||
+        layer instanceof GPXLayer
+    )
+}
+</script>
+
+<template>
+    <!--
+   Layers split between imagery and primitive type for correct zIndex ordering.
+   Only imagery layers require a z-index, we start to count them at 1 or 0 depending on the
+   background WMTS layer
+-->
+    <CesiumInternalLayer
+        v-for="(layer, index) in visibleImageryLayers"
+        :key="layer.id"
+        :layer-config="layer"
+        :projection="projection"
+        :z-index="index + startingZIndexForImageryLayers"
+    />
+    <CesiumInternalLayer
+        v-for="layer in visiblePrimitiveLayers"
+        :key="layer.id"
+        :layer-config="layer"
+        :projection="projection"
+    />
+</template>
diff --git a/src/modules/map/components/cesium/utils/enhanceLabelStyle.js b/src/modules/map/components/cesium/utils/enhanceLabelStyle.js
new file mode 100644
index 0000000000..3535ed1620
--- /dev/null
+++ b/src/modules/map/components/cesium/utils/enhanceLabelStyle.js
@@ -0,0 +1,83 @@
+import { Cesium3DTileStyle } from 'cesium'
+
+/**
+ * Style to apply to our labels in 3D. It is a complete rip-off of
+ * https://github.com/geoadmin/mf-geoadmin3/blob/6a7b99a2cc9980eec27b394ee709305a239549f1/src/components/StylesService.js#L159-L233
+ *
+ * @type {Cesium3DTileStyle}
+ */
+export default new Cesium3DTileStyle({
+    show: true,
+    labelStyle: 2,
+    labelText: '${DISPLAY_TEXT}',
+    disableDepthTestDistance: Number.POSITIVE_INFINITY,
+    anchorLineEnabled: true,
+    anchorLineColor: "color('white')",
+    heightOffset: {
+        conditions: [
+            ['${LOD} === "7"', 20],
+            ['${LOD} === "6"', 40],
+            ['${LOD} === "5"', 60],
+            ['${LOD} === "4"', 80],
+            ['${LOD} === "3"', 100],
+            ['${LOD} === "2"', 120],
+            ['${LOD} === "1"', 150],
+            ['${LOD} === "0"', 200],
+            ['true', '200'],
+        ],
+    },
+    labelColor: {
+        conditions: [
+            ['${OBJEKTART} === "See"', 'color("blue")'],
+            ['true', 'color("black")'],
+        ],
+    },
+    labelOutlineColor: 'color("white", 1)',
+    labelOutlineWidth: 5,
+    font: {
+        conditions: [
+            ['${OBJEKTART} === "See"', '"bold 32px arial"'],
+            ['${OBJEKTART} === "Alpiner Gipfel"', '"italic 32px arial"'],
+            ['true', '" 32px arial"'],
+        ],
+    },
+    scaleByDistance: {
+        conditions: [
+            ['${LOD} === "7"', 'vec4(1000, 1, 5000, 0.4)'],
+            ['${LOD} === "6"', 'vec4(1000, 1, 5000, 0.4)'],
+            ['${LOD} === "5"', 'vec4(1000, 1, 8000, 0.4)'],
+            ['${LOD} === "4"', 'vec4(1000, 1, 10000, 0.4)'],
+            ['${LOD} === "3"', 'vec4(1000, 1, 20000, 0.4)'],
+            ['${LOD} === "2"', 'vec4(1000, 1, 30000, 0.4)'],
+            ['${LOD} === "1"', 'vec4(1000, 1, 50000, 0.4)'],
+            ['${LOD} === "0"', 'vec4(1000, 1, 500000, 0.4)'],
+            ['true', 'vec4(1000, 1, 10000, 0.4)'],
+        ],
+    },
+    translucencyByDistance: {
+        conditions: [
+            ['${LOD} === "7"', 'vec4(5000, 1, 5001, 1)'],
+            ['${LOD} === "6"', 'vec4(5000, 1, 5001, 1)'],
+            ['${LOD} === "5"', 'vec4(5000, 1, 8000, 0.4)'],
+            ['${LOD} === "4"', 'vec4(5000, 1, 10000, 0.4)'],
+            ['${LOD} === "3"', 'vec4(5000, 1, 20000, 0.4)'],
+            ['${LOD} === "2"', 'vec4(5000, 1, 30000, 0.4)'],
+            ['${LOD} === "1"', 'vec4(5000, 1, 50000, 0.4)'],
+            ['${LOD} === "0"', 'vec4(5000, 1, 500000, 1)'],
+            ['true', 'vec4(5000, 1, 10000, 0.5)'],
+        ],
+    },
+    distanceDisplayCondition: {
+        conditions: [
+            ['${LOD} === "7"', 'vec2(0, 5000)'],
+            ['${LOD} === "6"', 'vec2(0, 5000)'],
+            ['${LOD} === "5"', 'vec2(0, 8000)'],
+            ['${LOD} === "4"', 'vec2(0, 10000)'],
+            ['${LOD} === "3"', 'vec2(0, 20000)'],
+            ['${LOD} === "2"', 'vec2(0, 30000)'],
+            ['${LOD} === "1"', 'vec2(0, 50000)'],
+            ['${LOD} === "0"', 'vec2(0, 500000)'],
+            ['${OBJEKTART} === "Alpiner Gipfel"', 'vec2(0, 100000)'],
+        ],
+    },
+})
diff --git a/src/modules/map/components/cesium/utils/primitiveLayerUtils.js b/src/modules/map/components/cesium/utils/primitiveLayerUtils.js
index 1d18d12f26..396cfa7581 100644
--- a/src/modules/map/components/cesium/utils/primitiveLayerUtils.js
+++ b/src/modules/map/components/cesium/utils/primitiveLayerUtils.js
@@ -3,8 +3,6 @@ import {
     BillboardCollection,
     Cartesian2,
     Cartesian3,
-    Cesium3DTileset,
-    Cesium3DTileStyle,
     Color,
     GroundPolylinePrimitive,
     HeightReference,
@@ -17,90 +15,6 @@ import {
     VerticalOrigin,
 } from 'cesium'
 
-import log from '@/utils/logging'
-
-/**
- * Style to apply to our labels in 3D. It is a complete rip-off of
- * https://github.com/geoadmin/mf-geoadmin3/blob/6a7b99a2cc9980eec27b394ee709305a239549f1/src/components/StylesService.js#L159-L233
- *
- * @type {module:cesium.Cesium3DTileStyle}
- */
-const cesiumEnchancedLabelStzle = new Cesium3DTileStyle({
-    show: true,
-    labelStyle: 2,
-    labelText: '${DISPLAY_TEXT}',
-    disableDepthTestDistance: 5000,
-    anchorLineEnabled: true,
-    anchorLineColor: "color('white')",
-    heightOffset: {
-        conditions: [
-            ['${LOD} === "7"', 20],
-            ['${LOD} === "6"', 40],
-            ['${LOD} === "5"', 60],
-            ['${LOD} === "4"', 80],
-            ['${LOD} === "3"', 100],
-            ['${LOD} === "2"', 120],
-            ['${LOD} === "1"', 150],
-            ['${LOD} === "0"', 200],
-            ['true', '200'],
-        ],
-    },
-    labelColor: {
-        conditions: [
-            ['${OBJEKTART} === "See"', 'color("blue")'],
-            ['true', 'color("black")'],
-        ],
-    },
-    labelOutlineColor: 'color("white", 1)',
-    labelOutlineWidth: 5,
-    font: {
-        conditions: [
-            ['${OBJEKTART} === "See"', '"bold 32px arial"'],
-            ['${OBJEKTART} === "Alpiner Gipfel"', '"italic 32px arial"'],
-            ['true', '" 32px arial"'],
-        ],
-    },
-    scaleByDistance: {
-        conditions: [
-            ['${LOD} === "7"', 'vec4(1000, 1, 5000, 0.4)'],
-            ['${LOD} === "6"', 'vec4(1000, 1, 5000, 0.4)'],
-            ['${LOD} === "5"', 'vec4(1000, 1, 8000, 0.4)'],
-            ['${LOD} === "4"', 'vec4(1000, 1, 10000, 0.4)'],
-            ['${LOD} === "3"', 'vec4(1000, 1, 20000, 0.4)'],
-            ['${LOD} === "2"', 'vec4(1000, 1, 30000, 0.4)'],
-            ['${LOD} === "1"', 'vec4(1000, 1, 50000, 0.4)'],
-            ['${LOD} === "0"', 'vec4(1000, 1, 500000, 0.4)'],
-            ['true', 'vec4(1000, 1, 10000, 0.4)'],
-        ],
-    },
-    translucencyByDistance: {
-        conditions: [
-            ['${LOD} === "7"', 'vec4(5000, 1, 5001, 1)'],
-            ['${LOD} === "6"', 'vec4(5000, 1, 5001, 1)'],
-            ['${LOD} === "5"', 'vec4(5000, 1, 8000, 0.4)'],
-            ['${LOD} === "4"', 'vec4(5000, 1, 10000, 0.4)'],
-            ['${LOD} === "3"', 'vec4(5000, 1, 20000, 0.4)'],
-            ['${LOD} === "2"', 'vec4(5000, 1, 30000, 0.4)'],
-            ['${LOD} === "1"', 'vec4(5000, 1, 50000, 0.4)'],
-            ['${LOD} === "0"', 'vec4(5000, 1, 500000, 1)'],
-            ['true', 'vec4(5000, 1, 10000, 0.5)'],
-        ],
-    },
-    distanceDisplayCondition: {
-        conditions: [
-            ['${LOD} === "7"', 'vec2(0, 5000)'],
-            ['${LOD} === "6"', 'vec2(0, 5000)'],
-            ['${LOD} === "5"', 'vec2(0, 8000)'],
-            ['${LOD} === "4"', 'vec2(0, 10000)'],
-            ['${LOD} === "3"', 'vec2(0, 20000)'],
-            ['${LOD} === "2"', 'vec2(0, 30000)'],
-            ['${LOD} === "1"', 'vec2(0, 50000)'],
-            ['${LOD} === "0"', 'vec2(0, 500000)'],
-            ['${OBJEKTART} === "Alpiner Gipfel"', 'vec2(0, 100000)'],
-        ],
-    },
-})
-
 /**
  * This function goes throw the primitive collection and update passed properties
  *
@@ -167,16 +81,3 @@ export function updateCollectionProperties(collection, properties) {
         }
     }
 }
-
-export async function loadTileSetAndApplyStyle(tileSetJsonURL, options) {
-    try {
-        const { withEnhancedLabelStyle = false } = options
-        const tileset = await Cesium3DTileset.fromUrl(tileSetJsonURL)
-        if (withEnhancedLabelStyle) {
-            tileset.style = cesiumEnchancedLabelStzle
-        }
-        return tileset
-    } catch (error) {
-        log.error('Error while loading tileset for', tileSetJsonURL, error)
-    }
-}
diff --git a/src/modules/map/components/cesium/utils/useAddPrimitiveLayer.composable.js b/src/modules/map/components/cesium/utils/useAddPrimitiveLayer.composable.js
new file mode 100644
index 0000000000..8682a41f04
--- /dev/null
+++ b/src/modules/map/components/cesium/utils/useAddPrimitiveLayer.composable.js
@@ -0,0 +1,34 @@
+import { onBeforeUnmount, onMounted } from 'vue'
+
+import enhanceLabelStyle from '@/modules/map/components/cesium/utils/enhanceLabelStyle'
+import log from '@/utils/logging'
+
+/**
+ * @param {Viewer} cesiumViewer
+ * @param {Promise<Cesium3DTileset> | Cesium3DTileset} tileSet
+ */
+export default function useAddPrimitiveLayer(cesiumViewer, tileSet, options = {}) {
+    let layer
+
+    const { withEnhancedLabelStyle = false } = options
+
+    onMounted(async () => {
+        try {
+            const loadedTileSet = await tileSet
+            if (withEnhancedLabelStyle) {
+                loadedTileSet.style = enhanceLabelStyle
+            }
+            layer = cesiumViewer.scene.primitives.add(loadedTileSet)
+        } catch (error) {
+            log.error('Error while loading tileset for', tileSet, error)
+        }
+    })
+
+    onBeforeUnmount(() => {
+        if (layer) {
+            layer.show = false
+            cesiumViewer.scene.primitives.remove(layer)
+            cesiumViewer.scene.requestRender()
+        }
+    })
+}