diff --git a/src/components/catalog/views/page/layout/marketplace/common/IMarketplaceSearchOptions.ts b/src/api/catalog/IMarketplaceSearchOptions.ts
similarity index 64%
rename from src/components/catalog/views/page/layout/marketplace/common/IMarketplaceSearchOptions.ts
rename to src/api/catalog/IMarketplaceSearchOptions.ts
index 77734c3a..9489ef0f 100644
--- a/src/components/catalog/views/page/layout/marketplace/common/IMarketplaceSearchOptions.ts
+++ b/src/api/catalog/IMarketplaceSearchOptions.ts
@@ -1,4 +1,5 @@
-export interface IMarketplaceSearchOptions {
+export interface IMarketplaceSearchOptions
+{
     query: string;
     type: number;
     minPrice: number;
diff --git a/src/components/catalog/views/page/layout/marketplace/common/MarketplaceOfferData.ts b/src/api/catalog/MarketplaceOfferData.ts
similarity index 100%
rename from src/components/catalog/views/page/layout/marketplace/common/MarketplaceOfferData.ts
rename to src/api/catalog/MarketplaceOfferData.ts
diff --git a/src/components/catalog/views/page/layout/marketplace/common/MarketplaceOfferState.ts b/src/api/catalog/MarketplaceOfferState.ts
similarity index 100%
rename from src/components/catalog/views/page/layout/marketplace/common/MarketplaceOfferState.ts
rename to src/api/catalog/MarketplaceOfferState.ts
diff --git a/src/components/catalog/views/page/layout/marketplace/common/MarketplaceSearchType.ts b/src/api/catalog/MarketplaceSearchType.ts
similarity index 100%
rename from src/components/catalog/views/page/layout/marketplace/common/MarketplaceSearchType.ts
rename to src/api/catalog/MarketplaceSearchType.ts
diff --git a/src/api/catalog/index.ts b/src/api/catalog/index.ts
index 5b2bde35..6c5b9e2e 100644
--- a/src/api/catalog/index.ts
+++ b/src/api/catalog/index.ts
@@ -12,10 +12,14 @@ export * from './GiftWrappingConfiguration';
 export * from './ICatalogNode';
 export * from './ICatalogOptions';
 export * from './ICatalogPage';
+export * from './IMarketplaceSearchOptions';
 export * from './IPageLocalization';
 export * from './IProduct';
 export * from './IPurchasableOffer';
 export * from './IPurchaseOptions';
+export * from './MarketplaceOfferData';
+export * from './MarketplaceOfferState';
+export * from './MarketplaceSearchType';
 export * from './Offer';
 export * from './PageLocalization';
 export * from './PlacedObjectPurchaseData';
diff --git a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx
index 44d1489e..1f19b6bf 100644
--- a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx
@@ -1,8 +1,6 @@
 import { FC, useCallback, useMemo } from 'react';
-import { GetImageIconUrlForProduct, LocalizeText, ProductTypeEnum } from '../../../../../../api';
+import { GetImageIconUrlForProduct, LocalizeText, MarketplaceOfferData, MarketPlaceOfferState, ProductTypeEnum } from '../../../../../../api';
 import { Button, Column, LayoutGridItem, Text } from '../../../../../../common';
-import { MarketplaceOfferData } from './common/MarketplaceOfferData';
-import { MarketPlaceOfferState } from './common/MarketplaceOfferState';
 
 export interface MarketplaceItemViewProps
 {
diff --git a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx
index 5a18378d..b74ab491 100644
--- a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx
@@ -1,12 +1,10 @@
 import { CancelMarketplaceOfferMessageComposer, GetMarketplaceOwnOffersMessageComposer, MarketplaceCancelOfferResultEvent, MarketplaceOwnOffersEvent, RedeemMarketplaceOfferCreditsMessageComposer } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useMemo, useState } from 'react';
-import { LocalizeText, NotificationAlertType, SendMessageComposer } from '../../../../../../api';
+import { LocalizeText, MarketplaceOfferData, MarketPlaceOfferState, NotificationAlertType, SendMessageComposer } from '../../../../../../api';
 import { Button, Column, Text } from '../../../../../../common';
 import { useMessageEvent, useNotification } from '../../../../../../hooks';
 import { CatalogLayoutProps } from '../CatalogLayout.types';
 import { CatalogLayoutMarketplaceItemView, OWN_OFFER } from './CatalogLayoutMarketplaceItemView';
-import { MarketplaceOfferData } from './common/MarketplaceOfferData';
-import { MarketPlaceOfferState } from './common/MarketplaceOfferState';
 
 export const CatalogLayoutMarketplaceOwnItemsView: FC<CatalogLayoutProps> = props =>
 {
diff --git a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplacePublicItemsView.tsx b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplacePublicItemsView.tsx
index 172e3001..1225a0d7 100644
--- a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplacePublicItemsView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplacePublicItemsView.tsx
@@ -1,14 +1,11 @@
 import { BuyMarketplaceOfferMessageComposer, GetMarketplaceOffersMessageComposer, MarketplaceBuyOfferResultEvent, MarketPlaceOffersEvent } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useMemo, useState } from 'react';
-import { LocalizeText, NotificationAlertType, SendMessageComposer } from '../../../../../../api';
+import { IMarketplaceSearchOptions, LocalizeText, MarketplaceOfferData, MarketplaceSearchType, NotificationAlertType, SendMessageComposer } from '../../../../../../api';
 import { Button, ButtonGroup, Column, Text } from '../../../../../../common';
 import { useMessageEvent, useNotification, usePurse } from '../../../../../../hooks';
 import { CatalogLayoutProps } from '../CatalogLayout.types';
 import { CatalogLayoutMarketplaceItemView, PUBLIC_OFFER } from './CatalogLayoutMarketplaceItemView';
 import { SearchFormView } from './CatalogLayoutMarketplaceSearchFormView';
-import { IMarketplaceSearchOptions } from './common/IMarketplaceSearchOptions';
-import { MarketplaceOfferData } from './common/MarketplaceOfferData';
-import { MarketplaceSearchType } from './common/MarketplaceSearchType';
 
 const SORT_TYPES_VALUE = [ 1, 2 ];
 const SORT_TYPES_ACTIVITY = [ 3, 4, 5, 6 ];
diff --git a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceSearchFormView.tsx b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceSearchFormView.tsx
index 9fa74263..e07a7b2b 100644
--- a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceSearchFormView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceSearchFormView.tsx
@@ -1,11 +1,6 @@
 import { FC, useCallback, useEffect, useState } from 'react';
-import { LocalizeText } from '../../../../../../api';
-import { Button } from '../../../../../../common/Button';
-import { Column } from '../../../../../../common/Column';
-import { Flex } from '../../../../../../common/Flex';
-import { Text } from '../../../../../../common/Text';
-import { IMarketplaceSearchOptions } from './common/IMarketplaceSearchOptions';
-import { MarketplaceSearchType } from './common/MarketplaceSearchType';
+import { IMarketplaceSearchOptions, LocalizeText, MarketplaceSearchType } from '../../../../../../api';
+import { Button, Column, Flex, Text } from '../../../../../../common';
 
 export interface SearchFormViewProps
 {
diff --git a/src/components/catalog/views/page/layout/marketplace/common/MarketplaceConfirmType.ts b/src/components/catalog/views/page/layout/marketplace/common/MarketplaceConfirmType.ts
deleted file mode 100644
index dbc17f2a..00000000
--- a/src/components/catalog/views/page/layout/marketplace/common/MarketplaceConfirmType.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export class MarketplaceConfirmType
-{
-    public static readonly PURCHASE_CONFIRM_TYPE_NORMAL = 1;
-    public static readonly PURCHASE_CONFIRM_TYPE_HIGHER = 2;
-    public static readonly PURCHASE_CONFIRM_TYPE_INVALID = 3;
-}
diff --git a/src/components/help/views/HelpIndexView.tsx b/src/components/help/views/HelpIndexView.tsx
index 6b6feb03..b4f0743a 100644
--- a/src/components/help/views/HelpIndexView.tsx
+++ b/src/components/help/views/HelpIndexView.tsx
@@ -21,7 +21,7 @@ export const HelpIndexView: FC<{}> = props =>
 
     return (
         <>
-            <Column gap={ 1 }>
+            <Column grow center gap={ 1 }>
                 <Text fontSize={ 3 }>{ LocalizeText('help.main.frame.title') }</Text>
                 <Text>{ LocalizeText('help.main.self.description') }</Text>
             </Column>
@@ -29,8 +29,8 @@ export const HelpIndexView: FC<{}> = props =>
                 <Button onClick={ onReportClick }>{ LocalizeText('help.main.bully.subtitle') }</Button>
                 <Button onClick={ () => DispatchUiEvent(new GuideToolEvent(GuideToolEvent.CREATE_HELP_REQUEST)) }>{ LocalizeText('help.main.help.title') }</Button>
                 <Button disabled={ true }>{ LocalizeText('help.main.self.tips.title') }</Button>
-                <Button variant="link" className="text-black" onClick={ () => SendMessageComposer(new GetCfhStatusMessageComposer(false)) }>{ LocalizeText('help.main.my.sanction.status') }</Button>
             </Column>
+            <Button variant="link" textColor="black" onClick={ () => SendMessageComposer(new GetCfhStatusMessageComposer(false)) }>{ LocalizeText('help.main.my.sanction.status') }</Button>
         </>
     )
 }
diff --git a/src/components/toolbar/common/ToolbarViewItems.ts b/src/components/toolbar/common/ToolbarViewItems.ts
deleted file mode 100644
index dd05f863..00000000
--- a/src/components/toolbar/common/ToolbarViewItems.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export class ToolbarViewItems
-{
-    public static NAVIGATOR_ITEM: string = 'TVI_NAVIGATOR_ITEM';
-    public static INVENTORY_ITEM: string = 'TVI_INVENTORY_ITEM';
-    public static CATALOG_ITEM: string = 'TVI_CATALOG_ITEM';
-    public static FRIEND_LIST_ITEM: string = 'TVI_FRIEND_LIST_ITEM';
-    public static FRIEND_CHAT_ITEM: string = 'TVI_FRIEND_CHAT_ITEM';
-    public static CLOTHING_ITEM: string = 'TVI_CLOTHING_ITEM';
-    public static CAMERA_ITEM: string = 'TVI_CAMERA_ITEM';
-    public static MOD_TOOLS_ITEM: string = 'TVI_MOD_TOOLS_ITEM';
-    public static ACHIEVEMENTS_ITEM: string = 'TVI_ACHIEVEMENTS_ITEM';
-    public static PROFILE_ITEM: string = 'TVI_PROFILE_ITEM';
-    public static SETTINGS_ITEM: string = 'TVI_SETTINGS_ITEM';
-    public static GUIDE_TOOL_ITEM: string = 'TVI_GUIDE_TOOL_ITEM';
-}