diff --git a/src/pages/Ecomerce/CatalogCard.vue b/src/pages/Ecomerce/CatalogCard.vue
index 412f7e7c..d975e03a 100644
--- a/src/pages/Ecomerce/CatalogCard.vue
+++ b/src/pages/Ecomerce/CatalogCard.vue
@@ -93,7 +93,7 @@ const { t } = useI18n();
                     storage="catalog"
                     size="200x200"
                     :id="item.image"
-                    rounded="bottom"
+                    rounded-borders="full"
                     class="full-height full-width"
                 />
             </div>
@@ -106,15 +106,14 @@ const { t } = useI18n();
                 <span>{{ item.subName }}</span>
                 <span>#{{ item.id }}</span>
             </div>
-            <div
-                v-for="(tag, index) in item.previewTags"
-                :key="index"
-                class="full-width row"
-            >
-                <span class="text-grey-7 col">
-                    {{ tag.name }}
+            <div class="full-width row">
+                <span
+                    v-for="(tag, index) in item.previewTags"
+                    :key="index"
+                    class="text-grey-7 text-caption q-mr-sm"
+                >
+                    {{ tag.value }}
                 </span>
-                <span class="col ellipsis">{{ tag.value }}</span>
             </div>
             <div class="row justify-end items-center q-gutter-x-xs q-mt-sm">
                 <QBadge
diff --git a/src/pages/Ecomerce/CatalogView.vue b/src/pages/Ecomerce/CatalogView.vue
index 909aa7cb..c87000e5 100644
--- a/src/pages/Ecomerce/CatalogView.vue
+++ b/src/pages/Ecomerce/CatalogView.vue
@@ -72,10 +72,10 @@
                             v-for="cat in categories"
                             :class="{ active: category == cat.id }"
                             :key="cat.id"
-                            :title="cat.name"
                             @click="selectedCategory = cat.id"
                         >
                             <img :src="`statics/category/${cat.code}.svg`" />
+                            <QTooltip>{{ cat.name }}</QTooltip>
                         </QBtn>
                     </div>
                 </div>
@@ -141,37 +141,35 @@
                 </span>
             </div>
         </QDrawer>
-        <QInfiniteScroll>
+        <div
+            :class="
+                viewMode === 'grid'
+                    ? 'q-pa-md row justify-center q-gutter-md'
+                    : 'column items-center'
+            "
+        >
+            <QSpinner
+                v-if="loading"
+                color="primary"
+                size="3em"
+                :thickness="2"
+            />
             <div
-                :class="
-                    viewMode === 'grid'
-                        ? 'q-pa-md row justify-center q-gutter-md'
-                        : 'column items-center'
-                "
+                v-else-if="!items || !items.length || !isSomeFilterSelected"
+                class="text-subtitle1 text-grey-7 q-pa-md"
             >
-                <QSpinner
-                    v-if="loading"
-                    color="primary"
-                    size="3em"
-                    :thickness="2"
-                />
-                <div
-                    v-else-if="!items || !items.length || !isSomeFilterSelected"
-                    class="text-subtitle1 text-grey-7 q-pa-md"
-                >
-                    <QIcon name="refresh" size="sm" class="q-mr-sm"></QIcon>
-                    <span>{{ t('pleaseSetFilter') }}</span>
-                </div>
-                <CatalogCard
-                    v-else
-                    v-for="_item in items"
-                    :key="_item.id"
-                    :item="_item"
-                    :view-mode="viewMode"
-                    @click="showItem(_item)"
-                />
+                <QIcon name="refresh" size="sm" class="q-mr-sm"></QIcon>
+                <span>{{ t('pleaseSetFilter') }}</span>
             </div>
-        </QInfiniteScroll>
+            <CatalogCard
+                v-else
+                v-for="_item in items"
+                :key="_item.id"
+                :item="_item"
+                :view-mode="viewMode"
+                @click="showItem(_item)"
+            />
+        </div>
         <QDialog v-model="showItemDialog">
             <QCard style="width: 25em" class="column">
                 <div class="q-pa-md" style="display: flex">
@@ -899,6 +897,7 @@ onBeforeMount(async () => {
     if (!isGuest.value) {
         await appStore.check('catalog');
     } else {
+        // TODO: Implement this logic when isGuest is implemented
         // const resultSet = await jApi.execQuery(
         //     'CALL myOrder_configureForGuest(@orderId); SELECT @orderId;'
         // );