diff --git a/src/UI/BigComponents/CopyrightPanel.svelte b/src/UI/BigComponents/CopyrightPanel.svelte
index 42c9173f5e..a8f3190db4 100644
--- a/src/UI/BigComponents/CopyrightPanel.svelte
+++ b/src/UI/BigComponents/CopyrightPanel.svelte
@@ -145,20 +145,20 @@
       <Tr t={$bgMapAttribution} />
     </div>
   {/if}
-  <div class="flex items-center gap-x-2">
-    <Marker icons={state.layout.icon} size="h-8 w-8 shrink-0" />
-    <Tr t={maintainer} />
-  </div>
+  {#if maintainer !== undefined}
+    <div class="flex items-center gap-x-2">
+      <Marker icons={state.layout.icon} size="h-8 w-8 shrink-0" />
+      <Tr t={maintainer} />
+    </div>
+  {/if}
 
 
-  <div class="flex items-center gap-x-2">
-    <UserGroupIcon class="w-8 h-8 shrink-0" />
-    {#if $datacontributions !== undefined}
+  {#if $datacontributions !== undefined}
+    <div class="flex items-center gap-x-2">
+      <UserGroupIcon class="w-8 h-8 shrink-0" />
       <Tr t={$datacontributions} />
-    {:else}
-      <Loading />
-    {/if}
-  </div>
+    </div>
+  {/if}
 
   <div class="flex items-center gap-x-2">
 
diff --git a/src/UI/ThemeViewGUI.svelte b/src/UI/ThemeViewGUI.svelte
index 97bbb91cd0..aefe06216d 100644
--- a/src/UI/ThemeViewGUI.svelte
+++ b/src/UI/ThemeViewGUI.svelte
@@ -65,16 +65,14 @@
   import ExtraLinkButton from "./BigComponents/ExtraLinkButton.svelte"
   import CloseAnimation from "./Base/CloseAnimation.svelte"
   import { LastClickFeatureSource } from "../Logic/FeatureSource/Sources/LastClickFeatureSource"
-  import Github from "../assets/svg/Github.svelte"
   import ArrowDownTray from "@babeard/svelte-heroicons/mini/ArrowDownTray"
   import Share from "@babeard/svelte-heroicons/solid/Share"
   import ChevronRight from "@babeard/svelte-heroicons/solid/ChevronRight"
-  import DocumentChartBar from "@babeard/svelte-heroicons/outline/DocumentChartBar"
   import Marker from "./Map/Marker.svelte"
   import AboutMapComplete from "./BigComponents/AboutMapComplete.svelte"
   import HotkeyTable from "./BigComponents/HotkeyTable.svelte"
   import SelectedElementPanel from "./Base/SelectedElementPanel.svelte"
-  import { LayerConfigJson } from "../Models/ThemeConfig/Json/LayerConfigJson"
+  import type { LayerConfigJson } from "../Models/ThemeConfig/Json/LayerConfigJson"
 
   export let state: ThemeViewState
   let layout = state.layout