diff --git a/resources/js/api/marketplace.ts b/resources/js/api/marketplace.ts
index 0f8ec0a..e9e1203 100644
--- a/resources/js/api/marketplace.ts
+++ b/resources/js/api/marketplace.ts
@@ -58,7 +58,6 @@ export class MarketplaceApi {
         const data = {
             query: mutations.CreateListing,
             variables: {
-                account: createListingData.account,
                 makeAssetId: createListingData.makeAssetId,
                 takeAssetId: createListingData.takeAssetId,
                 amount: createListingData.amount,
@@ -121,4 +120,15 @@ export class MarketplaceApi {
 
         return MarketplaceApi.sendPlatfromRequest(data);
     }
+
+    static async getCurrentBlock() {
+        const data = {
+            query: queries.GetBlocks,
+            variables: {
+                first: 1,
+            },
+        }
+
+        return MarketplaceApi.sendPlatfromRequest(data);
+    }
 }
diff --git a/resources/js/api/queries.ts b/resources/js/api/queries.ts
index 00f56b5..bb56010 100644
--- a/resources/js/api/queries.ts
+++ b/resources/js/api/queries.ts
@@ -23,6 +23,7 @@ import GetAccounts from '~/graphql/query/fueltank/GetAccounts';
 import GetListings from '~/graphql/query/marketplace/GetListings';
 import GetBids from '~/graphql/query/marketplace/GetBids';
 import GetSales from '~/graphql/query/marketplace/GetSales';
+import GetBlocks from '~/graphql/query/marketplace/GetBlocks';
 
 export default {
     GetTransaction,
@@ -50,4 +51,5 @@ export default {
     GetListings,
     GetBids,
     GetSales,
+    GetBlocks,
 };
diff --git a/resources/js/components/Chip.vue b/resources/js/components/Chip.vue
index 1a05c49..d6773a8 100644
--- a/resources/js/components/Chip.vue
+++ b/resources/js/components/Chip.vue
@@ -3,7 +3,7 @@
         class="inline-flex rounded-md px-1 truncate"
         :class="{
             'bg-red-500 !text-white ': isError,
-            'bg-light-surface-primary/60 dark:bg-dark-surface-primary/60 text-light-content-strong dark:text-dark-content-strong':
+            'bg-light-surface-background dark:bg-dark-surface-background text-light-content-strong dark:text-dark-content-strong':
                 !isError,
         }"
     >
diff --git a/resources/js/components/CollapseFilter.vue b/resources/js/components/CollapseFilter.vue
index 516ef7f..5638d49 100644
--- a/resources/js/components/CollapseFilter.vue
+++ b/resources/js/components/CollapseFilter.vue
@@ -1,5 +1,5 @@
 <template>
-    <Popover ref="popperRef" theme="dark" @open:popper="open = true" @close:popper="open = false">
+    <Popover ref="popperRef" :theme="useAppStore().theme" @open:popper="open = true" @close:popper="open = false">
         <template #activator>
             <Btn ref="btnOpenerRef" :class="open ? 'ring-1 ring-primary' : 'text-opacity-90'">
                 <span
@@ -61,6 +61,7 @@ import Chip from '~/components/Chip.vue';
 import FormInput from '~/components/FormInput.vue';
 import FormSelect from '~/components/FormSelect.vue';
 import Popover from '~/components/Popover.vue';
+import { useAppStore } from '~/store';
 
 const props = withDefaults(
     defineProps<{
diff --git a/resources/js/components/Popover.vue b/resources/js/components/Popover.vue
index ee6b407..1a70a49 100644
--- a/resources/js/components/Popover.vue
+++ b/resources/js/components/Popover.vue
@@ -63,6 +63,7 @@ withDefaults(
 
 .light {
     @include light-mode;
+    --popper-theme-padding: 0;
     --popper-theme-border-radius: 0.5rem;
 }
 
diff --git a/resources/js/components/pages/create/CreateListing.vue b/resources/js/components/pages/create/CreateListing.vue
index 017a69e..1392ba4 100644
--- a/resources/js/components/pages/create/CreateListing.vue
+++ b/resources/js/components/pages/create/CreateListing.vue
@@ -17,14 +17,6 @@
                             </h3>
                             <p class="mt-1 text-sm text-light-content dark:text-dark-content">Places a sell order.</p>
                         </div>
-                        <FormInput
-                            v-model="account"
-                            name="account"
-                            label="Account"
-                            description="The seller account."
-                            required
-                            tooltip="Wallet Address"
-                        />
 
                         <div class="space-y-2">
                             <div>
@@ -71,15 +63,15 @@
                             </div>
                             <div class="grid grid-cols-2 gap-4">
                                 <FormInput
-                                    class="col-span-1"
                                     v-model="takeCollectionId"
+                                    class="col-span-1"
                                     name="takeCollectionId"
                                     placeholder="Collection ID"
                                     type="number"
                                 />
                                 <TokenIdInput
-                                    class="col-span-1"
                                     v-model="takeTokenId"
+                                    class="col-span-1"
                                     placeholder="Token ID"
                                     name="takeTokenId"
                                 />
@@ -105,25 +97,37 @@
                             :prefix="currencySymbol"
                         />
 
-                        <FormInput
-                            v-model="salt"
-                            name="salt"
-                            label="Salt"
-                            description="Can be used to differentiate listings."
+                        <FormCheckbox
+                            v-model="enableAuction"
+                            name="enableAuction"
+                            label="Enable Auction"
+                            description="Use this option to enable an auction for the listing."
                         />
 
                         <FormInput
+                            v-if="enableAuction"
                             v-model="auctionDataStart"
                             name="auctionDataStart"
-                            label="Auction Data Start Block"
+                            label="Auction Start Block"
                             description="The block number the auction starts at."
+                            required
                         />
 
                         <FormInput
+                            v-if="enableAuction"
                             v-model="auctionDataEnd"
                             name="auctionDataEnd"
-                            label="Auction Data End Block"
+                            label="Auction End Block"
                             description="The block number the auction ends at."
+                            required
+                        />
+
+                        <FormInput
+                            v-if="appStore.advanced"
+                            v-model="salt"
+                            name="salt"
+                            label="Salt"
+                            description="Can be used to differentiate listings."
                         />
 
                         <FormInput
@@ -154,7 +158,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { Form } from 'vee-validate';
 import * as yup from 'yup';
 import Btn from '~/components/Btn.vue';
@@ -165,12 +169,7 @@ import { currencySymbolByNetwork, formatData, formatToken, snackbarErrors } from
 import TokenIdInput from '~/components/TokenIdInput.vue';
 import { TokenIdSelectType } from '~/types/types.enums';
 import { useAppStore } from '~/store';
-import {
-    addressRequiredSchema,
-    numberRequiredSchema,
-    stringNotRequiredSchema,
-    stringRequiredSchema,
-} from '~/util/schemas';
+import { numberRequiredSchema, stringNotRequiredSchema, stringRequiredSchema } from '~/util/schemas';
 import { MarketplaceApi } from '~/api/marketplace';
 import FormSelect from '~/components/FormSelect.vue';
 import FormCheckbox from '~/components/FormCheckbox.vue';
@@ -179,13 +178,13 @@ const router = useRouter();
 const appStore = useAppStore();
 
 const isLoading = ref(false);
-const account = ref();
 const amount = ref('');
 const price = ref('');
 const salt = ref('');
 const auctionDataStart = ref('');
 const auctionDataEnd = ref('');
 const enableTakeCollectionId = ref(false);
+const enableAuction = ref(false);
 const takeCollectionId = ref('0');
 const takeTokenId = ref({
     tokenId: '0',
@@ -203,16 +202,31 @@ const currencySymbol = computed(() => currencySymbolByNetwork(appStore.config.ne
 const collectionIds = computed(() => appStore.collections);
 
 const validation = yup.object({
-    account: addressRequiredSchema,
     amount: numberRequiredSchema.typeError('Amount must be a number'),
     price: numberRequiredSchema.typeError('Price must be a number'),
     salt: stringNotRequiredSchema.typeError('Salt must be a string'),
-    takeCollectionId: numberRequiredSchema.typeError('Collection ID is required'),
-    takeTokenId: stringRequiredSchema.required('Token ID is required'),
+    takeCollectionId: yup.string().when('enableTakeCollection', {
+        is: true,
+        then: () => numberRequiredSchema.typeError('Collection ID is required'),
+        otherwise: () => yup.string().notRequired(),
+    }),
+    takeTokenId: yup.string().when('enableTakeCollection', {
+        is: true,
+        then: () => stringRequiredSchema.typeError('Token ID is required'),
+        otherwise: () => yup.string().notRequired(),
+    }),
     makeCollectionId: numberRequiredSchema.typeError('Collection ID is required'),
     makeTokenId: stringRequiredSchema.required('Token ID is required'),
-    auctionDataStart: stringNotRequiredSchema.typeError('Auction Data Start Block must be a number'),
-    auctionDataEnd: stringNotRequiredSchema.typeError('Auction Data End Block must be a number'),
+    auctionDataStart: yup.string().when('enableAuction', {
+        is: true,
+        then: () => numberRequiredSchema.typeError('Auction Start Block must be a number'),
+        otherwise: () => yup.string().notRequired(),
+    }),
+    auctionDataEnd: yup.string().when('enableAuction', {
+        is: true,
+        then: () => numberRequiredSchema.typeError('Auction End Block must be a number'),
+        otherwise: () => yup.string().notRequired(),
+    }),
     idempotencyKey: stringNotRequiredSchema,
 });
 
@@ -221,6 +235,18 @@ const isValid = async () => {
     return formRef.value.getMeta().valid;
 };
 
+const getCurrentBlock = async () => {
+    try {
+        const res = await MarketplaceApi.getCurrentBlock();
+        auctionDataStart.value = res.data?.GetBlocks?.edges[0].node.number;
+    } catch (e) {
+        snackbar.error({
+            title: 'Failed to get current block',
+            text: 'Please try again.',
+        });
+    }
+};
+
 const createListing = async () => {
     if (!(await isValid())) return;
 
@@ -229,7 +255,6 @@ const createListing = async () => {
 
         const res = await MarketplaceApi.createListing(
             formatData({
-                account: account.value,
                 amount: amount.value,
                 price: price.value,
                 salt: salt.value,
@@ -241,10 +266,12 @@ const createListing = async () => {
                     collectionId: takeCollectionId.value,
                     tokenId: formatToken(takeTokenId.value),
                 },
-                auctionData: {
-                    startBlock: auctionDataStart.value,
-                    endBlock: auctionDataEnd.value,
-                },
+                auctionData: enableAuction.value
+                    ? {
+                          startBlock: auctionDataStart.value,
+                          endBlock: auctionDataEnd.value,
+                      }
+                    : null,
                 idempotencyKey: idempotencyKey.value,
             })
         );
@@ -269,4 +296,16 @@ const createListing = async () => {
         isLoading.value = false;
     }
 };
+
+watch(
+    () => enableAuction.value,
+    () => {
+        if (enableAuction.value) {
+            getCurrentBlock();
+        } else {
+            auctionDataStart.value = '';
+            auctionDataEnd.value = '';
+        }
+    }
+);
 </script>
diff --git a/resources/js/graphql/mutation/marketplace/CreateListing.ts b/resources/js/graphql/mutation/marketplace/CreateListing.ts
index 7500106..10f64f2 100644
--- a/resources/js/graphql/mutation/marketplace/CreateListing.ts
+++ b/resources/js/graphql/mutation/marketplace/CreateListing.ts
@@ -1,6 +1,5 @@
-export default `mutation CreateListing($account: String!, $makeAssetId: MultiTokenIdInput!, $takeAssetId: MultiTokenIdInput!, $amount: BigInt!, $price: BigInt!, $salt: String, $auctionData: AuctionDataInputType, $idempotencyKey: String) {
+export default `mutation CreateListing($makeAssetId: MultiTokenIdInput!, $takeAssetId: MultiTokenIdInput!, $amount: BigInt!, $price: BigInt!, $salt: String, $auctionData: AuctionDataInputType, $idempotencyKey: String) {
     CreateListing(
-      account: $account
       makeAssetId: $makeAssetId
       takeAssetId: $takeAssetId
       amount: $amount
diff --git a/resources/js/graphql/query/marketplace/GetBlocks.ts b/resources/js/graphql/query/marketplace/GetBlocks.ts
new file mode 100644
index 0000000..67aeb1c
--- /dev/null
+++ b/resources/js/graphql/query/marketplace/GetBlocks.ts
@@ -0,0 +1,9 @@
+export default `query GetBlocks($first: Int) {
+    GetBlocks(first: $first) {
+        edges {
+            node {
+                number
+            }
+        }
+    }
+}`;