diff --git a/spaces/components/DocumentDisplay.vue b/spaces/components/DocumentDisplay.vue
index 4dec12b..6fff9f2 100644
--- a/spaces/components/DocumentDisplay.vue
+++ b/spaces/components/DocumentDisplay.vue
@@ -52,13 +52,14 @@ const createVendorInvoice = async () => {
       .from("incominginvoices")
       .insert([{
         document: documentData.id,
+        tenant: dataStore.currentTenant
       }])
       .select()
   if(vendorInvoiceError) {
     console.log(vendorInvoiceError)
   } else if(vendorInvoiceData) {
 
-    const {data:documentData,error:documentError} = await supabase
+    const {data:documentUpdateData,error:documentError} = await supabase
         .from("documents")
         .update({
           vendorInvoice: vendorInvoiceData[0].id
diff --git a/spaces/pages/contacts/index.vue b/spaces/pages/contacts/index.vue
index 8640183..0209ff2 100644
--- a/spaces/pages/contacts/index.vue
+++ b/spaces/pages/contacts/index.vue
@@ -6,16 +6,40 @@
         v-model="searchString"
         placeholder="Suche..."
     />
+
+    <USelectMenu
+        v-model="selectedColumns"
+        multiple
+        :options="columnTemplate"
+        :uiMenu="{width:'w-40'}"
+        :popper="{placement: 'bottom-start'}"
+        by="key"
+    >
+      <UButton
+          color="gray"
+          variant="ghost"
+          class="flex-1 justify-between"
+          icon="i-heroicons-view-columns"
+      />
+
+      <template #option="{ option }">
+        {{option.label}}
+      </template>
+    </USelectMenu>
   </Toolbar>
 
 
   <div class="table">
     <UTable
         :rows="filteredRows"
-        :columns="itemColumns"
+        :columns="selectedColumns"
         @select="selectItem"
         :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Noch keine Einträge' }"
     >
+      <template #active-data="{row}">
+        <span v-if="row.active" class="text-primary-500">Aktiv</span>
+        <span v-else class="text-rose">Gesperrt</span>
+      </template>
       <template #customer-data="{row}">
         {{dataStore.customers.find(customer => customer.id === row.customer) ? dataStore.customers.find(customer => customer.id === row.customer).name : ''}}
       </template>
@@ -37,7 +61,7 @@ const dataStore = useDataStore()
 const router = useRouter()
 const mode = ref("show")
 
-const itemColumns = [
+const columnTemplate = ref([
 
   {
     key: "fullName",
@@ -57,8 +81,45 @@ const itemColumns = [
   {
     key: "role",
     label: "Rolle",
+  },
+  {
+    key: "email",
+    label: "E-Mail",
+  },
+  {
+    key: "phoneMobile",
+    label: "Mobil",
+  },
+  {
+    key: "phoneHome",
+    label: "Festnetz",
+  },
+  {
+    key: "active",
+    label: "Aktiv",
+  },
+  {
+    key: "birtday",
+    label: "Geburtstag",
   }
-]
+])
+const selectedColumns = ref([
+  {
+    key: "fullName",
+    label: "Name",
+    sortable: true
+  },
+  {
+    key: "customer",
+    label: "Kunde",
+    sortable: true
+  },
+  {
+    key: "vendor",
+    label: "Lieferant",
+    sortable: true
+  },
+])
 
 
 const selectItem = (item) => {
diff --git a/spaces/pages/customers/index.vue b/spaces/pages/customers/index.vue
index 9576cd8..47406bf 100644
--- a/spaces/pages/customers/index.vue
+++ b/spaces/pages/customers/index.vue
@@ -7,16 +7,44 @@
         v-model="searchString"
         placeholder="Suche..."
     />
+
+    <USelectMenu
+        v-model="selectedColumns"
+        multiple
+        :options="columnTemplate"
+        :uiMenu="{width:'w-40'}"
+        :popper="{placement: 'bottom-start'}"
+        by="key"
+    >
+      <UButton
+          color="gray"
+          variant="ghost"
+          class="flex-1 justify-between"
+          icon="i-heroicons-view-columns"
+      />
+
+      <template #option="{ option }">
+        {{option.label}}
+      </template>
+    </USelectMenu>
   </Toolbar>
 
   <div class="table">
     <UTable
         :rows="filteredRows"
-        :columns="customerColumns"
-        @select="selectCustomer"
+        :columns="selectedColumns"
+        @select="selectItem"
 
         :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Noch keine Einträge' }"
-    />
+    >
+      <template #active-data="{row}">
+        <span v-if="row.active" class="text-primary-500">Aktiv</span>
+        <span v-else class="text-rose">Gesperrt</span>
+      </template>
+      <template #address-data="{row}">
+        {{row.infoData.street}}, {{row.infoData.special ? `${row.infoData.special},` : ''}} {{row.infoData.zip}} {{row.infoData.city}}, {{row.infoData.country}}
+      </template>
+    </UTable>
   </div>
 </template>
 
@@ -30,7 +58,7 @@ const dataStore = useDataStore()
 const router = useRouter()
 const mode = ref("show")
 
-const customerColumns = [
+const columnTemplate = ref([
   {
     key: 'customerNumber',
     label: "Kundennr.",
@@ -40,11 +68,39 @@ const customerColumns = [
     key: "name",
     label: "Name",
     sortable: true
+  },
+  {
+    key: "notes",
+    label: "Notizen",
+    sortable: true
+  },
+  {
+    key: "active",
+    label: "Aktiv",
+    sortable: true
+  },
+  {
+    key: "address",
+    label: "Adresse",
+    sortable: true
   }
-]
+])
+const selectedColumns = ref([
+  {
+    key: 'customerNumber',
+    label: "Kundennr.",
+    sortable: true
+  },
+  {
+    key: "name",
+    label: "Name",
+    sortable: true
+  },
+])
 
 
-const selectCustomer = (customer) => {
+
+const selectItem = (customer) => {
   console.log(customer)
   router.push(`/customers/show/${customer.id} `)
 }
diff --git a/spaces/pages/receipts/index.vue b/spaces/pages/receipts/index.vue
index 7628764..1684a19 100644
--- a/spaces/pages/receipts/index.vue
+++ b/spaces/pages/receipts/index.vue
@@ -2,7 +2,9 @@
   <div id="main">
 
     <InputGroup>
+<!--
       <UButton @click="router.push(`/incominginvoices/create/`)">+ Eingangsrechnung</UButton>
+-->
       <UButton
           @click="router.push(`/createDocument/edit?type=quotes`)"
       >
diff --git a/spaces/pages/vendors/index.vue b/spaces/pages/vendors/index.vue
index 2a51587..dc6dbbb 100644
--- a/spaces/pages/vendors/index.vue
+++ b/spaces/pages/vendors/index.vue
@@ -6,16 +6,40 @@
         v-model="searchString"
         placeholder="Suche..."
     />
+
+    <USelectMenu
+        v-model="selectedColumns"
+        multiple
+        :options="columnTemplate"
+        :uiMenu="{width:'w-40'}"
+        :popper="{placement: 'bottom-start'}"
+        by="key"
+    >
+      <UButton
+          color="gray"
+          variant="ghost"
+          class="flex-1 justify-between"
+          icon="i-heroicons-view-columns"
+      />
+
+      <template #option="{ option }">
+        {{option.label}}
+      </template>
+    </USelectMenu>
   </Toolbar>
 
 
   <div class="table">
     <UTable
         :rows="filteredRows"
-        :columns="itemColumns"
+        :columns="selectedColumns"
         @select="selectItem"
         :empty-state="{ icon: 'i-heroicons-circle-stack-20-solid', label: 'Noch keine Einträge' }"
-    />
+    >
+      <template #address-data="{row}">
+        {{row.infoData.street ? `${row.infoData.street}, ` : ''}}{{row.infoData.special ? `${row.infoData.special},` : ''}} {{(row.infoData.zip || row.infoData.city) ? `${row.infoData.zip} ${row.infoData.city}, ` : ''}} {{row.infoData.country}}
+      </template>
+    </UTable>
   </div>
 
 </template>
@@ -30,7 +54,24 @@ const dataStore = useDataStore()
 const router = useRouter()
 const mode = ref("show")
 
-const itemColumns = [
+const columnTemplate = ref([
+  {
+    key: 'vendorNumber',
+    label: "Lieferantennr.",
+    sortable: true
+  },
+  {
+    key: "name",
+    label: "Name",
+    sortable: true
+  },
+  {
+    key: "address",
+    label: "Adresse",
+    sortable: true
+  }
+])
+const selectedColumns = ref([
   {
     key: 'vendorNumber',
     label: "Lieferantennr.",
@@ -41,7 +82,7 @@ const itemColumns = [
     label: "Name",
     sortable: true
   }
-]
+])
 
 
 const selectItem = (item) => {