diff --git a/src/Components/Map/Subcomponents/AddButton.tsx b/src/Components/Map/Subcomponents/AddButton.tsx
index daad12c9..f57e690b 100644
--- a/src/Components/Map/Subcomponents/AddButton.tsx
+++ b/src/Components/Map/Subcomponents/AddButton.tsx
@@ -11,43 +11,43 @@ export default function AddButton({ triggerAction }: { triggerAction: React.Disp
     const canAddItems = () => {
         let canAdd = false;
         layers.map(layer => {
-            if(layer.api?.createItem && hasUserPermission(layer.api.collectionName!,"create")) canAdd = true;
+            if (layer.api?.createItem && hasUserPermission(layer.api.collectionName!, "create")) canAdd = true;
         })
         return canAdd;
     }
 
 
     return (
-       <>{
-        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" />
-                </svg>
-            </label>
-            <ul tabIndex={0} className="tw-dropdown-content tw-pr-1 tw-list-none">
-                {layers.map((layer) => (
-                    layer.api?.createItem && hasUserPermission(layer.api.collectionName!,"create") && (
-                        <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-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={() => { triggerAction(layer) }}>
-                                        <layer.menuIcon className="tw-h-6 tw-w-6 tw-text-white" ></layer.menuIcon>
-                                    </button>
-                                </div>
-                            </a>
-                        </li>
-                    )
+        <>{
+            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" />
+                        </svg>
+                    </label>
+                    <ul tabIndex={0} className="tw-dropdown-content tw-pr-1 tw-list-none">
+                        {layers.map((layer) => (
+                            layer.api?.createItem && hasUserPermission(layer.api.collectionName!, "create") && (
+                                <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-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={() => { triggerAction(layer) }}>
+                                                <layer.menuIcon className="tw-h-6 tw-w-6 tw-text-white" ></layer.menuIcon>
+                                            </button>
+                                        </div>
+                                    </a>
+                                </li>
+                            )
 
-                ))}
-            </ul>
-        </div> : ""
-        } 
-        </> 
+                        ))}
+                    </ul>
+                </div> : ""
+        }
+        </>
 
     )
 }
diff --git a/src/Components/Profile/OverlayItemProfile.tsx b/src/Components/Profile/OverlayItemProfile.tsx
index 1744246a..7fec5c1d 100644
--- a/src/Components/Profile/OverlayItemProfile.tsx
+++ b/src/Components/Profile/OverlayItemProfile.tsx
@@ -13,7 +13,7 @@ import { useAddTag, useTags } from '../Map/hooks/useTags';
 import { useAddFilterTag, useResetFilterTags } from '../Map/hooks/useFilter';
 import { HeaderView } from '../Map/Subcomponents/ItemPopupComponents/HeaderView';
 import { useHasUserPermission } from '../Map/hooks/usePermissions';
-import PlusButton from './PlusButton';
+import {PlusButton} from './PlusButton';
 import { TextAreaInput, TextInput } from '../Input';
 import { hashTagRegex } from '../../Utils/HashTagRegex';
 import { randomColor } from '../../Utils/RandomColor';
@@ -56,11 +56,15 @@ export function OverlayItemProfile() {
 
     const hasUserPermission = useHasUserPermission();
 
-    const tabRef = useRef<HTMLDivElement>(null);
+    const tabRef = useRef<HTMLFormElement>(null);
 
     function scroll() {
-        tabRef.current?.scrollTo(0, 800);
+        tabRef.current?.scrollIntoView();
     }
+    
+    useEffect(() => {
+      scroll();
+    }, [addItemPopupType])
 
     useEffect(() => {
 
@@ -170,7 +174,7 @@ export function OverlayItemProfile() {
                             </div>
 
                             <input type="radio" name="my_tabs_2" role="tab" className="tw-tab [--tab-border-color:var(--fallback-bc,oklch(var(--bc)/0.2))]" aria-label="Projects" checked={activeTab == 2 && true} onChange={() => setActiveTab(2)} />
-                            <div ref={tabRef} role="tabpanel" className="tw-tab-content tw-bg-base-100  tw-rounded-box tw-h-[calc(100dvh-268px)] tw-overflow-y-auto tw-pt-4 tw-pb-1 -tw-mx-4" >
+                            <div role="tabpanel" className="tw-tab-content tw-bg-base-100  tw-rounded-box tw-h-[calc(100dvh-268px)] tw-overflow-y-auto tw-pt-4 tw-pb-1 -tw-mx-4" >
                                 <div className='tw-h-full'>
                                     <div className='tw-grid tw-grid-cols-1 sm:tw-grid-cols-2 md:tw-grid-cols-1 lg:tw-grid-cols-1 xl:tw-grid-cols-2'>
                                         {relations && relations.map(i => {
@@ -187,7 +191,7 @@ export function OverlayItemProfile() {
                                             else return null
                                         })}
                                         {addItemPopupType == "project" ?
-                                            <form autoComplete='off' onSubmit={e => submitNewItem(e, addItemPopupType)} >
+                                            <form ref={tabRef} autoComplete='off' onSubmit={e => submitNewItem(e, addItemPopupType)} >
 
                                                 <div className='tw-cursor-pointer tw-card tw-border-[1px] tw-border-base-300 tw-card-body tw-shadow-xl tw-bg-base-100 tw-text-base-content tw-mx-4 tw-p-6 tw-mb-4'>
                                                 <label className="tw-btn tw-btn-sm tw-rounded-2xl tw-btn-circle tw-btn-ghost hover:tw-bg-transparent tw-absolute tw-right-0 tw-top-0 tw-text-gray-600" onClick={() => {
diff --git a/src/Components/Profile/OverlayItemProfileSettings.tsx b/src/Components/Profile/OverlayItemProfileSettings.tsx
index a51fdb86..2606554f 100644
--- a/src/Components/Profile/OverlayItemProfileSettings.tsx
+++ b/src/Components/Profile/OverlayItemProfileSettings.tsx
@@ -65,8 +65,6 @@ export function OverlayItemProfileSettings() {
 
     const onUpdateItem = async () => {
         let changedItem = {} as Item;
-
-        console.log(item.position);
         
 
 
diff --git a/src/Components/Profile/PlusButton.tsx b/src/Components/Profile/PlusButton.tsx
index fd44b1ab..13dd4108 100644
--- a/src/Components/Profile/PlusButton.tsx
+++ b/src/Components/Profile/PlusButton.tsx
@@ -1,14 +1,13 @@
-import { useLayers } from "../Map/hooks/useLayers";
 import { useHasUserPermission } from "../Map/hooks/usePermissions";
 
-export default function PlusButton({ triggerAction, color }: { triggerAction: any, color: string }) {
+export function PlusButton({ triggerAction, color, collection="items" }: { triggerAction: any, color: string, collection?:string }) {
 
     const hasUserPermission = useHasUserPermission();
 
 
 
     return (
-        <>{hasUserPermission("items", "create") &&
+        <>{hasUserPermission(collection, "create") &&
                 <div className="tw-dropdown tw-dropdown-top tw-dropdown-end tw-dropdown-hover tw-z-500 tw-absolute tw-right-4 tw-bottom-4" >
                     <button tabIndex={0} className="tw-z-500 tw-btn tw-btn-circle tw-shadow" onClick={() => { triggerAction() }} style={{ backgroundColor: color, color: "#fff"}}>
                         <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">
diff --git a/src/Components/Profile/index.tsx b/src/Components/Profile/index.tsx
index 2a60779c..bbc41f89 100644
--- a/src/Components/Profile/index.tsx
+++ b/src/Components/Profile/index.tsx
@@ -4,4 +4,5 @@ export {OverlayProfile} from './OverlayProfile'
 export {OverlayProfileSettings} from './OverlayProfileSettings'
 export {OverlayUserSettings} from './OverlayUserSettings'
 export {OverlayItemProfile} from './OverlayItemProfile'
-export {OverlayItemProfileSettings} from './OverlayItemProfileSettings'
\ No newline at end of file
+export {OverlayItemProfileSettings} from './OverlayItemProfileSettings'
+export {PlusButton} from "./PlusButton"
\ No newline at end of file
diff --git a/src/Components/Templates/ItemsIndexPage.tsx b/src/Components/Templates/ItemsIndexPage.tsx
index 15676e87..04fe727b 100644
--- a/src/Components/Templates/ItemsIndexPage.tsx
+++ b/src/Components/Templates/ItemsIndexPage.tsx
@@ -1,8 +1,19 @@
-import { useEffect, useState } from 'react'
-import { Link } from 'react-router-dom';
-import { ItemsApi } from '../../types';
+import { ReactNode, useEffect, useRef, useState } from 'react'
+import { Link, useNavigate } from 'react-router-dom';
+import { Item, ItemsApi } from '../../types';
 import { getValue } from '../../Utils/GetValue';
-import { TitleCard } from './TitleCard';
+import { TextView } from '../Map';
+import { useAssetApi } from '../AppShell/hooks/useAssets';
+import { PlusButton } from '../Profile';
+import { TextInput, TextAreaInput } from '../Input';
+import { useAddTag, useTags } from '../Map/hooks/useTags';
+import { useAddItem } from '../Map/hooks/useItems';
+import { useResetFilterTags } from '../Map/hooks/useFilter';
+import { toast } from 'react-toastify';
+import { hashTagRegex } from '../../Utils/HashTagRegex';
+import { randomColor } from '../../Utils/RandomColor';
+import { useAuth } from '../Auth';
+import { useLayers } from '../Map/hooks/useLayers';
 
 
 type breadcrumb = {
@@ -13,26 +24,86 @@ type breadcrumb = {
 
 export const ItemsIndexPage = ({ api, url, parameterField, breadcrumbs, itemNameField, itemTextField, itemImageField, itemSymbolField }: { api: ItemsApi<any>, url: string, parameterField: string, breadcrumbs: Array<breadcrumb>, itemNameField: string, itemTextField: string, itemImageField: string, itemSymbolField: string }) => {
 
+  console.log(itemSymbolField);
 
-  const [items, setItems] = useState<any[]>();
+  const [loading, setLoading] = useState<boolean>(false);
+  const [addItemPopupType, setAddItemPopupType] = useState<string>("");
+
+  const tabRef = useRef<HTMLFormElement>(null);
+
+  function scroll() {
+      tabRef.current?.scrollIntoView();
+  }
+
+  useEffect(() => {
+    scroll();
+  }, [addItemPopupType])
+
+  const [items, setItems] = useState<any[]>([]);
 
   const loadProjects = async () => {
     const items = await api?.getItems();
     setItems(items as any);
   }
 
+  const assetsApi = useAssetApi();
+  const navigate = useNavigate();
+
+  const tags = useTags();
+  const addTag = useAddTag();
+  const addItem = useAddItem();
+  const resetFilterTags = useResetFilterTags();
+  const { user } = useAuth();
+
 
   useEffect(() => {
     loadProjects();
   }, [api])
 
+  const layers = useLayers();
+
+
+
+  const submitNewItem = async (evt: any, type: string) => {
+    evt.preventDefault();
+    const formItem: Item = {} as Item;
+    Array.from(evt.target).forEach((input: HTMLInputElement) => {
+        if (input.name) {
+            formItem[input.name] = input.value;
+        }
+    });
+    setLoading(true);
+    formItem.text && formItem.text.toLocaleLowerCase().match(hashTagRegex)?.map(tag => {
+        if (!tags.find((t) => t.name.toLocaleLowerCase() === tag.slice(1).toLocaleLowerCase())) {
+            addTag({ id: crypto.randomUUID(), name: tag.slice(1), color: randomColor() })
+        }
+    });
+    const uuid = crypto.randomUUID();
+    let success = false;
+    try {
+        await api?.createItem!({ ...formItem, id: uuid, type: type });
+        success = true;
+    } catch (error) {
+        toast.error(error.toString());
+    }
+    if (success) {
+        addItem({ ...formItem, id: uuid, type: type, layer: layers.find(l => l.name == addItemPopupType), user_created: user });
+        toast.success("New item created");
+        resetFilterTags();
+    }
+    setLoading(false);
+    setAddItemPopupType("");
+    setItems(current => [...current,{ ...formItem, id: uuid, type: type, layer: layers.find(l => l.name == addItemPopupType), user_created: user } ])
+}
+
+
   return (
     <main className="tw-flex-1 tw-overflow-y-auto tw-pt-2 tw-px-6  tw-bg-base-200 tw-min-w-80 tw-flex tw-justify-center" >
       <div className=' tw-w-full xl:tw-max-w-6xl'>
         {breadcrumbs &&
           <div className="tw-text-sm tw-breadcrumbs">
             <ul>
-              {breadcrumbs.map((b,i) => <li key={i}><Link to={b.path} >{b.name}</Link></li>)}
+              {breadcrumbs.map((b, i) => <li key={i}><Link to={b.path} >{b.name}</Link></li>)}
             </ul>
           </div>}
         {/**
@@ -46,42 +117,63 @@ export const ItemsIndexPage = ({ api, url, parameterField, breadcrumbs, itemName
 
 
 
-        <div className="tw-grid tw-grid-cols-1 md:tw-grid-cols-2 lg:tw-grid-cols-3 tw-gap-6 ">
+        <div className="tw-grid tw-grid-cols-1 md:tw-grid-cols-2 lg:tw-grid-cols-3 tw-gap-6 tw-pt-8">
           {
             items?.map((i, k) => {
               return (
                 <Link key={k} to={url + getValue(i, parameterField)}>
-                  <TitleCard className={"!tw-h-96 "} title={getValue(i, itemNameField)} topMargin={"tw-mt-2"}>
-                    {getValue(i,itemImageField) ?
-                      <div className=' tw-h-36 flex items-center justify-center '>
-                      <img className='tw-h-24' src={`https://api.utopia-lab.org/assets/${getValue(i, itemImageField)}`}></img> 
-                      </div> :
-                      <div className="tw-h-36 !bg-transparent tw-flex tw-items-center tw-justify-center tw-text-7xl">
-                        {getValue(i,itemSymbolField)}
+
+
+                  <div key={i.id} className='tw-cursor-pointer tw-card tw-border-[1px] tw-border-base-300 tw-card-body tw-shadow-xl tw-bg-base-100 tw-text-base-content tw-p-4 tw-mb-4 tw-h-fit' onClick={() => navigate('/item/' + i.id)}>
+
+                    <div className='tw-grid tw-grid-cols-6 tw-pb-2'>
+                      <div className='tw-col-span-5'>
+                        <div className="tw-flex tw-flex-row">{
+                          getValue(i, itemImageField) ?
+                            <div className="tw-w-10 tw-min-w-[2.5em] tw-rounded-full">
+                              <img className="tw-rounded-full" src={`${assetsApi.url}${getValue(i, itemImageField)}?width=80&height=80`} />
+                            </div>
+                            :
+                            ""
+                        }
+                          <b className={`tw-text-xl tw-font-bold ${getValue(i, itemImageField) ? "tw-ml-2 tw-mt-1" : ""}`}>{getValue(i, itemNameField)}</b>
+
+                        </div>
                       </div>
-                    }
-                    <p className='tw-font-bold tw-text-sm tw-mt-2'>{i.subname}</p>
+                      <div className='tw-col-span-1'>
 
-
-                    <p className='tw-text-sm tw-mt-2 tw-mb-2'>{getValue(i, itemTextField)}</p>
-                    {/**
- *                  <div className='flex justify-between text-gray-500 '>
-                    <div className='flex'><UsersIcon className=' h-6 w-6' />&nbsp;2</div>
-                    <div className='flex'><MapPinIcon className='h-6 w-6' />&nbsp;5</div>
-                    <div className='flex'><CalendarIcon className='h-6 w-6' />&nbsp;9</div>
+                      </div>
+                    </div>
+                    <div className='tw-overflow-y-auto tw-overflow-x-hidden tw-max-h-64 fade'>
+                      <TextView truncate item={i} itemTextField={itemTextField} />
+                    </div>
                   </div>
- 
- */}
 
-
-                  </TitleCard>
                 </Link>
               )
 
             })
           }
+          {addItemPopupType == "project" ?
+
+            <form  ref={tabRef} autoComplete='off' onSubmit={e => submitNewItem(e, addItemPopupType)}  >
+
+              <div className='tw-cursor-pointer tw-card tw-border-[1px] tw-border-base-300 tw-card-body tw-shadow-xl tw-bg-base-100 tw-text-base-content tw-p-6 tw-mb-10'>
+                <label className="tw-btn tw-btn-sm tw-rounded-2xl tw-btn-circle tw-btn-ghost hover:tw-bg-transparent tw-absolute tw-right-0 tw-top-0 tw-text-gray-600" onClick={() => {
+                  setAddItemPopupType("")
+                }}>
+                  <p className='tw-text-center '>✕</p></label>
+                <TextInput type="text" placeholder="Name" dataField="name" defaultValue={""} inputStyle='' />
+                <TextAreaInput placeholder="Text" dataField="text" defaultValue={""} inputStyle='tw-h-40 tw-mt-5' />
+                <div className='tw-flex tw-justify-center'>
+                  <button className={loading ? 'tw-btn tw-btn-disabled tw-mt-5 tw-place-self-center' : 'tw-btn tw-mt-5 tw-place-self-center'} type='submit'>{loading ? <span className="tw-loading tw-loading-spinner"></span> : 'Save'}</button>
+                </div>
+              </div>
+            </form> : <></>
+          }
         </div>
       </div>
+      <PlusButton triggerAction={() => {setAddItemPopupType("project"); scroll();}} color={'#777'} />
     </main>
 
 
diff --git a/src/index.tsx b/src/index.tsx
index f1feb529..1b47895c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,7 +1,7 @@
 export { UtopiaMap, Layer, Tags, Permissions, ItemForm, ItemView, PopupTextAreaInput, PopupStartEndInput, PopupTextInput, PopupButton, TextView, StartEndView } from './Components/Map';
 export {AppShell, Content, SideBar} from "./Components/AppShell"
 export {AuthProvider, useAuth, LoginPage, SignupPage, RequestPasswordPage, SetNewPasswordPage} from "./Components/Auth"
-export {UserSettings, ProfileSettings, OverlayProfile, OverlayProfileSettings, OverlayUserSettings, OverlayItemProfile, OverlayItemProfileSettings} from './Components/Profile'
+export {UserSettings, ProfileSettings, OverlayProfile, OverlayProfileSettings, OverlayUserSettings, OverlayItemProfile, OverlayItemProfileSettings, PlusButton} from './Components/Profile'
 export {Quests, Modal} from './Components/Gaming'
 export {TitleCard, CardPage, MapOverlayPage, CircleLayout, MoonCalendar, ItemsIndexPage, ItemViewPage} from './Components/Templates'
 export {TextInput, TextAreaInput, SelectBox} from './Components/Input'