diff --git a/src/common/pages/Items/All/index.js b/src/common/pages/Items/All/index.js
index 7c8e685..242c2ee 100644
--- a/src/common/pages/Items/All/index.js
+++ b/src/common/pages/Items/All/index.js
@@ -159,7 +159,7 @@ export default class All extends React.Component {
         images: {main: faker.image.food(250,250,true), gallery: [faker.image.food(250,250,true)]},
         item_status_id: "2b1a2598-8333-4b19-ae7b-c054bec87540",
         length: "0.00",
-        name: faker.company.companyName(),
+        name: faker.commerce.productName(),
         odoo_additional_data: {product_id: 205, product_uom: 21, product_tmpl_id: 291},
         product_id: 205,
         product_tmpl_id: 291,
@@ -193,7 +193,7 @@ export default class All extends React.Component {
         images: {main: faker.image.food(250,250,true), gallery: [faker.image.food(250,250,true)]},
         item_status_id: "2b1a2598-8333-4b19-ae7b-c054bec87540",
         length: "0.00",
-        name: faker.company.companyName(),
+        name: faker.commerce.productName(),
         odoo_additional_data: {product_id: 205, product_uom: 21, product_tmpl_id: 291},
         product_id: 205,
         product_tmpl_id: 291,
@@ -227,7 +227,7 @@ export default class All extends React.Component {
         images: {main: faker.image.food(250,250,true), gallery: [faker.image.food(250,250,true)]},
         item_status_id: "2b1a2598-8333-4b19-ae7b-c054bec87540",
         length: "0.00",
-        name: faker.company.companyName(),
+        name: faker.commerce.productName(),
         odoo_additional_data: {product_id: 205, product_uom: 21, product_tmpl_id: 291},
         product_id: 205,
         product_tmpl_id: 291,
@@ -261,7 +261,7 @@ export default class All extends React.Component {
         images: {main: faker.image.food(250,250,true), gallery: [faker.image.food(250,250,true)]},
         item_status_id: "2b1a2598-8333-4b19-ae7b-c054bec87540",
         length: "0.00",
-        name: faker.company.companyName(),
+        name: faker.commerce.productName(),
         odoo_additional_data: {product_id: 205, product_uom: 21, product_tmpl_id: 291},
         product_id: 205,
         product_tmpl_id: 291,
@@ -295,7 +295,7 @@ export default class All extends React.Component {
         images: {main: faker.image.food(250,250,true), gallery: [faker.image.food(250,250,true)]},
         item_status_id: "2b1a2598-8333-4b19-ae7b-c054bec87540",
         length: "0.00",
-        name: faker.company.companyName(),
+        name: faker.commerce.productName(),
         odoo_additional_data: {product_id: 205, product_uom: 21, product_tmpl_id: 291},
         product_id: 205,
         product_tmpl_id: 291,
@@ -329,7 +329,7 @@ export default class All extends React.Component {
         images: {main: faker.image.food(250,250,true), gallery: [faker.image.food(250,250,true)]},
         item_status_id: "2b1a2598-8333-4b19-ae7b-c054bec87540",
         length: "0.00",
-        name: faker.company.companyName(),
+        name: faker.commerce.productName(),
         odoo_additional_data: {product_id: 205, product_uom: 21, product_tmpl_id: 291},
         product_id: 205,
         product_tmpl_id: 291,
@@ -363,7 +363,7 @@ export default class All extends React.Component {
         images: {main: faker.image.food(250,250,true), gallery: [faker.image.food(250,250,true)]},
         item_status_id: "2b1a2598-8333-4b19-ae7b-c054bec87540",
         length: "0.00",
-        name: faker.company.companyName(),
+        name: faker.commerce.productName(),
         odoo_additional_data: {product_id: 205, product_uom: 21, product_tmpl_id: 291},
         product_id: 205,
         product_tmpl_id: 291,
@@ -397,7 +397,7 @@ export default class All extends React.Component {
         images: {main: faker.image.food(250,250,true), gallery: [faker.image.food(250,250,true)]},
         item_status_id: "2b1a2598-8333-4b19-ae7b-c054bec87540",
         length: "0.00",
-        name: faker.company.companyName(),
+        name: faker.commerce.productName(),
         odoo_additional_data: {product_id: 205, product_uom: 21, product_tmpl_id: 291},
         product_id: 205,
         product_tmpl_id: 291,
@@ -431,7 +431,7 @@ export default class All extends React.Component {
         images: {main: faker.image.food(250,250,true), gallery: [faker.image.food(250,250,true)]},
         item_status_id: "2b1a2598-8333-4b19-ae7b-c054bec87540",
         length: "0.00",
-        name: faker.company.companyName(),
+        name: faker.commerce.productName(),
         odoo_additional_data: {product_id: 205, product_uom: 21, product_tmpl_id: 291},
         product_id: 205,
         product_tmpl_id: 291,
diff --git a/src/common/pages/Items/ItemCard/index.js b/src/common/pages/Items/ItemCard/index.js
index 74bb1d3..84f4e50 100644
--- a/src/common/pages/Items/ItemCard/index.js
+++ b/src/common/pages/Items/ItemCard/index.js
@@ -36,20 +36,19 @@ export class ItemCard extends React.Component {
     const mainImage = main;
 
     return (
-      <Link to={`${LINKS.FORM_ITEMS}/edit/${data.id}`}>
       <Card className="animated fadeIn cardLite marketplace-cardBox" style={{height: 323, cursor: 'pointer', textOverflow: 'ellipsis'}}>
         <CardMedia>
           <img src={(main) ? mainImage : 'https://marketplace-sillyfish-api.asacreative.com/assets/no-image.png'} alt="" style={{height: 175, objectFit: 'cover'}}/>
         </CardMedia>
         {/*<CardTitle style={{padding:8}} subtitleStyle={{display:'none'}} title={data.name} titleStyle={{fontSize: 12}}/>*/}
 
-        <CardTitle title={<Link to={`${LINKS.FORM_ITEMS}/${data.id}`}>{(data.name.length > 22) ? data.name.substring(0,21)+`...` : data.name}</Link>} titleStyle={{fontWeight: 'bold', fontSize: 18, lineHeight: '30px', whiteSpace: 'nowrap'}}
+        <CardTitle title={<Link to={`${LINKS.FORM_ITEMS}/${data.id}`}>{(data.name.length > 19) ? data.name.substring(0,18)+`...` : data.name}</Link>} titleStyle={{fontWeight: 'bold', fontSize: 18, lineHeight: '30px', whiteSpace: 'nowrap'}}
                    subtitle={<span style={{fontWeight: 'bold', color: 'orangered'}}>{data.regular_price} Points</span>}/>
         {/*<CardTitle title={<Link to={`${LINKS.FORM_ITEMS}/${data.id}`}>{(data.name.length > 14) ? data.name.substring(0,13)+`...` : data.name}</Link>} titleStyle={{fontWeight: 'bold', fontSize: 18, lineHeight: '30px', whiteSpace: 'nowrap'}}*/}
-                   {/*subtitle={<NumberFormat style={{fontWeight: 'bold', color: 'orangered'}}*/}
-                                           {/*value={data.regular_price}*/}
-                                           {/*displayType={'text'}*/}
-                                           {/*thousandSeparator={true} prefix={'Rp'}/>}/>*/}
+        {/*subtitle={<NumberFormat style={{fontWeight: 'bold', color: 'orangered'}}*/}
+        {/*value={data.regular_price}*/}
+        {/*displayType={'text'}*/}
+        {/*thousandSeparator={true} prefix={'Rp'}/>}/>*/}
 
         {/*<CardText style={{padding: 8}}>*/}
         {/*<p className="font-14" style={{marginBottom: 32, fontWeight: 'bold'}}>{data.name}</p>*/}
@@ -92,7 +91,6 @@ export class ItemCard extends React.Component {
         </CardText>
 
       </Card>
-      </Link>
     )
   }