diff --git a/src/components/logic/DetailControls.svelte b/src/components/logic/DetailControls.svelte
index ffa828e..7f824f2 100644
--- a/src/components/logic/DetailControls.svelte
+++ b/src/components/logic/DetailControls.svelte
@@ -2,7 +2,7 @@
   import { appLanguageStore, popSystemID, systemidStore, viewerPanelStateStore } from "../../lib/stores";
 
   import { Button, ButtonGroup, Tooltip } from "flowbite-svelte";
-  import { BackwardStepOutline, ImageOutline, MapPinAltOutline, RectangleListOutline } from "flowbite-svelte-icons";
+  import { BackwardStepOutline, ImageOutline, RectangleListOutline } from "flowbite-svelte-icons";
 
   export let data;
 
@@ -62,10 +62,4 @@
   <Tooltip triggeredBy="#assets-nav" placement="bottom" class="z-10">
     {l10n.assettext[$appLanguageStore]}
   </Tooltip>
-  <Button id="map-nav" on:click={() => { viewerPanelStateStore.set("map"); }}>
-    <MapPinAltOutline class="inline-block w-6 h-6"/>
-  </Button>
-  <Tooltip triggeredBy="#map-nav" placement="bottom" class="z-10">
-    {l10n.maptext[$appLanguageStore]}
-  </Tooltip>
 </ButtonGroup>
\ No newline at end of file
diff --git a/src/components/logic/ViewerPanel.svelte b/src/components/logic/ViewerPanel.svelte
index 2904030..c673100 100644
--- a/src/components/logic/ViewerPanel.svelte
+++ b/src/components/logic/ViewerPanel.svelte
@@ -7,6 +7,7 @@
 
   import AssetViewer from "./AssetViewer.svelte";
   import HierarchyViewer from "./HierarchyViewer.svelte";
+  import NotImplemented from "../utils/NotImplemented.svelte";
 
   import "./hierarchy.css";
 </script>
@@ -17,6 +18,6 @@
   <div class="hierarchy-viewer">
     <HierarchyViewer openids={data._path.map(entry => entry[table]._id)} table={table} root={data._path[0]}/>
   </div>
-{:else if $viewerPanelStateStore === "map"}
-  My Map
+{:else}
+  <NotImplemented message="The viewer panel {$viewerPanelStateStore} is unknown."/>
 {/if}
\ No newline at end of file