diff --git a/src/views/catalog/CatalogView.tsx b/src/views/catalog/CatalogView.tsx
index 4ee80c6a..cbe8faab 100644
--- a/src/views/catalog/CatalogView.tsx
+++ b/src/views/catalog/CatalogView.tsx
@@ -93,10 +93,10 @@ export const CatalogView: FC<CatalogViewProps> = props =>
                 <NitroCardView className="nitro-catalog">
                     <NitroCardHeaderView headerText={ LocalizeText('catalog.title') } onCloseClick={ event => setIsVisible(false) } />
                     <NitroCardTabsView>
-                        { root && root.children.length && root.children.map((page, index) =>
+                        { root && root.children.length && root.children.map(page =>
                             {
                                 return (
-                                    <NitroCardTabsItemView key={ index } isActive={ (currentTab === page) } onClick={ event => setCurrentTab(page) }>
+                                    <NitroCardTabsItemView key={ page.pageId } isActive={ (currentTab === page) } onClick={ event => setCurrentTab(page) }>
                                         { page.localization }
                                     </NitroCardTabsItemView>
                                 );
diff --git a/src/views/catalog/views/navigation/set/CatalogNavigationSetView.tsx b/src/views/catalog/views/navigation/set/CatalogNavigationSetView.tsx
index 32a8ec30..32d5e54d 100644
--- a/src/views/catalog/views/navigation/set/CatalogNavigationSetView.tsx
+++ b/src/views/catalog/views/navigation/set/CatalogNavigationSetView.tsx
@@ -35,11 +35,11 @@ export const CatalogNavigationSetView: FC<CatalogNavigationSetViewProps> = props
     
     return (
         <div className="row row-cols-1 g-0 catalog-navigation-set-container w-100">
-            { page && (page.children.length > 0) && page.children.map((page, index) =>
+            { page && (page.children.length > 0) && page.children.map(page =>
                 {
                     if(!page.visible) return null;
                     
-                    return <CatalogNavigationItemView key={ index } page={ page } isActive={ (activeChild === page) } setActiveChild={ setActiveChild } />
+                    return <CatalogNavigationItemView key={ page.pageId } page={ page } isActive={ (activeChild === page) } setActiveChild={ setActiveChild } />
                 }) }
         </div>
     );
diff --git a/src/views/inventory/views/badge/active-results/InventoryActiveBadgeResultsView.tsx b/src/views/inventory/views/badge/active-results/InventoryActiveBadgeResultsView.tsx
index d8f970af..75f3785d 100644
--- a/src/views/inventory/views/badge/active-results/InventoryActiveBadgeResultsView.tsx
+++ b/src/views/inventory/views/badge/active-results/InventoryActiveBadgeResultsView.tsx
@@ -8,9 +8,9 @@ export const InventoryActiveBadgeResultsView: FC<InventoryActiveBadgeResultsView
     
     return (
         <div className="row row-cols-3 align-content-start g-0">
-            { badges && (badges.length > 0) && badges.map((code, index) =>
+            { badges && (badges.length > 0) && badges.map(code =>
                 {
-                    return <InventoryBadgeItemView key={ index } badge={ code } />
+                    return <InventoryBadgeItemView key={ code } badge={ code } />
                 }) }
         </div>
     );
diff --git a/src/views/inventory/views/badge/results/InventoryBadgeResultsView.tsx b/src/views/inventory/views/badge/results/InventoryBadgeResultsView.tsx
index d563979b..66215373 100644
--- a/src/views/inventory/views/badge/results/InventoryBadgeResultsView.tsx
+++ b/src/views/inventory/views/badge/results/InventoryBadgeResultsView.tsx
@@ -9,11 +9,11 @@ export const InventoryBadgeResultsView: FC<InventoryBadgeResultsViewProps> = pro
     return (
         <div className="h-100 overflow-hidden">
             <div className="row row-cols-5 align-content-start g-0 w-100 h-100 overflow-auto">
-            { badges && (badges.length > 0) && badges.map((code, index) =>
+            { badges && (badges.length > 0) && badges.map(code =>
                     {
                         if(activeBadges.indexOf(code) >= 0) return null;
                         
-                        return <InventoryBadgeItemView key={ index } badge={ code } />
+                        return <InventoryBadgeItemView key={ code } badge={ code } />
                     }) }
             </div>
         </div>
diff --git a/src/views/inventory/views/bot/results/InventoryBotResultsView.tsx b/src/views/inventory/views/bot/results/InventoryBotResultsView.tsx
index 05e044fb..477c7bb4 100644
--- a/src/views/inventory/views/bot/results/InventoryBotResultsView.tsx
+++ b/src/views/inventory/views/bot/results/InventoryBotResultsView.tsx
@@ -9,9 +9,9 @@ export const InventoryBotResultsView: FC<InventoryBotResultsViewProps> = props =
     return (
         <div className="h-100 overflow-hidden">
             <div className="row row-cols-5 align-content-start g-0 w-100 h-100 overflow-auto">
-            { botItems && (botItems.length > 0) && botItems.map((item, index) =>
+            { botItems && (botItems.length > 0) && botItems.map(item =>
                     {
-                        return <InventoryBotItemView key={ index } botItem={ item } />
+                        return <InventoryBotItemView key={ item.id } botItem={ item } />
                     }) }
             </div>
         </div>
diff --git a/src/views/inventory/views/pet/results/InventoryPetResultsView.tsx b/src/views/inventory/views/pet/results/InventoryPetResultsView.tsx
index 03fc893e..21e99114 100644
--- a/src/views/inventory/views/pet/results/InventoryPetResultsView.tsx
+++ b/src/views/inventory/views/pet/results/InventoryPetResultsView.tsx
@@ -9,9 +9,9 @@ export const InventoryPetResultsView: FC<InventoryPetResultsViewProps> = props =
     return (
         <div className="h-100 overflow-hidden">
             <div className="row row-cols-5 align-content-start g-0 w-100 h-100 overflow-auto">
-            { petItems && (petItems.length > 0) && petItems.map((item, index) =>
+            { petItems && (petItems.length > 0) && petItems.map(item =>
                     {
-                        return <InventoryPetItemView key={ index } petItem={ item } />
+                        return <InventoryPetItemView key={ item.id } petItem={ item } />
                     }) }
             </div>
         </div>
diff --git a/src/views/room/widgets/furniture/stickie/FurnitureStickieView.tsx b/src/views/room/widgets/furniture/stickie/FurnitureStickieView.tsx
index 2c1a7a97..3a34020b 100644
--- a/src/views/room/widgets/furniture/stickie/FurnitureStickieView.tsx
+++ b/src/views/room/widgets/furniture/stickie/FurnitureStickieView.tsx
@@ -122,9 +122,9 @@ export const FurnitureStickieView: FC<FurnitureStickieViewProps> = props =>
                         { stickieData.canModify && 
                         <>
                             <div className="nitro-stickie-image stickie-trash header-trash" onClick={ event => processAction('trash') }></div>
-                            { STICKIE_COLORS.map((color, index) =>
+                            { STICKIE_COLORS.map(color =>
                                 {
-                                    return <div className="stickie-color ms-1" key={ index } onClick={ event => processAction('changeColor', color) } style={ {backgroundColor: ColorUtils.makeColorHex(color) } } />
+                                    return <div key={ color } className="stickie-color ms-1" onClick={ event => processAction('changeColor', color) } style={ {backgroundColor: ColorUtils.makeColorHex(color) } } />
                                 })}
                         </> }
                     </div>
diff --git a/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx b/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx
index 45c2eb20..dedf8822 100644
--- a/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx
+++ b/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx
@@ -24,9 +24,9 @@ export const InfoStandWidgetBotView: FC<InfoStandWidgetBotViewProps> = props =>
                     <AvatarImageView figure={ botData.figure } direction={ 4 } />
                 </div>
                 <div className="w-100 d-flex justify-content-center align-items-center">
-                    { (botData.badges.length > 0) && botData.badges.map((result, index) =>
+                    { (botData.badges.length > 0) && botData.badges.map(result =>
                         {
-                            return <BadgeImageView key={ index } badgeCode={ result } />;
+                            return <BadgeImageView key={ result } badgeCode={ result } />;
                         }) }
                 </div>
             </div>
diff --git a/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx b/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx
index 258840ef..a25fc8d3 100644
--- a/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx
+++ b/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx
@@ -36,9 +36,9 @@ export const InfoStandWidgetRentableBotView: FC<InfoStandWidgetRentableBotViewPr
                         <AvatarImageView figure={ rentableBotData.figure } direction={ 4 } />
                     </div>
                     <div className="w-100 d-flex justify-content-center align-items-center">
-                        { (rentableBotData.badges.length > 0) && rentableBotData.badges.map((result, index) =>
+                        { (rentableBotData.badges.length > 0) && rentableBotData.badges.map(result =>
                             {
-                                return <BadgeImageView key={ index } badgeCode={ result } />;
+                                return <BadgeImageView key={ result } badgeCode={ result } />;
                             }) }
                     </div>
                 </div>
diff --git a/src/views/wired/views/conditions/actor-has-hand-item/WiredConditionActorHasHandItem.tsx b/src/views/wired/views/conditions/actor-has-hand-item/WiredConditionActorHasHandItem.tsx
index fe4aefe3..368b3114 100644
--- a/src/views/wired/views/conditions/actor-has-hand-item/WiredConditionActorHasHandItem.tsx
+++ b/src/views/wired/views/conditions/actor-has-hand-item/WiredConditionActorHasHandItem.tsx
@@ -26,9 +26,9 @@ export const WiredConditionActorHasHandItemView: FC<{}> = props =>
             <div className="form-group">
                 <label className="fw-bold">{ LocalizeText('wiredfurni.params.handitem') }</label>
                 <select className="form-select form-select-sm" value={ handItemId } onChange={ event => setHandItemId(parseInt(event.target.value)) }>
-                    { allowedHanditemIds.map((value, index) =>
+                    { allowedHanditemIds.map(value =>
                         {
-                            return <option key={ index } value={ value }>{ LocalizeText(`handitem${ value }`) }</option>
+                            return <option key={ value } value={ value }>{ LocalizeText(`handitem${ value }`) }</option>
                         }) }
                 </select>
             </div>
diff --git a/src/views/wired/views/conditions/actor-is-team-member/WiredConditionActorIsTeamMemberView.tsx b/src/views/wired/views/conditions/actor-is-team-member/WiredConditionActorIsTeamMemberView.tsx
index 851088a3..b616db4b 100644
--- a/src/views/wired/views/conditions/actor-is-team-member/WiredConditionActorIsTeamMemberView.tsx
+++ b/src/views/wired/views/conditions/actor-is-team-member/WiredConditionActorIsTeamMemberView.tsx
@@ -25,10 +25,10 @@ export const WiredConditionActorIsTeamMemberView: FC<{}> = props =>
         <WiredConditionBaseView requiresFurni={ WiredFurniType.STUFF_SELECTION_OPTION_NONE } save={ save }>
             <div className="form-group">
                 <label className="fw-bold">{ LocalizeText('wiredfurni.params.team') }</label>
-                { teamIds.map((value, index) =>
+                { teamIds.map(value =>
                     {
                         return (
-                            <div key={ index } className="form-check">
+                            <div key={ value } className="form-check">
                                 <input className="form-check-input" type="radio" name="selectedTeam" id={ `selectedTeam${ value }` } checked={ (selectedTeam === value) } onChange={ event => setSelectedTeam(value) } />
                                 <label className="form-check-label" htmlFor={ `selectedTeam${ value }` }>
                                     { LocalizeText(`wiredfurni.params.team.${ value }`) }