diff --git a/src/Components/Map/Subcomponents/AddButton.tsx b/src/Components/Map/Subcomponents/AddButton.tsx
index 3484458f..ee0437f5 100644
--- a/src/Components/Map/Subcomponents/AddButton.tsx
+++ b/src/Components/Map/Subcomponents/AddButton.tsx
@@ -9,9 +9,19 @@ export default function AddButton({ setSelectNewItemPosition }: { setSelectNewIt
     const layers = useLayers();
     const hasUserPermission = useHasUserPermission();
 
+    const canAddItems = () => {
+        let canAdd = false;
+        layers.map(layer => {
+            if(layer.api?.createItem && hasUserPermission(layer.api.collectionName!,"create")) canAdd = true;
+        })
+        return canAdd;
+    }
+
 
     return (
-        <div className="tw-dropdown tw-dropdown-top tw-dropdown-end tw-dropdown-hover tw-z-500 tw-absolute tw-right-4 tw-bottom-4" >
+       <>{
+        canAddItems() ? 
+                    <div className="tw-dropdown tw-dropdown-top tw-dropdown-end tw-dropdown-hover tw-z-500 tw-absolute tw-right-4 tw-bottom-4" >
             <label tabIndex={0} className="tw-z-500 tw-btn tw-btn-circle tw-shadow tw-bg-base-100">
                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" className="tw-w-5 tw-h-5">
                     <path strokeLinecap="round" strokeLinejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
@@ -36,7 +46,9 @@ export default function AddButton({ setSelectNewItemPosition }: { setSelectNewIt
 
                 ))}
             </ul>
+        </div> : ""
+        } 
+        </> 
 
-        </div>
     )
 }
diff --git a/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx b/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
index 3a77908a..15f9b955 100644
--- a/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
+++ b/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
@@ -22,7 +22,6 @@ export function HeaderView({ item, title, avatar, setItemFormPopup }: {
   const map = useMap();
   const hasUserPermission = useHasUserPermission();
 
-
   const removeItemFromMap = async (event: React.MouseEvent<HTMLElement>) => {
     setLoading(true);
     let success = false;
@@ -49,8 +48,6 @@ export function HeaderView({ item, title, avatar, setItemFormPopup }: {
       setItemFormPopup({ position: new LatLng(item.position.coordinates[1], item.position.coordinates[0]), layer: item.layer!, item: item, setItemFormPopup: setItemFormPopup })
   }
 
-  console.log(title);
-
 
   return (
     <div className='tw-grid tw-grid-cols-6 tw-pb-2'>
@@ -67,7 +64,7 @@ export function HeaderView({ item, title, avatar, setItemFormPopup }: {
         </div>
       </div>
       <div className='tw-col-span-1'>
-        {item.layer?.api &&
+        {(item.layer?.api?.deleteItem || item.layer?.api?.updateItem) && (hasUserPermission(item.layer.api?.collectionName!, "delete") || hasUserPermission(item.layer.api?.collectionName!, "update") ) &&
           <div className="tw-dropdown tw-dropdown-bottom">
             <label tabIndex={0} className="tw-bg-base-100 tw-btn tw-m-1 tw-leading-3 tw-border-none tw-min-h-0 tw-h-6">
               <svg xmlns="http://www.w3.org/2000/svg" className="tw-h-5 tw-w-5" viewBox="0 0 20 20" fill="currentColor">