diff --git a/src/Components/Map/Layer.tsx b/src/Components/Map/Layer.tsx
index bac78c72..ed37e342 100644
--- a/src/Components/Map/Layer.tsx
+++ b/src/Components/Map/Layer.tsx
@@ -6,7 +6,7 @@ import { ItemViewPopup } from './Subcomponents/ItemViewPopup'
 import { useItems, useResetItems, useSetItemsApi, useSetItemsData } from './hooks/useItems'
 import { useEffect, useState } from 'react'
 import { ItemFormPopupProps, ItemFormPopup } from './Subcomponents/ItemFormPopup'
-import { useAddFilterTag, useFilterTags, useSearchPhrase } from './hooks/useFilter'
+import { useFilterTags, useSearchPhrase } from './hooks/useFilter'
 
 
 export const Layer = (props: LayerProps) => {
@@ -14,11 +14,6 @@ export const Layer = (props: LayerProps) => {
     const [itemFormPopup, setItemFormPopup] = useState<ItemFormPopupProps | null>(null);
 
     const filterTags = useFilterTags();
-    const setFilterTag = useAddFilterTag();
-
-
-    // setFilterTag({id: "healing", color: "#000"})
-
 
     const items = useItems();
     const setItemsApi = useSetItemsApi();
diff --git a/src/Components/Map/Subcomponents/AddButton.tsx b/src/Components/Map/Subcomponents/AddButton.tsx
index fadcd8be..979a15ff 100644
--- a/src/Components/Map/Subcomponents/AddButton.tsx
+++ b/src/Components/Map/Subcomponents/AddButton.tsx
@@ -3,7 +3,7 @@ import DynamicHeroIcon from '../../../Utils/DynamicHeroIcon'
 import { useLayers } from '../hooks/useLayers'
 
 
-export default function AddButton({ setSelectMode }: { setSelectMode: React.Dispatch<React.SetStateAction<any>> }) {
+export default function AddButton({ setSelectNewItemPosition }: { setSelectNewItemPosition: React.Dispatch<React.SetStateAction<any>> }) {
 
     const layers = useLayers();
 
@@ -14,16 +14,16 @@ export default function AddButton({ setSelectMode }: { setSelectMode: React.Disp
                     <path strokeLinecap="round" strokeLinejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
                 </svg>
             </label>
-            <ul tabIndex={0} className="tw-dropdown-content tw-pr-1 tw-mb-1 tw-list-none">
+            <ul tabIndex={0} className="tw-dropdown-content tw-pr-1 tw-list-none">
                 {layers.map((layer) => (
                     layer.api?.createItem && (
                         <li key={layer.name} >
                             <a>
                                 <div className="tw-tooltip tw-tooltip-left" data-tip={layer.menuText}>
                                     <button tabIndex={0}
-                                        className="tw-z-500  tw-border-0 tw-pl-2 tw-p-0 tw-mb-2 tw-mt-2 tw-w-10 tw-h-10 tw-cursor-pointer tw-rounded-full tw-mouse tw-drop-shadow-md tw-transition tw-ease-in tw-duration-200 focus:tw-outline-none"
+                                        className="tw-z-500  tw-border-0 tw-pl-2 tw-p-0 tw-mb-3 tw-w-10 tw-h-10 tw-cursor-pointer tw-rounded-full tw-mouse tw-drop-shadow-md tw-transition tw-ease-in tw-duration-200 focus:tw-outline-none"
                                         style={{ backgroundColor: layer.menuColor }}
-                                        onClick={() => { setSelectMode(layer) }}>
+                                        onClick={() => { setSelectNewItemPosition(layer) }}>
                                         <DynamicHeroIcon icon={layer.menuIcon} />
                                     </button>
                                 </div>
diff --git a/src/Components/Map/Subcomponents/FilterControl.tsx b/src/Components/Map/Subcomponents/FilterControl.tsx
index d1beeef9..8c8f64dd 100644
--- a/src/Components/Map/Subcomponents/FilterControl.tsx
+++ b/src/Components/Map/Subcomponents/FilterControl.tsx
@@ -1,7 +1,5 @@
 import * as React from 'react'
 import { useFilterTags, useRemoveFilterTag, useSetSearchPhrase } from '../hooks/useFilter'
-import { useMapEvents } from 'react-leaflet';
-import { useState } from 'react';
 import useWindowDimensions from '../hooks/useWindowDimension';
 
 
diff --git a/src/Components/Map/UtopiaMap.tsx b/src/Components/Map/UtopiaMap.tsx
index 3fbf7773..83c8f7c4 100644
--- a/src/Components/Map/UtopiaMap.tsx
+++ b/src/Components/Map/UtopiaMap.tsx
@@ -16,8 +16,8 @@ import { FilterControl } from "./Subcomponents/FilterControl";
 
 
 export interface MapEventListenerProps {
-    selectMode: LayerProps | null,
-    setSelectMode: React.Dispatch<any>,
+    selectNewItemPosition: LayerProps | null,
+    setSelectNewItemPosition: React.Dispatch<any>,
     setItemFormPopup: React.Dispatch<React.SetStateAction<any>>
 }
 
@@ -26,9 +26,9 @@ function MapEventListener(props: MapEventListenerProps) {
         click: (e) => {
 
             console.log(e.latlng.lat + ',' + e.latlng.lng);
-            if (props.selectMode != null) {
-                props.setItemFormPopup({ layer: props.selectMode, position: e.latlng })
-                props.setSelectMode(null)
+            if (props.selectNewItemPosition != null) {
+                props.setItemFormPopup({ layer: props.selectNewItemPosition, position: e.latlng })
+                props.setSelectNewItemPosition(null)
             }
         },
         resize: () => {
@@ -49,7 +49,7 @@ function UtopiaMap({
     children }
     : UtopiaMapProps) {
 
-    const [selectMode, setSelectMode] = useState<LayerProps | null>(null);
+    const [selectNewItemPosition, setSelectNewItemPosition] = useState<LayerProps | null>(null);
     const [itemFormPopup, setItemFormPopup] = useState<ItemFormPopupProps | null>(null);
 
 
@@ -59,7 +59,7 @@ function UtopiaMap({
             <TagsProvider initialTags={[]}>
                 <FilterProvider initialTags={[]}>
                     <ItemsProvider initialItems={[]}>
-                        <div className={(selectMode != null ? "crosshair-cursor-enabled" : undefined)}>
+                        <div className={(selectNewItemPosition != null ? "crosshair-cursor-enabled" : undefined)}>
                             <MapContainer ref={mapDivRef} style={{ height: height, width: width }} center={center} zoom={zoom} zoomControl={false}>
                                 <FilterControl></FilterControl>
                                 <TileLayer
@@ -73,14 +73,14 @@ function UtopiaMap({
                                         )
                                     }
                                 </MarkerClusterGroup>
-                                <MapEventListener setSelectMode={setSelectMode} selectMode={selectMode} setItemFormPopup={setItemFormPopup} />
+                                <MapEventListener setSelectNewItemPosition={setSelectNewItemPosition} selectNewItemPosition={selectNewItemPosition} setItemFormPopup={setItemFormPopup} />
                             </MapContainer>
-                            <AddButton setSelectMode={setSelectMode}></AddButton>
-                            {selectMode != null &&
+                            <AddButton setSelectNewItemPosition={setSelectNewItemPosition}></AddButton>
+                            {selectNewItemPosition != null &&
                                 <div className="tw-button tw-z-500 tw-absolute tw-right-5 tw-top-4 tw-drop-shadow-md">
                                     <div className="tw-alert tw-bg-base-100 tw-text-base-content">
                                         <div>
-                                            <span>Select {selectMode.name} position!</span>
+                                            <span>Select {selectNewItemPosition.name} position!</span>
                                         </div>
                                     </div>
                                 </div>