diff --git a/src/views/catalog/CatalogMessageHandler.tsx b/src/components/catalog/CatalogMessageHandler.tsx
similarity index 97%
rename from src/views/catalog/CatalogMessageHandler.tsx
rename to src/components/catalog/CatalogMessageHandler.tsx
index 89c1e6fc..61948e8f 100644
--- a/src/views/catalog/CatalogMessageHandler.tsx
+++ b/src/components/catalog/CatalogMessageHandler.tsx
@@ -7,13 +7,12 @@ import { CatalogPurchasedEvent } from '../../events/catalog/CatalogPurchasedEven
 import { CatalogPurchaseSoldOutEvent } from '../../events/catalog/CatalogPurchaseSoldOutEvent';
 import { dispatchUiEvent } from '../../hooks/events/ui/ui-event';
 import { CreateMessageHook } from '../../hooks/messages/message-event';
-import { CatalogMessageHandlerProps } from './CatalogMessageHandler.types';
 import { CatalogPetPalette } from './common/CatalogPetPalette';
 import { SubscriptionInfo } from './common/SubscriptionInfo';
 import { useCatalogContext } from './context/CatalogContext';
 import { CatalogActions } from './reducers/CatalogReducer';
 
-export const CatalogMessageHandler: FC<CatalogMessageHandlerProps> = props =>
+export const CatalogMessageHandler: FC<{}> = props =>
 {
     const { catalogState = null, dispatchCatalogState = null } = useCatalogContext();
 
diff --git a/src/views/catalog/CatalogView.scss b/src/components/catalog/CatalogView.scss
similarity index 100%
rename from src/views/catalog/CatalogView.scss
rename to src/components/catalog/CatalogView.scss
diff --git a/src/views/catalog/CatalogView.tsx b/src/components/catalog/CatalogView.tsx
similarity index 97%
rename from src/views/catalog/CatalogView.tsx
rename to src/components/catalog/CatalogView.tsx
index ff833840..c97148d1 100644
--- a/src/views/catalog/CatalogView.tsx
+++ b/src/components/catalog/CatalogView.tsx
@@ -9,7 +9,7 @@ import { useUiEvent } from '../../hooks/events/ui/ui-event';
 import { SendMessageHook } from '../../hooks/messages/message-event';
 import { NitroCardContentView, NitroCardHeaderView, NitroCardTabsItemView, NitroCardTabsView, NitroCardView } from '../../layout';
 import { CatalogMessageHandler } from './CatalogMessageHandler';
-import { CatalogMode, CatalogViewProps } from './CatalogView.types';
+import { CatalogMode } from './common/CatalogMode';
 import { BuildCatalogPageTree } from './common/CatalogUtilities';
 import { CatalogContextProvider } from './context/CatalogContext';
 import { CatalogReducer, initialCatalog } from './reducers/CatalogReducer';
@@ -18,7 +18,7 @@ import { ACTIVE_PAGES, CatalogNavigationView } from './views/navigation/CatalogN
 import { CatalogPageView } from './views/page/CatalogPageView';
 import { MarketplacePostOfferView } from './views/page/layout/marketplace/post-offer/MarketplacePostOfferView';
 
-export const CatalogView: FC<CatalogViewProps> = props =>
+export const CatalogView: FC<{}> = props =>
 {
     const [ isVisible, setIsVisible ] = useState(false);
     const [ roomPreviewer, setRoomPreviewer ] = useState<RoomPreviewer>(null);
@@ -215,10 +215,10 @@ export const CatalogView: FC<CatalogViewProps> = props =>
                     <NitroCardContentView>
                         <Grid>
                             { currentNavigationPage && !navigationHidden &&
-                                <Column size={ 3 }>
+                                <Column size={ 3 } overflow="hidden">
                                     <CatalogNavigationView page={ currentNavigationPage } pendingTree={ pendingTree } setPendingTree={ setPendingTree } />
                                 </Column> }
-                            <Column size={ (navigationHidden ? 12 : 9) }>
+                            <Column size={ (navigationHidden ? 12 : 9) } overflow="hidden">
                                 <CatalogPageView roomPreviewer={ roomPreviewer } />
                             </Column>
                         </Grid>
diff --git a/src/views/catalog/common/AttemptCatalogPlacement.ts b/src/components/catalog/common/AttemptCatalogPlacement.ts
similarity index 100%
rename from src/views/catalog/common/AttemptCatalogPlacement.ts
rename to src/components/catalog/common/AttemptCatalogPlacement.ts
diff --git a/src/views/catalog/CatalogView.types.ts b/src/components/catalog/common/CatalogMode.ts
similarity index 64%
rename from src/views/catalog/CatalogView.types.ts
rename to src/components/catalog/common/CatalogMode.ts
index 6879614a..5cf52c70 100644
--- a/src/views/catalog/CatalogView.types.ts
+++ b/src/components/catalog/common/CatalogMode.ts
@@ -1,8 +1,3 @@
-export interface CatalogViewProps
-{
-    
-}
-
 export class CatalogMode
 {
     public static MODE_NORMAL: string = 'NORMAL';
diff --git a/src/views/catalog/common/CatalogPageName.ts b/src/components/catalog/common/CatalogPageName.ts
similarity index 100%
rename from src/views/catalog/common/CatalogPageName.ts
rename to src/components/catalog/common/CatalogPageName.ts
diff --git a/src/views/catalog/common/CatalogPetPalette.ts b/src/components/catalog/common/CatalogPetPalette.ts
similarity index 100%
rename from src/views/catalog/common/CatalogPetPalette.ts
rename to src/components/catalog/common/CatalogPetPalette.ts
diff --git a/src/components/catalog/common/CatalogPurchaseState.ts b/src/components/catalog/common/CatalogPurchaseState.ts
new file mode 100644
index 00000000..b442f621
--- /dev/null
+++ b/src/components/catalog/common/CatalogPurchaseState.ts
@@ -0,0 +1,10 @@
+export class CatalogPurchaseState
+{
+    public static NONE = 0;
+    public static CONFIRM = 1;
+    public static PURCHASE = 2;
+    public static NO_CREDITS = 3;
+    public static NO_POINTS = 4;
+    public static SOLD_OUT = 5;
+    public static FAILED = 6;
+}
diff --git a/src/views/catalog/common/CatalogUtilities.ts b/src/components/catalog/common/CatalogUtilities.ts
similarity index 100%
rename from src/views/catalog/common/CatalogUtilities.ts
rename to src/components/catalog/common/CatalogUtilities.ts
diff --git a/src/views/catalog/common/FurniCategory.ts b/src/components/catalog/common/FurniCategory.ts
similarity index 100%
rename from src/views/catalog/common/FurniCategory.ts
rename to src/components/catalog/common/FurniCategory.ts
diff --git a/src/views/catalog/common/GetProuductIconUrl.ts b/src/components/catalog/common/GetProuductIconUrl.ts
similarity index 100%
rename from src/views/catalog/common/GetProuductIconUrl.ts
rename to src/components/catalog/common/GetProuductIconUrl.ts
diff --git a/src/views/catalog/common/GiftWrappingConfiguration.ts b/src/components/catalog/common/GiftWrappingConfiguration.ts
similarity index 100%
rename from src/views/catalog/common/GiftWrappingConfiguration.ts
rename to src/components/catalog/common/GiftWrappingConfiguration.ts
diff --git a/src/views/catalog/common/IPurse.ts b/src/components/catalog/common/IPurse.ts
similarity index 100%
rename from src/views/catalog/common/IPurse.ts
rename to src/components/catalog/common/IPurse.ts
diff --git a/src/views/catalog/common/IsCatalogOfferDraggable.ts b/src/components/catalog/common/IsCatalogOfferDraggable.ts
similarity index 100%
rename from src/views/catalog/common/IsCatalogOfferDraggable.ts
rename to src/components/catalog/common/IsCatalogOfferDraggable.ts
diff --git a/src/views/catalog/common/ProductTypeEnum.ts b/src/components/catalog/common/ProductTypeEnum.ts
similarity index 100%
rename from src/views/catalog/common/ProductTypeEnum.ts
rename to src/components/catalog/common/ProductTypeEnum.ts
diff --git a/src/views/catalog/common/Purse.ts b/src/components/catalog/common/Purse.ts
similarity index 100%
rename from src/views/catalog/common/Purse.ts
rename to src/components/catalog/common/Purse.ts
diff --git a/src/views/catalog/common/SubscriptionInfo.ts b/src/components/catalog/common/SubscriptionInfo.ts
similarity index 100%
rename from src/views/catalog/common/SubscriptionInfo.ts
rename to src/components/catalog/common/SubscriptionInfo.ts
diff --git a/src/views/catalog/context/CatalogContext.tsx b/src/components/catalog/context/CatalogContext.tsx
similarity index 100%
rename from src/views/catalog/context/CatalogContext.tsx
rename to src/components/catalog/context/CatalogContext.tsx
diff --git a/src/views/catalog/context/CatalogContext.types.ts b/src/components/catalog/context/CatalogContext.types.ts
similarity index 100%
rename from src/views/catalog/context/CatalogContext.types.ts
rename to src/components/catalog/context/CatalogContext.types.ts
diff --git a/src/views/catalog/reducers/CatalogReducer.tsx b/src/components/catalog/reducers/CatalogReducer.tsx
similarity index 100%
rename from src/views/catalog/reducers/CatalogReducer.tsx
rename to src/components/catalog/reducers/CatalogReducer.tsx
diff --git a/src/views/catalog/views/CatalogViews.scss b/src/components/catalog/views/CatalogViews.scss
similarity index 52%
rename from src/views/catalog/views/CatalogViews.scss
rename to src/components/catalog/views/CatalogViews.scss
index f6973ade..d86fa058 100644
--- a/src/views/catalog/views/CatalogViews.scss
+++ b/src/components/catalog/views/CatalogViews.scss
@@ -1,4 +1,10 @@
-@import './catalog-icon/CatalogIconView';
+.catalog-icon-image {
+    width: 20px;
+    height: 20px;
+    min-width: 20px;
+    min-height: 20px;
+}
+
 @import './gift/CatalogGiftView';
 @import './navigation/CatalogNavigationView';
 @import './page/CatalogPageView';
diff --git a/src/components/catalog/views/catalog-icon/CatalogIconView.tsx b/src/components/catalog/views/catalog-icon/CatalogIconView.tsx
new file mode 100644
index 00000000..e287d9cf
--- /dev/null
+++ b/src/components/catalog/views/catalog-icon/CatalogIconView.tsx
@@ -0,0 +1,20 @@
+import { FC, useMemo } from 'react';
+import { GetConfiguration } from '../../../../api';
+import { LayoutImage } from '../../../../common/layout/LayoutImage';
+
+export interface CatalogIconViewProps
+{
+    icon: number;
+}
+
+export const CatalogIconView: FC<CatalogIconViewProps> = props =>
+{
+    const { icon = 0 } = props;
+
+    const getIconUrl = useMemo(() =>
+    {
+        return ((GetConfiguration<string>('catalog.asset.icon.url')).replace('%name%', icon.toString()));
+    }, [ icon ]);
+
+    return <LayoutImage imageUrl={ getIconUrl } fit={ false } className="catalog-icon-image" />;
+}
diff --git a/src/views/catalog/views/catalog-room-previewer/CatalogRoomPreviewerView.tsx b/src/components/catalog/views/catalog-room-previewer/CatalogRoomPreviewerView.tsx
similarity index 88%
rename from src/views/catalog/views/catalog-room-previewer/CatalogRoomPreviewerView.tsx
rename to src/components/catalog/views/catalog-room-previewer/CatalogRoomPreviewerView.tsx
index ee43b2e9..dce973b6 100644
--- a/src/views/catalog/views/catalog-room-previewer/CatalogRoomPreviewerView.tsx
+++ b/src/components/catalog/views/catalog-room-previewer/CatalogRoomPreviewerView.tsx
@@ -3,8 +3,8 @@ import { FC, useCallback, useRef } from 'react';
 import { GetRoomEngine } from '../../../../api';
 import { CatalogEvent } from '../../../../events';
 import { useUiEvent } from '../../../../hooks';
-import { RoomPreviewerView } from '../../../shared/room-previewer/RoomPreviewerView';
-import { RoomPreviewerViewProps } from '../../../shared/room-previewer/RoomPreviewerView.types';
+import { RoomPreviewerView } from '../../../../views/shared/room-previewer/RoomPreviewerView';
+import { RoomPreviewerViewProps } from '../../../../views/shared/room-previewer/RoomPreviewerView.types';
 
 export const CatalogRoomPreviewerView: FC<RoomPreviewerViewProps> = props =>
 {
diff --git a/src/views/catalog/views/gift/CatalogGiftView.scss b/src/components/catalog/views/gift/CatalogGiftView.scss
similarity index 100%
rename from src/views/catalog/views/gift/CatalogGiftView.scss
rename to src/components/catalog/views/gift/CatalogGiftView.scss
diff --git a/src/components/catalog/views/gift/CatalogGiftView.tsx b/src/components/catalog/views/gift/CatalogGiftView.tsx
new file mode 100644
index 00000000..53e65d89
--- /dev/null
+++ b/src/components/catalog/views/gift/CatalogGiftView.tsx
@@ -0,0 +1,241 @@
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { PurchaseFromCatalogAsGiftComposer } from '@nitrots/nitro-renderer';
+import classNames from 'classnames';
+import { FC, useCallback, useEffect, useMemo, useState } from 'react';
+import { GetSessionDataManager, LocalizeText } from '../../../../api';
+import { Button } from '../../../../common/Button';
+import { ButtonGroup } from '../../../../common/ButtonGroup';
+import { Column } from '../../../../common/Column';
+import { Flex } from '../../../../common/Flex';
+import { FormGroup } from '../../../../common/FormGroup';
+import { Text } from '../../../../common/Text';
+import { CatalogEvent } from '../../../../events';
+import { CatalogInitGiftEvent } from '../../../../events/catalog/CatalogInitGiftEvent';
+import { BatchUpdates, SendMessageHook, useUiEvent } from '../../../../hooks';
+import { NitroCardContentView, NitroCardHeaderView, NitroCardView, NitroLayoutGiftCardView } from '../../../../layout';
+import { CurrencyIcon } from '../../../../views/shared/currency-icon/CurrencyIcon';
+import { FurniImageView } from '../../../../views/shared/furni-image/FurniImageView';
+import { useCatalogContext } from '../../context/CatalogContext';
+
+export const CatalogGiftView: FC<{}> = props =>
+{
+    const [ isVisible, setIsVisible ] = useState<boolean>(false);
+    const [ pageId, setPageId ] = useState<number>(0);
+    const [ offerId, setOfferId ] = useState<number>(0);
+    const [ receiverName, setReceiverName ] = useState<string>('');
+    const [ showMyFace, setShowMyFace ] = useState<boolean>(true);
+    const [ message, setMessage ] = useState<string>('');
+    const [ colors, setColors ] = useState<{ id: number, color: string }[]>([]);
+    const [ selectedBoxIndex, setSelectedBoxIndex ] = useState<number>(0);
+    const [ selectedRibbonIndex, setSelectedRibbonIndex ] = useState<number>(0);
+    const [ selectedColorId, setSelectedColorId ] = useState<number>(0);
+    const [ maxBoxIndex, setMaxBoxIndex ] = useState<number>(0);
+    const [ maxRibbonIndex, setMaxRibbonIndex ] = useState<number>(0);
+    const [ receiverNotFound, setReceiverNotFound ] = useState<boolean>(false);
+    const { catalogState = null } = useCatalogContext();
+    const { giftConfiguration = null } = catalogState;
+
+    const close = useCallback(() =>
+    {
+        BatchUpdates(() =>
+        {
+            setIsVisible(false);
+            setPageId(0);
+            setOfferId(0);
+            setReceiverName('');
+            setShowMyFace(true);
+            setMessage('');
+            setSelectedBoxIndex(0);
+            setSelectedRibbonIndex(0);
+            
+            if(colors.length) setSelectedColorId(colors[0].id);
+        });
+    }, [ colors ]);
+
+    const onCatalogEvent = useCallback((event: CatalogEvent) =>
+    {
+        switch(event.type)
+        {
+            case CatalogEvent.PURCHASE_SUCCESS:
+                close();
+                return;
+            case CatalogEvent.INIT_GIFT:
+                const castedEvent = (event as CatalogInitGiftEvent);
+
+                BatchUpdates(() =>
+                {
+                    close();
+                    
+                    setPageId(castedEvent.pageId);
+                    setOfferId(castedEvent.offerId);
+                    setIsVisible(true);
+                });
+                return;
+            case CatalogEvent.GIFT_RECEIVER_NOT_FOUND:
+                setReceiverNotFound(true);
+                return;
+        }
+    }, [ close ]);
+
+    useUiEvent(CatalogEvent.PURCHASE_SUCCESS, onCatalogEvent);
+    useUiEvent(CatalogEvent.INIT_GIFT, onCatalogEvent);
+    useUiEvent(CatalogEvent.GIFT_RECEIVER_NOT_FOUND, onCatalogEvent);
+
+    const isBoxDefault = useMemo(() =>
+    {
+        return giftConfiguration ? (giftConfiguration.defaultStuffTypes.findIndex(s => (s === giftConfiguration.boxTypes[selectedBoxIndex])) > -1) : true;
+    }, [ giftConfiguration, selectedBoxIndex ]);
+
+    const extraData = useMemo(() =>
+    {
+        if(!giftConfiguration) return '';
+
+        return ((giftConfiguration.boxTypes[selectedBoxIndex] * 1000) + giftConfiguration.ribbonTypes[selectedRibbonIndex]).toString();
+    }, [ giftConfiguration, selectedBoxIndex, selectedRibbonIndex ]);
+
+    const isColorable = useMemo(() =>
+    {
+        if(!giftConfiguration) return false;
+        
+        const boxType = giftConfiguration.boxTypes[selectedBoxIndex];
+
+        return (boxType === 8 || (boxType >= 3 && boxType <= 6)) ? false : true;
+    }, [ giftConfiguration, selectedBoxIndex ]);
+
+    const handleAction = useCallback((action: string) =>
+    {
+        switch(action)
+        {
+            case 'prev_box':
+                setSelectedBoxIndex(value => (value === 0 ? maxBoxIndex : value - 1));
+                return;
+            case 'next_box':
+                setSelectedBoxIndex(value => (value === maxBoxIndex ? 0 : value + 1));
+                return;
+            case 'prev_ribbon':
+                setSelectedRibbonIndex(value => (value === 0 ? maxRibbonIndex : value - 1));
+                return;
+            case 'next_ribbon':
+                setSelectedRibbonIndex(value => (value === maxRibbonIndex ? 0 : value + 1));
+                return;
+            case 'buy':
+                if(!receiverName || (receiverName.length === 0))
+                {
+                    setReceiverNotFound(true);
+                    return;
+                }
+                
+                SendMessageHook(new PurchaseFromCatalogAsGiftComposer(pageId, offerId, extraData, receiverName, message, selectedColorId, selectedBoxIndex, selectedRibbonIndex, showMyFace));
+                return;
+        }
+    }, [ extraData, maxBoxIndex, maxRibbonIndex, message, offerId, pageId, receiverName, selectedBoxIndex, selectedColorId, selectedRibbonIndex, showMyFace ]);
+
+    useEffect(() =>
+    {
+        setReceiverNotFound(false);
+    }, [ receiverName ]);
+
+    useEffect(() =>
+    {
+        if(!giftConfiguration) return;
+
+        const newColors: { id: number, color: string }[] = [];
+
+        for(const colorId of giftConfiguration.stuffTypes)
+        {
+            const giftData = GetSessionDataManager().getFloorItemData(colorId);
+
+            if(!giftData) continue;
+
+            if(giftData.colors && giftData.colors.length > 0) newColors.push({ id: colorId, color: `#${giftData.colors[0].toString(16)}` });
+        }
+
+        BatchUpdates(() =>
+        {
+            setMaxBoxIndex(giftConfiguration.boxTypes.length - 1);
+            setMaxRibbonIndex(giftConfiguration.ribbonTypes.length - 1);
+
+            if(newColors.length)
+            {
+                setSelectedColorId(newColors[0].id);
+                setColors(newColors);
+            }
+        });
+    }, [ giftConfiguration ]);
+
+    if(!giftConfiguration || !giftConfiguration.isEnabled || !isVisible) return null;
+
+    const boxName = 'catalog.gift_wrapping_new.box.' + (isBoxDefault ? 'default' : selectedBoxIndex);
+    const ribbonName = `catalog.gift_wrapping_new.ribbon.${ selectedRibbonIndex }`;
+    const priceText = 'catalog.gift_wrapping_new.' + (isBoxDefault ? 'freeprice' : 'price');
+
+    return (
+        <NitroCardView uniqueKey="catalog-gift" className="nitro-catalog-gift" simple={ true }>
+            <NitroCardHeaderView headerText={ LocalizeText('catalog.gift_wrapping.title') } onCloseClick={ close } />
+            <NitroCardContentView className="text-black">
+                <FormGroup column>
+                    <Text>{ LocalizeText('catalog.gift_wrapping.receiver') }</Text>
+                    <input type="text" className={ 'form-control form-control-sm' + classNames({ ' is-invalid': receiverNotFound }) } value={ receiverName } onChange={ (e) => setReceiverName(e.target.value) } />
+                    { receiverNotFound && <div className="invalid-feedback">{ LocalizeText('catalog.gift_wrapping.receiver_not_found.title') }</div> }
+                </FormGroup>
+                <NitroLayoutGiftCardView figure={ GetSessionDataManager().figure } userName={ GetSessionDataManager().userName } message={ message } editable={ true } onChange={ (value) => setMessage(value) } />
+                <div className="form-check">
+                    <input className="form-check-input" type="checkbox" name="showMyFace" checked={ showMyFace } onChange={ (e) => setShowMyFace(value => !value) } />
+                    <label className="form-check-label">{ LocalizeText('catalog.gift_wrapping.show_face.title') }</label>
+                </div>
+                <Flex alignItems="center" gap={ 2 }>
+                    { selectedColorId &&
+                        <div className="gift-preview">
+                            <FurniImageView spriteId={ selectedColorId } type="s" extras={ extraData } />
+                        </div> }
+                    <Column gap={ 1 }>
+                        <Flex gap={ 2 }>
+                            <ButtonGroup>
+                                <Button variant="primary" onClick={ () => handleAction('prev_box') }>
+                                    <FontAwesomeIcon icon="chevron-left" />
+                                </Button>
+                                <Button variant="primary" onClick={ () => handleAction('next_box') }>
+                                    <FontAwesomeIcon icon="chevron-right" />
+                                </Button>
+                            </ButtonGroup>
+                            <Column gap={ 1 }>
+                                <Text fontWeight="bold">{ LocalizeText(boxName) }</Text>
+                                <Flex alignItems="center" gap={ 1 }>
+                                    { LocalizeText(priceText, ['price'], [giftConfiguration.price.toString()]) }
+                                    <CurrencyIcon type={ -1 } />
+                                </Flex>
+                            </Column>
+                        </Flex>
+                        <Flex alignItems="center" gap={ 2 }>
+                            <ButtonGroup>
+                                <Button variant="primary" onClick={ () => handleAction('prev_ribbon') }>
+                                    <FontAwesomeIcon icon="chevron-left" />
+                                </Button>
+                                <Button variant="primary" onClick={ () => handleAction('next_ribbon') }>
+                                    <FontAwesomeIcon icon="chevron-right" />
+                                </Button>
+                            </ButtonGroup>
+                            <Text fontWeight="bold">{ LocalizeText(ribbonName) }</Text>
+                        </Flex>
+                    </Column>
+                </Flex>
+                <Column gap={ 1 }>
+                    <Text fontWeight="bold">
+                        { LocalizeText('catalog.gift_wrapping.pick_color') }
+                    </Text>
+                    <ButtonGroup fullWidth>
+                        { colors.map(color => <Button key={ color.id } variant="dark" size="sm" active={ (color.id === selectedColorId) } disabled={ !isColorable } style={{ backgroundColor: color.color }} onClick={ () => setSelectedColorId(color.id) } />) }
+                    </ButtonGroup>
+                </Column>
+                <Flex justifyContent="between" alignItems="center">
+                    <Button variant="link" onClick={ close } className="text-black">
+                        { LocalizeText('cancel') }
+                    </Button>
+                    <Button variant="success" onClick={ () => handleAction('buy') }>
+                        { LocalizeText('catalog.gift_wrapping.give_gift') }
+                    </Button>
+                </Flex>
+            </NitroCardContentView>
+        </NitroCardView>
+    );
+};
diff --git a/src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx b/src/components/catalog/views/navigation/CatalogNavigationItemView.tsx
similarity index 64%
rename from src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx
rename to src/components/catalog/views/navigation/CatalogNavigationItemView.tsx
index f618c0e1..b35e02b3 100644
--- a/src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx
+++ b/src/components/catalog/views/navigation/CatalogNavigationItemView.tsx
@@ -1,12 +1,22 @@
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { GetCatalogPageComposer, INodeData } from '@nitrots/nitro-renderer';
-import { FC, useCallback, useEffect, useState } from 'react';
-import { SendMessageHook } from '../../../../../hooks/messages/message-event';
-import { NitroCardGridItemView } from '../../../../../layout';
-import { CatalogMode } from '../../../CatalogView.types';
-import { CatalogIconView } from '../../catalog-icon/CatalogIconView';
-import { ACTIVE_PAGES } from '../CatalogNavigationView';
-import { CatalogNavigationSetView } from '../set/CatalogNavigationSetView';
-import { CatalogNavigationItemViewProps } from './CatalogNavigationItemView.types';
+import { Dispatch, FC, SetStateAction, useCallback, useEffect, useState } from 'react';
+import { LayoutGridItem } from '../../../../common/layout/LayoutGridItem';
+import { Text } from '../../../../common/Text';
+import { SendMessageHook } from '../../../../hooks/messages/message-event';
+import { CatalogMode } from '../../common/CatalogMode';
+import { CatalogIconView } from '../catalog-icon/CatalogIconView';
+import { CatalogNavigationSetView } from './CatalogNavigationSetView';
+import { ACTIVE_PAGES } from './CatalogNavigationView';
+
+export interface CatalogNavigationItemViewProps
+{
+    page: INodeData;
+    isActive: boolean;
+    pendingTree: INodeData[];
+    setPendingTree: Dispatch<SetStateAction<INodeData[]>>;
+    setActiveChild: Dispatch<SetStateAction<INodeData>>;
+}
 
 export const CatalogNavigationItemView: FC<CatalogNavigationItemViewProps> = props =>
 {
@@ -72,11 +82,12 @@ export const CatalogNavigationItemView: FC<CatalogNavigationItemViewProps> = pro
     
     return (
         <>
-            <NitroCardGridItemView itemActive={ isActive } onClick={ event => select(page) }>
+            <LayoutGridItem column={ false } itemActive={ isActive } onClick={ event => select(page) }>
                 <CatalogIconView icon={ page.icon } />
-                <div className="flex-grow-1 text-black text-truncate">{ page.localization }</div>
-                { (page.children.length > 0) && <i className={ 'fas fa-caret-' + (isExpanded ? 'up' : 'down') } /> }
-            </NitroCardGridItemView>
+                <Text grow truncate>{ page.localization }</Text>
+                { (page.children.length > 0) &&
+                    <FontAwesomeIcon icon={ isExpanded ? 'caret-up' : 'caret-down' } /> }
+            </LayoutGridItem>
             { isActive && isExpanded && page.children && (page.children.length > 0) &&
                 <CatalogNavigationSetView page={ page } pendingTree={ pendingTree } setPendingTree={ setPendingTree } /> }
         </>
diff --git a/src/views/catalog/views/navigation/set/CatalogNavigationSetView.tsx b/src/components/catalog/views/navigation/CatalogNavigationSetView.tsx
similarity index 78%
rename from src/views/catalog/views/navigation/set/CatalogNavigationSetView.tsx
rename to src/components/catalog/views/navigation/CatalogNavigationSetView.tsx
index 3d6199a1..ce52208f 100644
--- a/src/views/catalog/views/navigation/set/CatalogNavigationSetView.tsx
+++ b/src/components/catalog/views/navigation/CatalogNavigationSetView.tsx
@@ -1,7 +1,14 @@
 import { INodeData } from '@nitrots/nitro-renderer';
-import { FC, useEffect, useState } from 'react';
-import { CatalogNavigationItemView } from '../item/CatalogNavigationItemView';
-import { CatalogNavigationSetViewProps } from './CatalogNavigationSetView.types';
+import { Dispatch, FC, SetStateAction, useEffect, useState } from 'react';
+import { CatalogNavigationItemView } from './CatalogNavigationItemView';
+
+export interface CatalogNavigationSetViewProps
+{
+    page: INodeData;
+    isFirstSet?: boolean;
+    pendingTree: INodeData[];
+    setPendingTree: Dispatch<SetStateAction<INodeData[]>>;
+}
 
 export const CatalogNavigationSetView: FC<CatalogNavigationSetViewProps> = props =>
 {
diff --git a/src/views/catalog/views/navigation/CatalogNavigationView.scss b/src/components/catalog/views/navigation/CatalogNavigationView.scss
similarity index 90%
rename from src/views/catalog/views/navigation/CatalogNavigationView.scss
rename to src/components/catalog/views/navigation/CatalogNavigationView.scss
index d76fdbf9..38161d9f 100644
--- a/src/views/catalog/views/navigation/CatalogNavigationView.scss
+++ b/src/components/catalog/views/navigation/CatalogNavigationView.scss
@@ -4,7 +4,7 @@
     background-color: #CDD3D9;
     border: 2px solid;
 
-    .grid-item {
+    .layout-grid-item {
         font-size: $font-size-sm;
         height: 23px !important;
         border-color: unset !important;
@@ -12,7 +12,7 @@
         border: 0 !important;
         padding: 1px 3px;
 
-        i.fas {
+        .svg-inline--fa {
             color: $black;
             font-size: 10px;
             padding: 1px;
diff --git a/src/views/catalog/views/navigation/CatalogNavigationView.tsx b/src/components/catalog/views/navigation/CatalogNavigationView.tsx
similarity index 52%
rename from src/views/catalog/views/navigation/CatalogNavigationView.tsx
rename to src/components/catalog/views/navigation/CatalogNavigationView.tsx
index 4ee356ec..aaa4ed9d 100644
--- a/src/views/catalog/views/navigation/CatalogNavigationView.tsx
+++ b/src/components/catalog/views/navigation/CatalogNavigationView.tsx
@@ -1,9 +1,16 @@
 import { INodeData } from '@nitrots/nitro-renderer';
-import { FC, useEffect } from 'react';
-import { NitroCardGridView, NitroLayoutFlexColumn } from '../../../../layout';
+import { Dispatch, FC, SetStateAction, useEffect } from 'react';
+import { Column } from '../../../../common/Column';
+import { Grid } from '../../../../common/Grid';
 import { CatalogSearchView } from '../search/CatalogSearchView';
-import { CatalogNavigationViewProps } from './CatalogNavigationView.types';
-import { CatalogNavigationSetView } from './set/CatalogNavigationSetView';
+import { CatalogNavigationSetView } from './CatalogNavigationSetView';
+
+export interface CatalogNavigationViewProps
+{
+    page: INodeData;
+    pendingTree: INodeData[];
+    setPendingTree: Dispatch<SetStateAction<INodeData[]>>;
+}
 
 export let ACTIVE_PAGES: INodeData[] = [];
 
@@ -24,13 +31,13 @@ export const CatalogNavigationView: FC<CatalogNavigationViewProps> = props =>
     }, [ page ]);
     
     return (
-        <NitroLayoutFlexColumn className="h-100" gap={ 2 } overflow="auto">
+        <>
             <CatalogSearchView />
-            <NitroLayoutFlexColumn className="nitro-catalog-navigation-grid-container p-1 h-100" overflow="hidden">
-                <NitroCardGridView columns={ 1 } gap={ 1 }>
+            <Column fullHeight className="nitro-catalog-navigation-grid-container p-1" overflow="hidden">
+                <Grid grow columnCount={ 1 } gap={ 1 } overflow="auto">
                     <CatalogNavigationSetView page={ page } isFirstSet={ true } pendingTree={ pendingTree } setPendingTree={ setPendingTree } />
-                </NitroCardGridView>
-            </NitroLayoutFlexColumn>
-        </NitroLayoutFlexColumn>
+                </Grid>
+            </Column>
+        </>
     );
 }
diff --git a/src/views/catalog/views/page-details/CatalogPageDetailsView.tsx b/src/components/catalog/views/page-details/CatalogPageDetailsView.tsx
similarity index 100%
rename from src/views/catalog/views/page-details/CatalogPageDetailsView.tsx
rename to src/components/catalog/views/page-details/CatalogPageDetailsView.tsx
diff --git a/src/views/catalog/views/page-details/CatalogPageDetailsView.types.ts b/src/components/catalog/views/page-details/CatalogPageDetailsView.types.ts
similarity index 100%
rename from src/views/catalog/views/page-details/CatalogPageDetailsView.types.ts
rename to src/components/catalog/views/page-details/CatalogPageDetailsView.types.ts
diff --git a/src/views/catalog/views/page/CatalogPageView.scss b/src/components/catalog/views/page/CatalogPageView.scss
similarity index 100%
rename from src/views/catalog/views/page/CatalogPageView.scss
rename to src/components/catalog/views/page/CatalogPageView.scss
diff --git a/src/views/catalog/views/page/CatalogPageView.tsx b/src/components/catalog/views/page/CatalogPageView.tsx
similarity index 95%
rename from src/views/catalog/views/page/CatalogPageView.tsx
rename to src/components/catalog/views/page/CatalogPageView.tsx
index fe1e45fe..9ca30aa4 100644
--- a/src/views/catalog/views/page/CatalogPageView.tsx
+++ b/src/components/catalog/views/page/CatalogPageView.tsx
@@ -1,4 +1,4 @@
-import { CatalogPageMessageOfferData, IObjectData, Vector3d } from '@nitrots/nitro-renderer';
+import { CatalogPageMessageOfferData, IObjectData, RoomPreviewer, Vector3d } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { GetAvatarRenderManager, GetFurnitureDataForProductOffer, GetSessionDataManager } from '../../../../api';
 import { SetRoomPreviewerStuffDataEvent } from '../../../../events';
@@ -6,10 +6,14 @@ import { useUiEvent } from '../../../../hooks';
 import { FurniCategory } from '../../common/FurniCategory';
 import { ProductTypeEnum } from '../../common/ProductTypeEnum';
 import { useCatalogContext } from '../../context/CatalogContext';
-import { CatalogPageViewProps } from './CatalogPageView.types';
 import { GetCatalogLayout } from './layout/GetCatalogLayout';
 import { CatalogLayoutSearchResultView } from './search-result/CatalogLayoutSearchResultView';
 
+export interface CatalogPageViewProps
+{
+    roomPreviewer: RoomPreviewer;
+}
+
 export const CatalogPageView: FC<CatalogPageViewProps> = props =>
 {
     const { roomPreviewer = null } = props;
@@ -22,6 +26,9 @@ export const CatalogPageView: FC<CatalogPageViewProps> = props =>
         if(!offer || !roomPreviewer) return;
 
         const product = offer.products[0];
+
+        if(!product) return;
+
         const furniData = GetFurnitureDataForProductOffer(product);
 
         if(!furniData && (product.productType !== ProductTypeEnum.ROBOT)) return;
diff --git a/src/components/catalog/views/page/layout/CatalogLayout.scss b/src/components/catalog/views/page/layout/CatalogLayout.scss
new file mode 100644
index 00000000..2d8db51f
--- /dev/null
+++ b/src/components/catalog/views/page/layout/CatalogLayout.scss
@@ -0,0 +1,32 @@
+.nitro-catalog-layout-info-loyalty {
+
+    .info-loyalty-content {
+        background-repeat: no-repeat;
+        background-position: top right;
+        background-image: url('../../../../../assets/images/catalog/diamond_info_illustration.gif');
+        padding-right:123px;
+    }
+
+    .info-image {
+        width: 123px;
+        height:350px;
+        background-image: url('../../../../../assets/images/catalog/diamond_info_illustration.gif');
+    }
+}
+
+.nitro-catalog-layout-vip-buy-grid {
+
+    .layout-grid-item {
+        height: 50px !important;
+        max-height: 50px !important;
+
+        .icon-hc-banner {
+            width: 68px;
+            height: 40px;
+            background: url("../../../../../assets/images/catalog/hc_big.png") center no-repeat;
+        }
+    }
+}
+
+@import './marketplace/marketplace-item/MarketplaceItemView';
+@import './marketplace/post-offer/MarketplacePostOfferView';
diff --git a/src/views/catalog/views/page/layout/CatalogLayout.types.ts b/src/components/catalog/views/page/layout/CatalogLayout.types.ts
similarity index 100%
rename from src/views/catalog/views/page/layout/CatalogLayout.types.ts
rename to src/components/catalog/views/page/layout/CatalogLayout.types.ts
diff --git a/src/views/catalog/views/page/layout/GetCatalogLayout.tsx b/src/components/catalog/views/page/layout/GetCatalogLayout.tsx
similarity index 100%
rename from src/views/catalog/views/page/layout/GetCatalogLayout.tsx
rename to src/components/catalog/views/page/layout/GetCatalogLayout.tsx
diff --git a/src/views/catalog/views/page/layout/badge-display/CatalogLayoutBadgeDisplayView.tsx b/src/components/catalog/views/page/layout/badge-display/CatalogLayoutBadgeDisplayView.tsx
similarity index 58%
rename from src/views/catalog/views/page/layout/badge-display/CatalogLayoutBadgeDisplayView.tsx
rename to src/components/catalog/views/page/layout/badge-display/CatalogLayoutBadgeDisplayView.tsx
index 38156bd6..78703c6e 100644
--- a/src/views/catalog/views/page/layout/badge-display/CatalogLayoutBadgeDisplayView.tsx
+++ b/src/components/catalog/views/page/layout/badge-display/CatalogLayoutBadgeDisplayView.tsx
@@ -1,28 +1,26 @@
 import { StringDataType } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { LocalizeText } from '../../../../../../api';
+import { Column } from '../../../../../../common/Column';
+import { Grid } from '../../../../../../common/Grid';
+import { LayoutGridItem } from '../../../../../../common/layout/LayoutGridItem';
+import { Text } from '../../../../../../common/Text';
 import { InventoryBadgesUpdatedEvent, SetRoomPreviewerStuffDataEvent } from '../../../../../../events';
 import { InventoryBadgesRequestEvent } from '../../../../../../events/inventory/InventoryBadgesRequestEvent';
 import { dispatchUiEvent, useUiEvent } from '../../../../../../hooks';
-import { NitroLayoutFlexColumn, NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
-import { NitroLayoutBase } from '../../../../../../layout/base';
-import { NitroCardGridItemView } from '../../../../../../layout/card/grid/item/NitroCardGridItemView';
-import { NitroCardGridView } from '../../../../../../layout/card/grid/NitroCardGridView';
-import { BadgeImageView } from '../../../../../shared/badge-image/BadgeImageView';
+import { BadgeImageView } from '../../../../../../views/shared/badge-image/BadgeImageView';
 import { useCatalogContext } from '../../../../context/CatalogContext';
 import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView';
 import { CatalogProductPreviewView } from '../../product-preview/CatalogProductPreviewView';
-import { CatalogLayoutBadgeDisplayViewProps } from './CatalogLayoutBadgeDisplayView.types';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
 
-export const CatalogLayoutBadgeDisplayView: FC<CatalogLayoutBadgeDisplayViewProps> = props =>
+export const CatalogLayoutBadgeDisplayView: FC<CatalogLayoutProps> = props =>
 {
     const { roomPreviewer = null, pageParser = null } = props;
-    const { catalogState = null, dispatchCatalogState = null } = useCatalogContext();
-    const { activeOffer = null } = catalogState;
     const [ badges, setBadges ] = useState<string[]>([]);
     const [ currentBadge, setCurrentBadge ] = useState<string>(null);
-
-    const product = ((activeOffer && activeOffer.products[0]) || null);
+    const { catalogState = null } = useCatalogContext();
+    const { activeOffer = null } = catalogState;
 
     const onInventoryBadgesUpdatedEvent = useCallback((event: InventoryBadgesUpdatedEvent) =>
     {
@@ -55,26 +53,26 @@ export const CatalogLayoutBadgeDisplayView: FC<CatalogLayoutBadgeDisplayViewProp
     }, [ currentBadge, activeOffer, roomPreviewer ]);
 
     return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn size={ 7 }>
-                <CatalogPageOffersView className="flex-shrink-0" offers={ pageParser.offers } />
-                <NitroLayoutFlexColumn gap={ 1 } overflow="hidden">
-                    <NitroLayoutBase className="flex-shrink-0 fw-bold text-black text-truncate">{ LocalizeText('catalog_selectbadge') }</NitroLayoutBase>
-                    <NitroCardGridView>
+        <Grid>
+            <Column size={ 7 } overflow="hidden">
+                <CatalogPageOffersView shrink offers={ pageParser.offers } />
+                <Column gap={ 1 } overflow="hidden">
+                    <Text truncate shrink fontWeight="bold">{ LocalizeText('catalog_selectbadge') }</Text>
+                    <Grid grow columnCount={ 5 } overflow="auto">
                         { badges && (badges.length > 0) && badges.map(code =>
                             {
                                 return (
-                                    <NitroCardGridItemView key={ code } itemActive={ (currentBadge === code) } onMouseDown={ event => setCurrentBadge(code) }> 
+                                    <LayoutGridItem key={ code } itemActive={ (currentBadge === code) } onMouseDown={ event => setCurrentBadge(code) }> 
                                         <BadgeImageView badgeCode={ code } />
-                                    </NitroCardGridItemView>
+                                    </LayoutGridItem>
                                 );
                             }) }
-                    </NitroCardGridView>
-                </NitroLayoutFlexColumn>
-            </NitroLayoutGridColumn>
-            <NitroLayoutGridColumn size={ 5 }>
+                    </Grid>
+                </Column>
+            </Column>
+            <Column size={ 5 } overflow="hidden">
                 <CatalogProductPreviewView pageParser={ pageParser } activeOffer={ activeOffer } roomPreviewer={ roomPreviewer } extra={ currentBadge } disabled={ !currentBadge } />
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
+            </Column>
+        </Grid>
     );
 }
diff --git a/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx b/src/components/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx
similarity index 55%
rename from src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx
rename to src/components/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx
index 1ec8d867..6f3595c3 100644
--- a/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx
+++ b/src/components/catalog/views/page/layout/default/CatalogLayoutDefaultView.tsx
@@ -1,26 +1,25 @@
 import { FC } from 'react';
-import { NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
+import { Column } from '../../../../../../common/Column';
+import { Grid } from '../../../../../../common/Grid';
 import { useCatalogContext } from '../../../../context/CatalogContext';
 import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView';
 import { CatalogProductPreviewView } from '../../product-preview/CatalogProductPreviewView';
-import { CatalogLayoutDefaultViewProps } from './CatalogLayoutDefaultView.types';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
 
-export const CatalogLayoutDefaultView: FC<CatalogLayoutDefaultViewProps> = props =>
+export const CatalogLayoutDefaultView: FC<CatalogLayoutProps> = props =>
 {
     const { roomPreviewer = null, pageParser = null } = props;
     const { catalogState = null } = useCatalogContext();
     const { activeOffer = null } = catalogState;
 
-    const product = ((activeOffer && activeOffer.products[0]) || null);
-
     return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn size={ 7 }>
+        <Grid>
+            <Column size={ 7 } overflow="hidden">
                 <CatalogPageOffersView offers={ pageParser.offers } />
-            </NitroLayoutGridColumn>
-            <NitroLayoutGridColumn size={ 5 }>
+            </Column>
+            <Column size={ 5 } overflow="hidden">
                 <CatalogProductPreviewView pageParser={ pageParser } activeOffer={ activeOffer } roomPreviewer={ roomPreviewer } />
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
+            </Column>
+        </Grid>
     );
 }
diff --git a/src/components/catalog/views/page/layout/frontpage4/CatalogLayoutFrontPageItemView.tsx b/src/components/catalog/views/page/layout/frontpage4/CatalogLayoutFrontPageItemView.tsx
new file mode 100644
index 00000000..8ce38aac
--- /dev/null
+++ b/src/components/catalog/views/page/layout/frontpage4/CatalogLayoutFrontPageItemView.tsx
@@ -0,0 +1,37 @@
+import { FrontPageItem } from '@nitrots/nitro-renderer';
+import { FC, useMemo } from 'react';
+import { GetConfiguration } from '../../../../../../api';
+import { LayoutImage, LayoutImageProps } from '../../../../../../common/layout/LayoutImage';
+import { Text } from '../../../../../../common/Text';
+
+export interface CatalogLayoutFrontPageItemViewProps extends LayoutImageProps
+{
+    item: FrontPageItem;
+}
+
+export const CatalogLayoutFrontPageItemView: FC<CatalogLayoutFrontPageItemViewProps> = props =>
+{
+    const { item = null, position = 'relative', pointer = true, overflow = 'hidden', fullHeight = true, classNames = [], children = null, ...rest } = props;
+
+    const getClassNames = useMemo(() =>
+    {
+        const newClassNames: string[] = [ 'rounded', 'nitro-front-page-item' ];
+
+        if(classNames.length) newClassNames.push(...classNames);
+
+        return newClassNames;
+    }, [ classNames ]);
+
+    if(!item) return null;
+
+    const imageUrl = (GetConfiguration<string>('image.library.url') + item.itemPromoImage);
+
+    return (
+        <LayoutImage imageUrl={ imageUrl } classNames={ getClassNames } position={ position } fullHeight={ fullHeight } pointer={ pointer } overflow={ overflow } { ...rest }>
+            <Text position="absolute" variant="white" className="bg-dark rounded p-2 m-2 bottom-0">
+                { item.itemName }
+            </Text>
+            { children }
+        </LayoutImage>
+    );
+}
diff --git a/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.tsx b/src/components/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.tsx
similarity index 64%
rename from src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.tsx
rename to src/components/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.tsx
index 9f04e00e..a331a151 100644
--- a/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.tsx
+++ b/src/components/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.tsx
@@ -1,22 +1,17 @@
 import { FrontPageItem } from '@nitrots/nitro-renderer';
-import { FC, useCallback, useMemo } from 'react';
-import { CreateLinkEvent, GetConfiguration } from '../../../../../../api';
-import { NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
+import { FC, useCallback } from 'react';
+import { CreateLinkEvent } from '../../../../../../api';
+import { Column } from '../../../../../../common/Column';
+import { Grid } from '../../../../../../common/Grid';
 import { GetCatalogPageText } from '../../../../common/CatalogUtilities';
 import { CatalogRedeemVoucherView } from '../../redeem-voucher/CatalogRedeemVoucherView';
-import { CatalogLayoutFrontpage4ViewProps } from './CatalogLayoutFrontpage4View.types';
-import { CatalogLayoutFrontPageItemView } from './item/CatalogLayoutFrontPageItemView';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
+import { CatalogLayoutFrontPageItemView } from './CatalogLayoutFrontPageItemView';
 
-export const CatalogLayoutFrontpage4View: FC<CatalogLayoutFrontpage4ViewProps> = props =>
+export const CatalogLayoutFrontpage4View: FC<CatalogLayoutProps> = props =>
 {
     const { pageParser = null } = props;
 
-    const imageLibraryUrl = useMemo(() =>
-    {
-        console.log(pageParser);
-        return GetConfiguration<string>('image.library.url');
-    }, []);
-
     const selectItem = useCallback((item: FrontPageItem) =>
     {
         switch(item.type)
@@ -30,15 +25,13 @@ export const CatalogLayoutFrontpage4View: FC<CatalogLayoutFrontpage4ViewProps> =
         }
     }, []);
 
-    if(!pageParser) return null;
-
     return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn size={ 4 }>
+        <Grid>
+            <Column size={ 4 }>
                 { pageParser.frontPageItems[0] &&
                     <CatalogLayoutFrontPageItemView item={ pageParser.frontPageItems[0] } onClick={ event => selectItem(pageParser.frontPageItems[0]) } /> }
-            </NitroLayoutGridColumn>
-            <NitroLayoutGridColumn size={ 8 }>
+            </Column>
+            <Column size={ 8 }>
                 { pageParser.frontPageItems[1] &&
                     <CatalogLayoutFrontPageItemView item={ pageParser.frontPageItems[1] } onClick={ event => selectItem(pageParser.frontPageItems[1]) } /> }
                 { pageParser.frontPageItems[2] &&
@@ -46,7 +39,7 @@ export const CatalogLayoutFrontpage4View: FC<CatalogLayoutFrontpage4ViewProps> =
                 { pageParser.frontPageItems[3] &&
                     <CatalogLayoutFrontPageItemView item={ pageParser.frontPageItems[3] } onClick={ event => selectItem(pageParser.frontPageItems[3]) } /> }
                 <CatalogRedeemVoucherView text={ GetCatalogPageText(pageParser, 1) } />
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
+            </Column>
+        </Grid>
     );
 }
diff --git a/src/views/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.tsx b/src/components/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.tsx
similarity index 83%
rename from src/views/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.tsx
rename to src/components/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.tsx
index 2ee74233..104d38ff 100644
--- a/src/views/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.tsx
+++ b/src/components/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.tsx
@@ -1,16 +1,17 @@
 import { CatalogGroupsComposer, StringDataType } from '@nitrots/nitro-renderer';
 import { FC, useEffect, useMemo, useState } from 'react';
+import { Column } from '../../../../../../common/Column';
+import { Grid } from '../../../../../../common/Grid';
 import { SetRoomPreviewerStuffDataEvent } from '../../../../../../events';
 import { dispatchUiEvent } from '../../../../../../hooks';
 import { SendMessageHook } from '../../../../../../hooks/messages';
-import { NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
 import { useCatalogContext } from '../../../../context/CatalogContext';
 import { CatalogSelectGroupView } from '../../../select-group/CatalogSelectGroupView';
 import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView';
 import { CatalogProductPreviewView } from '../../product-preview/CatalogProductPreviewView';
-import { CatalogLayoutGuildCustomFurniViewProps } from './CatalogLayoutGuildCustomFurniView.types';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
 
-export const CatalogLayouGuildCustomFurniView: FC<CatalogLayoutGuildCustomFurniViewProps> = props =>
+export const CatalogLayouGuildCustomFurniView: FC<CatalogLayoutProps> = props =>
 {
     const { roomPreviewer = null, pageParser = null } = props;
     const [ selectedGroupIndex, setSelectedGroupIndex ] = useState<number>(0);
@@ -49,15 +50,15 @@ export const CatalogLayouGuildCustomFurniView: FC<CatalogLayoutGuildCustomFurniV
     if(!groups) return null;
     
     return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn size={ 7 }>
+        <Grid>
+            <Column size={ 7 } overflow="hidden">
                 <CatalogPageOffersView offers={ pageParser.offers } />
-            </NitroLayoutGridColumn>
-            <NitroLayoutGridColumn size={ 5 }>
+            </Column>
+            <Column size={ 5 } overflow="hidden">
                 <CatalogProductPreviewView pageParser={ pageParser } activeOffer={ activeOffer } roomPreviewer={ roomPreviewer } badgeCode={ ((selectedGroup && selectedGroup.badgeCode) || null) } extra={ groups[selectedGroupIndex] ? groups[selectedGroupIndex].groupId.toString() : '' } disabled={ !(!!groups[selectedGroupIndex]) }>
                     <CatalogSelectGroupView selectedGroupIndex={ selectedGroupIndex } setSelectedGroupIndex={ setSelectedGroupIndex } />
                 </CatalogProductPreviewView>
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
+            </Column>
+        </Grid>
     );
 }
diff --git a/src/views/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.tsx b/src/components/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.tsx
similarity index 67%
rename from src/views/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.tsx
rename to src/components/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.tsx
index c7c3204f..e51a1d4d 100644
--- a/src/views/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.tsx
+++ b/src/components/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.tsx
@@ -1,26 +1,23 @@
 import { CatalogGroupsComposer } from '@nitrots/nitro-renderer';
 import { FC, useEffect, useState } from 'react';
+import { Base } from '../../../../../../common/Base';
+import { Column } from '../../../../../../common/Column';
+import { Grid } from '../../../../../../common/Grid';
 import { SendMessageHook } from '../../../../../../hooks/messages';
-import { NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
-import { NitroLayoutBase } from '../../../../../../layout/base';
 import { GetCatalogPageText } from '../../../../common/CatalogUtilities';
 import { useCatalogContext } from '../../../../context/CatalogContext';
 import { CatalogActions } from '../../../../reducers/CatalogReducer';
 import { CatalogSelectGroupView } from '../../../select-group/CatalogSelectGroupView';
 import { CatalogProductPreviewView } from '../../product-preview/CatalogProductPreviewView';
-import { CatalogLayoutGuildForumViewProps } from './CatalogLayoutGuildForumView.types';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
 
-export const CatalogLayouGuildForumView: FC<CatalogLayoutGuildForumViewProps> = props =>
+export const CatalogLayouGuildForumView: FC<CatalogLayoutProps> = props =>
 {
     const { pageParser = null } = props;
-
+    const [ selectedGroupIndex, setSelectedGroupIndex ] = useState<number>(0);
     const { catalogState = null, dispatchCatalogState = null } = useCatalogContext();
     const { activeOffer = null, groups = null } = catalogState;
 
-    const [ selectedGroupIndex, setSelectedGroupIndex ] = useState<number>(0);
-
-    const product = ((activeOffer && activeOffer.products[0]) || null);
-
     useEffect(() =>
     {
         SendMessageHook(new CatalogGroupsComposer());
@@ -37,15 +34,15 @@ export const CatalogLayouGuildForumView: FC<CatalogLayoutGuildForumViewProps> =
     }, [ dispatchCatalogState, pageParser ]);
     
     return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn className="bg-muted rounded p-2 text-black overflow-hidden" size={ 7 }>
-                <NitroLayoutBase className="overflow-auto" dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 1) } } />
-            </NitroLayoutGridColumn>
-            <NitroLayoutGridColumn size={ 5 }>
+        <Grid>
+            <Column className="bg-muted rounded p-2 text-black" size={ 7 } overflow="hidden">
+                <Base className="overflow-auto" dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 1) } } />
+            </Column>
+            <Column size={ 5 } overflow="hidden">
                 <CatalogProductPreviewView pageParser={ pageParser } activeOffer={ activeOffer } roomPreviewer={ null } extra={ groups[selectedGroupIndex] ? groups[selectedGroupIndex].groupId.toString() : '' } disabled={ !(!!groups[selectedGroupIndex]) }>
                     <CatalogSelectGroupView selectedGroupIndex={ selectedGroupIndex } setSelectedGroupIndex={ setSelectedGroupIndex } />
                 </CatalogProductPreviewView>
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
+            </Column>
+        </Grid>
     );
 }
diff --git a/src/components/catalog/views/page/layout/guild-frontpage/CatalogLayoutGuildFrontpageView.tsx b/src/components/catalog/views/page/layout/guild-frontpage/CatalogLayoutGuildFrontpageView.tsx
new file mode 100644
index 00000000..9412cd1f
--- /dev/null
+++ b/src/components/catalog/views/page/layout/guild-frontpage/CatalogLayoutGuildFrontpageView.tsx
@@ -0,0 +1,30 @@
+import { FC } from 'react';
+import { CreateLinkEvent, LocalizeText } from '../../../../../../api';
+import { Base } from '../../../../../../common/Base';
+import { Button } from '../../../../../../common/Button';
+import { Column } from '../../../../../../common/Column';
+import { Grid } from '../../../../../../common/Grid';
+import { LayoutImage } from '../../../../../../common/layout/LayoutImage';
+import { GetCatalogPageImage, GetCatalogPageText } from '../../../../common/CatalogUtilities';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
+
+export const CatalogLayouGuildFrontpageView: FC<CatalogLayoutProps> = props =>
+{
+    const { pageParser = null } = props;
+    
+    return (
+        <Grid>
+            <Column size={ 7 } overflow="hidden" className="bg-muted rounded p-2 text-black">
+                <Base dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 2) } } />
+                <Base overflow="auto" dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 0) } } />
+                <Base dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 1) } } />
+            </Column>
+            <Column center size={ 5 } overflow="hidden">
+                <LayoutImage imageUrl={ GetCatalogPageImage(pageParser, 1) } />
+                <Button onClick={ () => CreateLinkEvent('groups/create') }>
+                    { LocalizeText('catalog.start.guild.purchase.button') }
+                </Button>
+            </Column>
+        </Grid>
+    );
+}
diff --git a/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx b/src/components/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx
similarity index 72%
rename from src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx
rename to src/components/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx
index 70635763..cb73e286 100644
--- a/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx
+++ b/src/components/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.tsx
@@ -1,8 +1,8 @@
 import { FC } from 'react';
 import { GetCatalogPageText } from '../../../../common/CatalogUtilities';
-import { CatalogLayoutInfoLoyaltyViewProps } from './CatalogLayoutInfoLoyaltyView.types';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
 
-export const CatalogLayoutInfoLoyaltyView: FC<CatalogLayoutInfoLoyaltyViewProps> = props =>
+export const CatalogLayoutInfoLoyaltyView: FC<CatalogLayoutProps> = props =>
 {
     const { pageParser = null } = props;
     
diff --git a/src/views/catalog/views/page/layout/marketplace/common/IMarketplaceSearchOptions.ts b/src/components/catalog/views/page/layout/marketplace/common/IMarketplaceSearchOptions.ts
similarity index 100%
rename from src/views/catalog/views/page/layout/marketplace/common/IMarketplaceSearchOptions.ts
rename to src/components/catalog/views/page/layout/marketplace/common/IMarketplaceSearchOptions.ts
diff --git a/src/views/catalog/views/page/layout/marketplace/common/MarketplaceConfirmType.ts b/src/components/catalog/views/page/layout/marketplace/common/MarketplaceConfirmType.ts
similarity index 100%
rename from src/views/catalog/views/page/layout/marketplace/common/MarketplaceConfirmType.ts
rename to src/components/catalog/views/page/layout/marketplace/common/MarketplaceConfirmType.ts
diff --git a/src/views/catalog/views/page/layout/marketplace/common/MarketplaceOfferData.ts b/src/components/catalog/views/page/layout/marketplace/common/MarketplaceOfferData.ts
similarity index 100%
rename from src/views/catalog/views/page/layout/marketplace/common/MarketplaceOfferData.ts
rename to src/components/catalog/views/page/layout/marketplace/common/MarketplaceOfferData.ts
diff --git a/src/views/catalog/views/page/layout/marketplace/common/MarketplaceOfferState.ts b/src/components/catalog/views/page/layout/marketplace/common/MarketplaceOfferState.ts
similarity index 100%
rename from src/views/catalog/views/page/layout/marketplace/common/MarketplaceOfferState.ts
rename to src/components/catalog/views/page/layout/marketplace/common/MarketplaceOfferState.ts
diff --git a/src/views/catalog/views/page/layout/marketplace/common/MarketplaceSearchType.ts b/src/components/catalog/views/page/layout/marketplace/common/MarketplaceSearchType.ts
similarity index 100%
rename from src/views/catalog/views/page/layout/marketplace/common/MarketplaceSearchType.ts
rename to src/components/catalog/views/page/layout/marketplace/common/MarketplaceSearchType.ts
diff --git a/src/views/catalog/views/page/layout/marketplace/marketplace-item/MarketplaceItemView.scss b/src/components/catalog/views/page/layout/marketplace/marketplace-item/MarketplaceItemView.scss
similarity index 100%
rename from src/views/catalog/views/page/layout/marketplace/marketplace-item/MarketplaceItemView.scss
rename to src/components/catalog/views/page/layout/marketplace/marketplace-item/MarketplaceItemView.scss
diff --git a/src/views/catalog/views/page/layout/marketplace/marketplace-item/MarketplaceItemView.tsx b/src/components/catalog/views/page/layout/marketplace/marketplace-item/MarketplaceItemView.tsx
similarity index 100%
rename from src/views/catalog/views/page/layout/marketplace/marketplace-item/MarketplaceItemView.tsx
rename to src/components/catalog/views/page/layout/marketplace/marketplace-item/MarketplaceItemView.tsx
diff --git a/src/views/catalog/views/page/layout/marketplace/own-items/CatalogLayoutMarketplaceOwnItemsView.tsx b/src/components/catalog/views/page/layout/marketplace/own-items/CatalogLayoutMarketplaceOwnItemsView.tsx
similarity index 95%
rename from src/views/catalog/views/page/layout/marketplace/own-items/CatalogLayoutMarketplaceOwnItemsView.tsx
rename to src/components/catalog/views/page/layout/marketplace/own-items/CatalogLayoutMarketplaceOwnItemsView.tsx
index d76ae6f3..5a68a22a 100644
--- a/src/views/catalog/views/page/layout/marketplace/own-items/CatalogLayoutMarketplaceOwnItemsView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/own-items/CatalogLayoutMarketplaceOwnItemsView.tsx
@@ -4,8 +4,8 @@ import { LocalizeText } from '../../../../../../../api';
 import { BatchUpdates, CreateMessageHook, SendMessageHook, UseMountEffect } from '../../../../../../../hooks';
 import { NitroCardGridView } from '../../../../../../../layout';
 import { NitroLayoutBase } from '../../../../../../../layout/base';
-import { NotificationAlertType } from '../../../../../../notification-center/common/NotificationAlertType';
-import { NotificationUtilities } from '../../../../../../notification-center/common/NotificationUtilities';
+import { NotificationAlertType } from '../../../../../../../views/notification-center/common/NotificationAlertType';
+import { NotificationUtilities } from '../../../../../../../views/notification-center/common/NotificationUtilities';
 import { CatalogLayoutProps } from '../../CatalogLayout.types';
 import { MarketplaceOfferData } from '../common/MarketplaceOfferData';
 import { MarketPlaceOfferState } from '../common/MarketplaceOfferState';
diff --git a/src/views/catalog/views/page/layout/marketplace/post-offer/MarketplacePostOfferView.scss b/src/components/catalog/views/page/layout/marketplace/post-offer/MarketplacePostOfferView.scss
similarity index 100%
rename from src/views/catalog/views/page/layout/marketplace/post-offer/MarketplacePostOfferView.scss
rename to src/components/catalog/views/page/layout/marketplace/post-offer/MarketplacePostOfferView.scss
diff --git a/src/views/catalog/views/page/layout/marketplace/post-offer/MarketplacePostOfferView.tsx b/src/components/catalog/views/page/layout/marketplace/post-offer/MarketplacePostOfferView.tsx
similarity index 96%
rename from src/views/catalog/views/page/layout/marketplace/post-offer/MarketplacePostOfferView.tsx
rename to src/components/catalog/views/page/layout/marketplace/post-offer/MarketplacePostOfferView.tsx
index cef4fae5..27eec7b0 100644
--- a/src/views/catalog/views/page/layout/marketplace/post-offer/MarketplacePostOfferView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/post-offer/MarketplacePostOfferView.tsx
@@ -1,11 +1,11 @@
 import { ImageResult, MakeOfferMessageComposer, Vector3d } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useState } from 'react';
 import { GetRoomEngine, LocalizeText } from '../../../../../../../api';
-import { FurnitureItem } from '../../../../../../../components/inventory/common/FurnitureItem';
 import { CatalogPostMarketplaceOfferEvent } from '../../../../../../../events/catalog/CatalogPostMarketplaceOfferEvent';
 import { SendMessageHook, useUiEvent } from '../../../../../../../hooks';
 import { NitroCardContentView, NitroCardHeaderView, NitroCardView, NitroLayoutFlex } from '../../../../../../../layout';
-import { NotificationUtilities } from '../../../../../../notification-center/common/NotificationUtilities';
+import { NotificationUtilities } from '../../../../../../../views/notification-center/common/NotificationUtilities';
+import { FurnitureItem } from '../../../../../../inventory/common/FurnitureItem';
 
 export const MarketplacePostOfferView : FC<{}> = props =>
 {
diff --git a/src/views/catalog/views/page/layout/marketplace/public-items/CatalogLayoutMarketplacePublicItemsView.tsx b/src/components/catalog/views/page/layout/marketplace/public-items/CatalogLayoutMarketplacePublicItemsView.tsx
similarity index 95%
rename from src/views/catalog/views/page/layout/marketplace/public-items/CatalogLayoutMarketplacePublicItemsView.tsx
rename to src/components/catalog/views/page/layout/marketplace/public-items/CatalogLayoutMarketplacePublicItemsView.tsx
index 69af4473..752d52b7 100644
--- a/src/views/catalog/views/page/layout/marketplace/public-items/CatalogLayoutMarketplacePublicItemsView.tsx
+++ b/src/components/catalog/views/page/layout/marketplace/public-items/CatalogLayoutMarketplacePublicItemsView.tsx
@@ -3,9 +3,9 @@ import { FC, useCallback, useMemo, useState } from 'react';
 import { LocalizeText } from '../../../../../../../api';
 import { BatchUpdates, CreateMessageHook, SendMessageHook } from '../../../../../../../hooks';
 import { NitroCardGridView } from '../../../../../../../layout';
-import { NotificationAlertType } from '../../../../../../notification-center/common/NotificationAlertType';
-import { NotificationUtilities } from '../../../../../../notification-center/common/NotificationUtilities';
-import { GetCurrencyAmount } from '../../../../../../purse/common/CurrencyHelper';
+import { NotificationAlertType } from '../../../../../../../views/notification-center/common/NotificationAlertType';
+import { NotificationUtilities } from '../../../../../../../views/notification-center/common/NotificationUtilities';
+import { GetCurrencyAmount } from '../../../../../../../views/purse/common/CurrencyHelper';
 import { CatalogLayoutProps } from '../../CatalogLayout.types';
 import { IMarketplaceSearchOptions } from '../common/IMarketplaceSearchOptions';
 import { MarketplaceOfferData } from '../common/MarketplaceOfferData';
diff --git a/src/views/catalog/views/page/layout/marketplace/public-items/SearchFormView.tsx b/src/components/catalog/views/page/layout/marketplace/public-items/SearchFormView.tsx
similarity index 100%
rename from src/views/catalog/views/page/layout/marketplace/public-items/SearchFormView.tsx
rename to src/components/catalog/views/page/layout/marketplace/public-items/SearchFormView.tsx
diff --git a/src/components/catalog/views/page/layout/pets/CatalogLayoutPetPurchaseView.tsx b/src/components/catalog/views/page/layout/pets/CatalogLayoutPetPurchaseView.tsx
new file mode 100644
index 00000000..790a7635
--- /dev/null
+++ b/src/components/catalog/views/page/layout/pets/CatalogLayoutPetPurchaseView.tsx
@@ -0,0 +1,75 @@
+import { ApproveNameMessageComposer, CatalogPageMessageOfferData } from '@nitrots/nitro-renderer';
+import { FC, useCallback, useState } from 'react';
+import { LocalizeText } from '../../../../../../api';
+import { Column } from '../../../../../../common/Column';
+import { Flex } from '../../../../../../common/Flex';
+import { Text } from '../../../../../../common/Text';
+import { CatalogEvent } from '../../../../../../events';
+import { useUiEvent } from '../../../../../../hooks/events/ui/ui-event';
+import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
+import { CurrencyIcon } from '../../../../../../views/shared/currency-icon/CurrencyIcon';
+import { CatalogPurchaseButtonView } from '../../purchase/CatalogPurchaseButtonView';
+import { CatalogPurchaseGiftButtonView } from '../../purchase/CatalogPurchaseGiftButtonView';
+import { CatalogPetNameApprovalView } from './CatalogPetNameApprovalView';
+
+export interface CatalogLayoutPetPurchaseViewProps
+{
+    offer: CatalogPageMessageOfferData;
+    pageId: number;
+    extra?: string;
+}
+
+export const CatalogLayoutPetPurchaseView: FC<CatalogLayoutPetPurchaseViewProps> = props =>
+{
+    const { offer = null, pageId = -1, extra = '' } = props;
+    const [ petNameValue, setPetNameValue ] = useState('');
+    const [ nameApproved, setNameApproved ] = useState(false);
+
+    const onCatalogEvent = useCallback((event: CatalogEvent) =>
+    {
+        switch(event.type)
+        {
+            case CatalogEvent.PURCHASE_SUCCESS:
+                setNameApproved(false);
+                return;
+        }
+    }, []);
+
+    useUiEvent(CatalogEvent.PURCHASE_SUCCESS, onCatalogEvent);
+
+    const beforePurchase = useCallback(() =>
+    {
+        SendMessageHook(new ApproveNameMessageComposer(petNameValue, 1));
+    }, [ petNameValue ]);
+
+    const extraData = `${ petNameValue }\n${ extra }`;
+    
+    return (
+        <Column fullWidth grow justifyContent="end">
+            <div className="d-flex flex-grow-1 justify-content-center align-items-center">
+                <CatalogPetNameApprovalView petNameValue={ petNameValue } setPetNameValue={ setPetNameValue } nameApproved={ nameApproved } setNameApproved={ setNameApproved } />
+            </div>
+            <Flex alignItems="end">
+                <div className="flex-grow-1 align-items-end">
+                    <Text>{ LocalizeText('catalog.bundlewidget.price') }</Text>
+                </div>
+                <Column>
+                    { (offer.priceCredits > 0) &&
+                        <Flex alignItems="center" justifyContent="end" gap={ 1 }>
+                            <Text>{ offer.priceCredits }</Text>
+                            <CurrencyIcon type={ -1 } />
+                        </Flex> }
+                    { (offer.priceActivityPoints > 0) &&
+                        <Flex alignItems="center" justifyContent="end" gap={ 1 }>
+                            <Text>{ offer.priceActivityPoints }</Text>
+                            <CurrencyIcon type={ offer.priceActivityPointsType } />
+                        </Flex> }
+                </Column>
+            </Flex>
+            <Column gap={ 1 }>
+                <CatalogPurchaseButtonView className="btn-sm w-100" offer={ offer } pageId={ pageId } extra={ extraData } quantity={ 1 } isPurchaseAllowed={ nameApproved } beforePurchase={ beforePurchase } />
+                { offer.giftable && <CatalogPurchaseGiftButtonView className="btn-sm w-100 mt-1" offer={ offer } pageId={ pageId } extra={ extraData } disabled={ nameApproved } /> }
+            </Column>
+        </Column>
+    );
+}
diff --git a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx b/src/components/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx
similarity index 65%
rename from src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx
rename to src/components/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx
index 1d4b2ad3..94676c5f 100644
--- a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx
+++ b/src/components/catalog/views/page/layout/pets/CatalogLayoutPetView.tsx
@@ -1,89 +1,35 @@
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { ColorConverter, GetSellablePetPalettesComposer, SellablePetPaletteData } from '@nitrots/nitro-renderer';
 import { FC, useEffect, useMemo, useState } from 'react';
 import { GetProductDataForLocalization, LocalizeText } from '../../../../../../api';
+import { Base } from '../../../../../../common/Base';
+import { Button } from '../../../../../../common/Button';
+import { Column } from '../../../../../../common/Column';
+import { Grid } from '../../../../../../common/Grid';
+import { LayoutGridItem } from '../../../../../../common/layout/LayoutGridItem';
+import { Text } from '../../../../../../common/Text';
+import { BatchUpdates } from '../../../../../../hooks';
 import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
-import { NitroCardGridItemView, NitroCardGridView, NitroLayoutFlexColumn, NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
-import { NitroLayoutBase } from '../../../../../../layout/base';
-import { PetImageView } from '../../../../../shared/pet-image/PetImageView';
+import { PetImageView } from '../../../../../../views/shared/pet-image/PetImageView';
 import { GetPetAvailableColors, GetPetIndexFromLocalization } from '../../../../common/CatalogUtilities';
 import { useCatalogContext } from '../../../../context/CatalogContext';
 import { CatalogActions } from '../../../../reducers/CatalogReducer';
 import { CatalogRoomPreviewerView } from '../../../catalog-room-previewer/CatalogRoomPreviewerView';
 import { CatalogPageDetailsView } from '../../../page-details/CatalogPageDetailsView';
-import { CatalogLayoutPetViewProps } from './CatalogLayoutPetView.types';
-import { CatalogLayoutPetPurchaseView } from './purchase/CatalogLayoutPetPurchaseView';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
+import { CatalogLayoutPetPurchaseView } from './CatalogLayoutPetPurchaseView';
 
-export const CatalogLayoutPetView: FC<CatalogLayoutPetViewProps> = props =>
+export const CatalogLayoutPetView: FC<CatalogLayoutProps> = props =>
 {
     const { roomPreviewer = null, pageParser = null } = props;
-    const { catalogState = null, dispatchCatalogState = null } = useCatalogContext();
-    const { activeOffer = null, petPalettes = [] } = catalogState;
     const [ petIndex, setPetIndex ] = useState(-1);
     const [ sellablePalettes, setSellablePalettes ] = useState<SellablePetPaletteData[]>([]);
     const [ selectedPaletteIndex, setSelectedPaletteIndex ] = useState(-1);
     const [ sellableColors, setSellableColors ] = useState<number[][]>([]);
     const [ selectedColorIndex, setSelectedColorIndex ] = useState(-1);
     const [ colorsShowing, setColorsShowing ] = useState(false);
-
-    useEffect(() =>
-    {
-        if(!pageParser || !pageParser.offers.length) return;
-
-        const offer = pageParser.offers[0];
-
-        dispatchCatalogState({
-            type: CatalogActions.SET_CATALOG_ACTIVE_OFFER,
-            payload: {
-                activeOffer: offer
-            }
-        });
-
-        setPetIndex(GetPetIndexFromLocalization(offer.localizationId));
-        setColorsShowing(false);
-    }, [ pageParser, dispatchCatalogState ]);
-
-    useEffect(() =>
-    {
-        if(!activeOffer) return;
-
-        const productData = GetProductDataForLocalization(activeOffer.localizationId);
-
-        if(!productData) return;
-
-        for(const paletteData of petPalettes)
-        {
-            if(paletteData.breed !== productData.type) continue;
-
-            const palettes: SellablePetPaletteData[] = [];
-
-            for(const palette of paletteData.palettes)
-            {
-                if(!palette.sellable) continue;
-
-                palettes.push(palette);
-            }
-
-            setSelectedPaletteIndex((palettes.length ? 0 : -1));
-            setSellablePalettes(palettes);
-
-            return;
-        }
-
-        setSelectedPaletteIndex(-1);
-        setSellablePalettes([]);
-
-        SendMessageHook(new GetSellablePetPalettesComposer(productData.type));
-    }, [ activeOffer, petPalettes ]);
-
-    useEffect(() =>
-    {
-        if(petIndex === -1) return;
-
-        const colors = GetPetAvailableColors(petIndex, sellablePalettes);
-
-        setSelectedColorIndex((colors.length ? 0 : -1));
-        setSellableColors(colors);
-    }, [ petIndex, sellablePalettes ]);
+    const { catalogState = null, dispatchCatalogState = null } = useCatalogContext();
+    const { activeOffer = null, petPalettes = [] } = catalogState;
 
     const getColor = useMemo(() =>
     {
@@ -92,21 +38,6 @@ export const CatalogLayoutPetView: FC<CatalogLayoutPetViewProps> = props =>
         return sellableColors[selectedColorIndex][0];
     }, [ sellableColors, selectedColorIndex ]);
 
-    useEffect(() =>
-    {
-        if(!roomPreviewer) return;
-
-        roomPreviewer && roomPreviewer.reset(false);
-
-        if((petIndex === -1) || !sellablePalettes.length || (selectedPaletteIndex === -1)) return;
-
-        let petFigureString = `${ petIndex } ${ sellablePalettes[selectedPaletteIndex].paletteId }`;
-
-        if(petIndex <= 7) petFigureString += ` ${ getColor.toString(16) }`;
-
-        roomPreviewer.addPetIntoRoom(petFigureString);
-    }, [ roomPreviewer, petIndex, sellablePalettes, selectedPaletteIndex, getColor ]);
-
     const petBreedName = useMemo(() =>
     {
         if((petIndex === -1) || !sellablePalettes.length || (selectedPaletteIndex === -1)) return '';
@@ -131,56 +62,135 @@ export const CatalogLayoutPetView: FC<CatalogLayoutPetViewProps> = props =>
 
         let colorString = color.toString(16).toUpperCase();
 
-        while(colorString.length < 6)
-        {
-            colorString = ('0' + colorString);
-        }
+        while(colorString.length < 6) colorString = ('0' + colorString);
 
         return `${ paletteId }\n${ colorString }`;
     }, [ sellablePalettes, selectedPaletteIndex, petIndex, sellableColors, selectedColorIndex ]);
 
+    useEffect(() =>
+    {
+        if(!pageParser || !pageParser.offers.length) return;
+
+        const offer = pageParser.offers[0];
+
+        dispatchCatalogState({
+            type: CatalogActions.SET_CATALOG_ACTIVE_OFFER,
+            payload: {
+                activeOffer: offer
+            }
+        });
+
+        BatchUpdates(() =>
+        {
+            setPetIndex(GetPetIndexFromLocalization(offer.localizationId));
+            setColorsShowing(false);
+        });
+    }, [ pageParser, dispatchCatalogState ]);
+
+    useEffect(() =>
+    {
+        if(!activeOffer) return;
+
+        const productData = GetProductDataForLocalization(activeOffer.localizationId);
+
+        if(!productData) return;
+
+        for(const paletteData of petPalettes)
+        {
+            if(paletteData.breed !== productData.type) continue;
+
+            const palettes: SellablePetPaletteData[] = [];
+
+            for(const palette of paletteData.palettes)
+            {
+                if(!palette.sellable) continue;
+
+                palettes.push(palette);
+            }
+
+            BatchUpdates(() =>
+            {
+                setSelectedPaletteIndex((palettes.length ? 0 : -1));
+                setSellablePalettes(palettes);
+            });
+
+            return;
+        }
+
+        BatchUpdates(() =>
+        {
+            setSelectedPaletteIndex(-1);
+            setSellablePalettes([]);
+        });
+
+        SendMessageHook(new GetSellablePetPalettesComposer(productData.type));
+    }, [ activeOffer, petPalettes ]);
+
+    useEffect(() =>
+    {
+        if(petIndex === -1) return;
+
+        const colors = GetPetAvailableColors(petIndex, sellablePalettes);
+
+        BatchUpdates(() =>
+        {
+            setSelectedColorIndex((colors.length ? 0 : -1));
+            setSellableColors(colors);
+        });
+    }, [ petIndex, sellablePalettes ]);
+
+    useEffect(() =>
+    {
+        if(!roomPreviewer) return;
+
+        roomPreviewer && roomPreviewer.reset(false);
+
+        if((petIndex === -1) || !sellablePalettes.length || (selectedPaletteIndex === -1)) return;
+
+        let petFigureString = `${ petIndex } ${ sellablePalettes[selectedPaletteIndex].paletteId }`;
+
+        if(petIndex <= 7) petFigureString += ` ${ getColor.toString(16) }`;
+
+        roomPreviewer.addPetIntoRoom(petFigureString);
+    }, [ roomPreviewer, petIndex, sellablePalettes, selectedPaletteIndex, getColor ]);
+
     if(!activeOffer) return null;
 
     return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn size={ 7 }>
-                <NitroCardGridView>
+        <Grid>
+            <Column size={ 7 } overflow="hidden">
+                <Grid grow columnCount={ 5 } overflow="auto">
                     { !colorsShowing && (sellablePalettes.length > 0) && sellablePalettes.map((palette, index) =>
                         {
                             return (
-                                <NitroCardGridItemView key={ index } itemActive={ (selectedPaletteIndex === index) } onClick={ event => setSelectedPaletteIndex(index) }>
+                                <LayoutGridItem key={ index } itemActive={ (selectedPaletteIndex === index) } onClick={ event => setSelectedPaletteIndex(index) }>
                                     <PetImageView typeId={ petIndex } paletteId={ palette.paletteId } direction={ 2 } headOnly={ true } />
-                                </NitroCardGridItemView>
+                                </LayoutGridItem>
                             );
                         })}
-                    { colorsShowing && (sellableColors.length > 0) && sellableColors.map((colorSet, index) =>
-                        {
-                            return (
-                                <NitroCardGridItemView key={ index } itemActive={ (selectedColorIndex === index) } itemColor={ ColorConverter.int2rgb(colorSet[0]) } onClick={ event => setSelectedColorIndex(index) } />
-                            );
-                        })}
-                </NitroCardGridView>
-            </NitroLayoutGridColumn>
-            <NitroLayoutGridColumn size={ 5 }>
+                    { colorsShowing && (sellableColors.length > 0) && sellableColors.map((colorSet, index) => <LayoutGridItem key={ index } itemActive={ (selectedColorIndex === index) } itemColor={ ColorConverter.int2rgb(colorSet[0]) } onClick={ event => setSelectedColorIndex(index) } />) }
+                </Grid>
+            </Column>
+            <Column size={ 5 } overflow="hidden">
                 { (petIndex === -1) &&
                     <CatalogPageDetailsView pageParser={ pageParser } /> }
                 { (petIndex >= 0) &&
                     <>
-                        <NitroLayoutFlexColumn overflow="hidden" position="relative">
+                        <Column overflow="hidden" position="relative" gap={ 0 }>
                             { roomPreviewer && <CatalogRoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } /> }
                             { (petIndex > -1 && petIndex <= 7) &&
-                                <NitroLayoutBase className="start-2 bottom-2" position="absolute">
-                                    <button type="button" className= { 'btn btn-primary btn-sm color-button ' + (colorsShowing ? 'active ' : '') } onClick={ event => setColorsShowing(!colorsShowing) }>
-                                        <i className="fas fa-fill-drip" />
-                                    </button>
-                                </NitroLayoutBase> }
-                        </NitroLayoutFlexColumn>
-                        <NitroLayoutFlexColumn className="flex-grow-1" gap={ 2 }>
-                            <NitroLayoutBase className="flex-grow-1 text-black text-truncate">{ petBreedName }</NitroLayoutBase>
+                                <Base position="absolute" className="start-1 bottom-1">
+                                    <Button size="sm" active={ colorsShowing } onClick={ event => setColorsShowing(!colorsShowing) }>
+                                        <FontAwesomeIcon icon="fill-drip" />
+                                    </Button>
+                                </Base> }
+                        </Column>
+                        <Column grow>
+                            <Text grow truncate>{ petBreedName }</Text>
                             <CatalogLayoutPetPurchaseView offer={ activeOffer } pageId={ pageParser.pageId } extra={ petPurchaseString } />
-                        </NitroLayoutFlexColumn>
+                        </Column>
                     </> }
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
+            </Column>
+        </Grid>
     );
 }
diff --git a/src/views/catalog/views/page/layout/pets/name-approval/CatalogPetNameApprovalView.tsx b/src/components/catalog/views/page/layout/pets/CatalogPetNameApprovalView.tsx
similarity index 78%
rename from src/views/catalog/views/page/layout/pets/name-approval/CatalogPetNameApprovalView.tsx
rename to src/components/catalog/views/page/layout/pets/CatalogPetNameApprovalView.tsx
index c7b6f5c0..22d863b7 100644
--- a/src/views/catalog/views/page/layout/pets/name-approval/CatalogPetNameApprovalView.tsx
+++ b/src/components/catalog/views/page/layout/pets/CatalogPetNameApprovalView.tsx
@@ -1,19 +1,21 @@
-import { FC, useCallback, useEffect, useMemo, useState } from 'react';
-import { LocalizeText } from '../../../../../../../api';
-import { CatalogEvent, CatalogNameResultEvent } from '../../../../../../../events';
-import { useUiEvent } from '../../../../../../../hooks/events/ui/ui-event';
-import { CatalogPetNameApprovalViewProps } from './CatalogPetNameApprovalView.types';
+import { Dispatch, FC, SetStateAction, useCallback, useEffect, useState } from 'react';
+import { LocalizeText } from '../../../../../../api';
+import { CatalogEvent, CatalogNameResultEvent } from '../../../../../../events';
+import { useUiEvent } from '../../../../../../hooks/events/ui/ui-event';
+
+export interface CatalogPetNameApprovalViewProps
+{
+    petNameValue: string;
+    setPetNameValue: Dispatch<SetStateAction<string>>;
+    nameApproved: boolean;
+    setNameApproved: Dispatch<SetStateAction<boolean>>;
+}
 
 export const CatalogPetNameApprovalView: FC<CatalogPetNameApprovalViewProps> = props =>
 {
     const { petNameValue = null, setPetNameValue = null, nameApproved = false, setNameApproved = null } = props;
     const [ validationResult, setValidationResult ] = useState(-1);
 
-    useEffect(() =>
-    {
-        setValidationResult(-1);
-    }, [ petNameValue ]);
-
     const onCatalogNameResultEvent = useCallback((event: CatalogNameResultEvent) =>
     {
         if(event.result === 0)
@@ -28,7 +30,7 @@ export const CatalogPetNameApprovalView: FC<CatalogPetNameApprovalViewProps> = p
 
     useUiEvent(CatalogEvent.APPROVE_NAME_RESULT, onCatalogNameResultEvent);
 
-    const validationErrorMessage = useMemo(() =>
+    const validationErrorMessage = () =>
     {
         let key: string = '';
 
@@ -49,7 +51,12 @@ export const CatalogPetNameApprovalView: FC<CatalogPetNameApprovalViewProps> = p
         }
 
         return LocalizeText(key);
-    }, [ validationResult ]);
+    }
+
+    useEffect(() =>
+    {
+        setValidationResult(-1);
+    }, [ petNameValue ]);
 
     return (
         <div className="input-group has-validation">
diff --git a/src/views/catalog/views/page/layout/pets2/CatalogLayoutPets2View.tsx b/src/components/catalog/views/page/layout/pets2/CatalogLayoutPets2View.tsx
similarity index 50%
rename from src/views/catalog/views/page/layout/pets2/CatalogLayoutPets2View.tsx
rename to src/components/catalog/views/page/layout/pets2/CatalogLayoutPets2View.tsx
index 06dd970c..1bf23836 100644
--- a/src/views/catalog/views/page/layout/pets2/CatalogLayoutPets2View.tsx
+++ b/src/components/catalog/views/page/layout/pets2/CatalogLayoutPets2View.tsx
@@ -1,8 +1,8 @@
 import { FC } from 'react';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
 import { CatalogLayoutPets3View } from '../pets3/CatalogLayoutPets3View';
-import { CatalogLayoutPets2ViewProps } from './CatalogLayoutPets2View.types';
 
-export const CatalogLayoutPets2View: FC<CatalogLayoutPets2ViewProps> = props =>
+export const CatalogLayoutPets2View: FC<CatalogLayoutProps> = props =>
 {
     return <CatalogLayoutPets3View { ...props } />
 }
diff --git a/src/components/catalog/views/page/layout/pets3/CatalogLayoutPets3View.tsx b/src/components/catalog/views/page/layout/pets3/CatalogLayoutPets3View.tsx
new file mode 100644
index 00000000..fe9111aa
--- /dev/null
+++ b/src/components/catalog/views/page/layout/pets3/CatalogLayoutPets3View.tsx
@@ -0,0 +1,28 @@
+import { FC } from 'react';
+import { Base } from '../../../../../../common/Base';
+import { Column } from '../../../../../../common/Column';
+import { Flex } from '../../../../../../common/Flex';
+import { GetCatalogPageImage, GetCatalogPageText } from '../../../../common/CatalogUtilities';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
+
+export const CatalogLayoutPets3View: FC<CatalogLayoutProps> = props =>
+{
+    const { pageParser = null } = props;
+
+    const imageUrl = GetCatalogPageImage(pageParser, 1);
+    
+    return (
+        <Column grow className="bg-muted rounded text-black p-2" overflow="hidden">
+            <Flex alignItems="center" gap={ 2 }>
+                { imageUrl && <img alt="" src={ GetCatalogPageImage(pageParser, 1) } /> }
+                <Base className="fs-5" dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 1) } } />
+            </Flex>
+            <Column grow alignItems="center" overflow="auto">
+                <Base dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 2) } } />
+            </Column>
+            <Flex alignItems="center">
+                <Base className="fw-bold" dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 3) } } />
+            </Flex>
+        </Column>
+    );
+}
diff --git a/src/views/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.tsx b/src/components/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.tsx
similarity index 53%
rename from src/views/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.tsx
rename to src/components/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.tsx
index e826290c..38944c38 100644
--- a/src/views/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.tsx
+++ b/src/components/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.tsx
@@ -1,31 +1,29 @@
 import { FC } from 'react';
-import { NitroCardGridView, NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
+import { Column } from '../../../../../../common/Column';
+import { Grid } from '../../../../../../common/Grid';
 import { useCatalogContext } from '../../../../context/CatalogContext';
 import { CatalogPageDetailsView } from '../../../page-details/CatalogPageDetailsView';
 import { CatalogProductView } from '../../product/CatalogProductView';
 import { CatalogPurchaseView } from '../../purchase/CatalogPurchaseView';
-import { CatalogLayoutSingleBundleViewProps } from './CatalogLayoutSingleBundleView.types';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
 
-export const CatalogLayoutSingleBundleView: FC<CatalogLayoutSingleBundleViewProps> = props =>
+export const CatalogLayoutSingleBundleView: FC<CatalogLayoutProps> = props =>
 {
     const { roomPreviewer = null, pageParser = null } = props;
     const { catalogState = null, dispatchCatalogState = null } = useCatalogContext();
     const { activeOffer = null } = catalogState;
 
     return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn size={ 7 }>
-                <NitroCardGridView>
-                    { activeOffer && activeOffer.products && (activeOffer.products.length > 0) && activeOffer.products.map((product, index) =>
-                        {
-                            return <CatalogProductView key={ index } isActive={ false } product={ product } />
-                        }) }
-                </NitroCardGridView>
-            </NitroLayoutGridColumn>
-            <NitroLayoutGridColumn size={ 5 }>
+        <Grid>
+            <Column size={ 7 } overflow="hidden">
+                <Grid grow overflow="auto">
+                    { activeOffer && activeOffer.products && (activeOffer.products.length > 0) && activeOffer.products.map((product, index) => <CatalogProductView key={ index } itemActive={ false } product={ product } />)}
+                </Grid>
+            </Column>
+            <Column size={ 5 } overflow="hidden">
                 <CatalogPageDetailsView pageParser={ pageParser } />
                 { activeOffer && <CatalogPurchaseView offer={ activeOffer } pageId={ pageParser.pageId } /> }
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
+            </Column>
+        </Grid>
     );
 }
diff --git a/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx b/src/components/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx
similarity index 73%
rename from src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx
rename to src/components/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx
index 2a04a80b..7b8877af 100644
--- a/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx
+++ b/src/components/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.tsx
@@ -1,14 +1,17 @@
 import { CatalogPageMessageOfferData, IFurnitureData } from '@nitrots/nitro-renderer';
 import { FC, useEffect, useState } from 'react';
 import { GetSessionDataManager, LocalizeText } from '../../../../../../api';
-import { NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
+import { Button } from '../../../../../../common/Button';
+import { ButtonGroup } from '../../../../../../common/ButtonGroup';
+import { Column } from '../../../../../../common/Column';
+import { Grid } from '../../../../../../common/Grid';
 import { ProductTypeEnum } from '../../../../common/ProductTypeEnum';
 import { useCatalogContext } from '../../../../context/CatalogContext';
 import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView';
 import { CatalogProductPreviewView } from '../../product-preview/CatalogProductPreviewView';
-import { CatalogLayoutSpacesViewProps } from './CatalogLayoutSpacesView.types';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
 
-export const CatalogLayoutSpacesView: FC<CatalogLayoutSpacesViewProps> = props =>
+export const CatalogLayoutSpacesView: FC<CatalogLayoutProps> = props =>
 {
     const { roomPreviewer = null, pageParser = null } = props;
     const [ groups, setGroups ] = useState<CatalogPageMessageOfferData[][]>([]);
@@ -67,19 +70,16 @@ export const CatalogLayoutSpacesView: FC<CatalogLayoutSpacesViewProps> = props =
     const product = ((activeOffer && activeOffer.products[0]) || null);
 
     return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn size={ 7 }>
-                <div className="btn-group w-100">
-                    { groupNames.map((name, index) =>
-                        {
-                            return <button key={ index } type="button" className={ 'btn btn-primary btn-sm ' + ((activeGroupIndex === index) ? 'active ' : '' )} onClick={ event => setActiveGroupIndex(index) }>{ LocalizeText(`catalog.spaces.tab.${ name }`) }</button>
-                        })}
-                </div>
+        <Grid>
+            <Column size={ 7 } overflow="hidden">
+                <ButtonGroup>
+                    { groupNames.map((name, index) => <Button key={ index } size="sm" active={ (activeGroupIndex === index) } onClick={ event => setActiveGroupIndex(index) }>{ LocalizeText(`catalog.spaces.tab.${ name }`) }</Button>)}
+                </ButtonGroup>
                 <CatalogPageOffersView offers={ groups[activeGroupIndex] } />
-            </NitroLayoutGridColumn>
-            <NitroLayoutGridColumn size={ 5 }>
+            </Column>
+            <Column size={ 5 } overflow="hidden">
                 <CatalogProductPreviewView pageParser={ pageParser } activeOffer={ activeOffer } roomPreviewer={ roomPreviewer } />
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
+            </Column>
+        </Grid>
     );
 }
diff --git a/src/views/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.tsx b/src/components/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.tsx
similarity index 68%
rename from src/views/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.tsx
rename to src/components/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.tsx
index 86d0e7ba..f107834b 100644
--- a/src/views/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.tsx
+++ b/src/components/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.tsx
@@ -1,11 +1,12 @@
 import { FC, useState } from 'react';
-import { NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
+import { Column } from '../../../../../../common/Column';
+import { Grid } from '../../../../../../common/Grid';
 import { useCatalogContext } from '../../../../context/CatalogContext';
 import { CatalogPageOffersView } from '../../offers/CatalogPageOffersView';
 import { CatalogProductPreviewView } from '../../product-preview/CatalogProductPreviewView';
-import { CatalogLayoutTrophiesViewProps } from './CatalogLayoutTrophiesView.types';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
 
-export const CatalogLayoutTrophiesView: FC<CatalogLayoutTrophiesViewProps> = props =>
+export const CatalogLayoutTrophiesView: FC<CatalogLayoutProps> = props =>
 {
     const { roomPreviewer = null, pageParser = null } = props;
     const { catalogState = null, dispatchCatalogState = null } = useCatalogContext();
@@ -15,14 +16,14 @@ export const CatalogLayoutTrophiesView: FC<CatalogLayoutTrophiesViewProps> = pro
     const product = ((activeOffer && activeOffer.products[0]) || null);
 
     return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn size={ 7 }>
+        <Grid>
+            <Column size={ 7 } overflow="hidden">
                 <CatalogPageOffersView offers={ pageParser.offers } />
                 <textarea className="flex-grow-1 form-control w-100" defaultValue={ trophyText || '' } onChange={ event => setTrophyText(event.target.value) } />
-            </NitroLayoutGridColumn>
-            <NitroLayoutGridColumn size={ 5 }>
+            </Column>
+            <Column size={ 5 } overflow="hidden">
                 <CatalogProductPreviewView pageParser={ pageParser } activeOffer={ activeOffer } roomPreviewer={ roomPreviewer } extra={ trophyText } />
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
+            </Column>
+        </Grid>
     );
 }
diff --git a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx b/src/components/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx
similarity index 50%
rename from src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx
rename to src/components/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx
index d7d2e7f6..8d9f0f5d 100644
--- a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx
+++ b/src/components/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.tsx
@@ -1,29 +1,30 @@
 import { ClubOfferData, GetClubOffersMessageComposer, PurchaseFromCatalogComposer } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useMemo, useState } from 'react';
 import { LocalizeText } from '../../../../../../api';
+import { Button } from '../../../../../../common/Button';
+import { Column } from '../../../../../../common/Column';
+import { Flex } from '../../../../../../common/Flex';
+import { Grid } from '../../../../../../common/Grid';
+import { LayoutGridItem } from '../../../../../../common/layout/LayoutGridItem';
+import { Text } from '../../../../../../common/Text';
 import { CatalogEvent } from '../../../../../../events/catalog/CatalogEvent';
 import { useUiEvent } from '../../../../../../hooks';
 import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
-import { NitroLayoutFlexColumn, NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
-import { NitroLayoutBase } from '../../../../../../layout/base';
-import { NitroCardGridItemView } from '../../../../../../layout/card/grid/item/NitroCardGridItemView';
-import { NitroCardGridView } from '../../../../../../layout/card/grid/NitroCardGridView';
 import { LoadingSpinnerView } from '../../../../../../layout/loading-spinner/LoadingSpinnerView';
-import { GetCurrencyAmount } from '../../../../../purse/common/CurrencyHelper';
-import { GLOBAL_PURSE } from '../../../../../purse/PurseView';
-import { CurrencyIcon } from '../../../../../shared/currency-icon/CurrencyIcon';
+import { GetCurrencyAmount } from '../../../../../../views/purse/common/CurrencyHelper';
+import { GLOBAL_PURSE } from '../../../../../../views/purse/PurseView';
+import { CurrencyIcon } from '../../../../../../views/shared/currency-icon/CurrencyIcon';
+import { CatalogPurchaseState } from '../../../../common/CatalogPurchaseState';
 import { GetCatalogPageImage } from '../../../../common/CatalogUtilities';
 import { useCatalogContext } from '../../../../context/CatalogContext';
-import { CatalogPurchaseState } from '../../purchase/purchase-button/CatalogPurchaseButtonView.types';
-import { CatalogLayoutVipBuyViewProps } from './CatalogLayoutVipBuyView.types';
+import { CatalogLayoutProps } from '../CatalogLayout.types';
 
-export const CatalogLayoutVipBuyView: FC<CatalogLayoutVipBuyViewProps> = props =>
+export const CatalogLayoutVipBuyView: FC<CatalogLayoutProps> = props =>
 {
-    const { catalogState = null } = useCatalogContext();
-    const { pageParser = null, clubOffers = null, subscriptionInfo = null } = catalogState;
-
     const [ pendingOffer, setPendingOffer ] = useState<ClubOfferData>(null);
     const [ purchaseState, setPurchaseState ] = useState(CatalogPurchaseState.NONE);
+    const { catalogState = null } = useCatalogContext();
+    const { pageParser = null, clubOffers = null, subscriptionInfo = null } = catalogState;
 
     const onCatalogEvent = useCallback((event: CatalogEvent) =>
     {
@@ -104,11 +105,6 @@ export const CatalogLayoutVipBuyView: FC<CatalogLayoutVipBuyViewProps> = props =
         SendMessageHook(new PurchaseFromCatalogComposer(pageParser.pageId, pendingOffer.offerId, null, 1));
     }, [ pendingOffer, pageParser ]);
 
-    useEffect(() =>
-    {
-        if(clubOffers === null) SendMessageHook(new GetClubOffersMessageComposer(1));
-    }, [ clubOffers ]);
-
     const setOffer = useCallback((offer: ClubOfferData) =>
     {
         setPurchaseState(CatalogPurchaseState.NONE);
@@ -121,85 +117,91 @@ export const CatalogLayoutVipBuyView: FC<CatalogLayoutVipBuyViewProps> = props =
 
         if(pendingOffer.priceCredits > GetCurrencyAmount(-1))
         {
-            return <button className="btn btn-danger btn-sm w-100">{ LocalizeText('catalog.alert.notenough.title') }</button>;
+            return <Button fullWidth variant="danger" size="sm">{ LocalizeText('catalog.alert.notenough.title') }</Button>;
         }
 
         if(pendingOffer.priceActivityPoints > GetCurrencyAmount(pendingOffer.priceActivityPointsType))
         {
-            return <button className="btn btn-danger btn-sm w-100">{ LocalizeText('catalog.alert.notenough.activitypoints.title.' + pendingOffer.priceActivityPointsType) }</button>;
+            return <Button fullWidth variant="danger" size="sm">{ LocalizeText('catalog.alert.notenough.activitypoints.title.' + pendingOffer.priceActivityPointsType) }</Button>;
         }
 
         switch(purchaseState)
         {
             case CatalogPurchaseState.CONFIRM:
-                return <button type="button" className="btn btn-warning w-100" onClick={ purchaseSubscription }>{ LocalizeText('catalog.marketplace.confirm_title') }</button>;
+                return <Button fullWidth variant="warning" size="sm" onClick={ purchaseSubscription }>{ LocalizeText('catalog.marketplace.confirm_title') }</Button>;
             case CatalogPurchaseState.PURCHASE:
-                return <button type="button" className="btn btn-primary w-100" disabled><LoadingSpinnerView /></button>;
+                return <Button fullWidth variant="primary" size="sm" disabled><LoadingSpinnerView /></Button>;
             case CatalogPurchaseState.FAILED:
-                return <button type="button" className="btn btn-danger w-100" disabled>{ LocalizeText('generic.failed') }</button>;
+                return <Button fullWidth variant="danger" size="sm" disabled>{ LocalizeText('generic.failed') }</Button>;
             case CatalogPurchaseState.NONE:
             default:
-                return <button type="button" className="btn btn-success w-100" onClick={ () => setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('buy') }</button>;
+                return <Button fullWidth variant="success" size="sm" onClick={ () => setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('buy') }</Button>;
         }
     }, [ pendingOffer, purchaseState, purchaseSubscription ]);
 
+    useEffect(() =>
+    {
+        if(!clubOffers) SendMessageHook(new GetClubOffersMessageComposer(1));
+    }, [ clubOffers ]);
+
     return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn size={ 7 }>
-                <NitroCardGridView columns={ 1 } className="vip-buy-grid">
+        <Grid>
+            <Column fullHeight size={ 7 } overflow="hidden">
+                <Grid grow columnCount={ 1 } className="nitro-catalog-layout-vip-buy-grid" overflow="auto">
                     { clubOffers && (clubOffers.length > 0) && clubOffers.map((offer, index) =>
                         {
                             return (
-                                <NitroCardGridItemView key={ index } className="justify-content-between py-1 px-2 text-black" itemActive={ pendingOffer === offer } onClick={ () => setOffer(offer) }>
-                                    <i className="icon icon-hc-banner" />
-                                    <div className="fw-bold">
-                                        <div className="text-end">{ getOfferText(offer) }</div>
-                                        <div className="d-flex gap-2 justify-content-end">
+                                <LayoutGridItem key={ index } column={ false } center={ false } alignItems="center" justifyContent="between" itemActive={ pendingOffer === offer } className="p-1" onClick={ () => setOffer(offer) }>
+                                    <i className="icon-hc-banner" />
+                                    <Column justifyContent="end" gap={ 0 }>
+                                        <Text textEnd>{ getOfferText(offer) }</Text>
+                                        <Flex justifyContent="end" gap={ 1 }>
                                             { (offer.priceCredits > 0) &&
-                                                <div className="d-flex align-items-center justify-content-end gap-1">
-                                                    <span className="text-black">{ offer.priceCredits }</span>
+                                                <Flex alignItems="center" justifyContent="end" gap={ 1 }>
+                                                    <Text>{ offer.priceCredits }</Text>
                                                     <CurrencyIcon type={ -1 } />
-                                                </div> }
+                                                </Flex> }
                                             { (offer.priceActivityPoints > 0) &&
-                                                <div className="d-flex align-items-center justify-content-end gap-1">
-                                                    <span className="text-black">{ offer.priceActivityPoints }</span>
+                                                <Flex alignItems="center" justifyContent="end" gap={ 1 }>
+                                                    <Text>{ offer.priceActivityPoints }</Text>
                                                     <CurrencyIcon type={ offer.priceActivityPointsType } />
-                                                </div> }
-                                        </div>
-                                    </div>
-                                </NitroCardGridItemView>
+                                                </Flex> }
+                                        </Flex>
+                                    </Column>
+                                </LayoutGridItem>
                             );
                     })}
-                    <div className="mt-auto text-black">{ LocalizeText('catalog.vip.buy.hccenter') }</div>
-                </NitroCardGridView>
-            </NitroLayoutGridColumn>
-            <NitroLayoutGridColumn size={ 5 }>
-                <NitroLayoutFlexColumn className="justify-content-center align-items-center h-100" overflow="hidden" gap={ 2 }>
-                    { GetCatalogPageImage(pageParser, 1) && <img className="" alt="" src={ GetCatalogPageImage(pageParser, 1) } /> }
-                    <NitroLayoutBase className="text-center text-black" overflow="auto" dangerouslySetInnerHTML={{ __html: getSubscriptionDetails }} />
-                </NitroLayoutFlexColumn>
-                { pendingOffer && <div className="mt-auto w-100 text-black">
-                    <div className="d-flex gap-2 mb-2 align-items-center">
-                        <div className="w-100">
-                            <div className="fw-bold">{ getPurchaseHeader() }</div>
-                            <div className="small">{ getPurchaseValidUntil() }</div>
-                        </div>
-                        <div>
-                            { (pendingOffer.priceCredits > 0) &&
-                                <div className="d-flex align-items-center justify-content-end gap-1">
-                                    <span className="text-black">{ pendingOffer.priceCredits }</span>
-                                    <CurrencyIcon type={ -1 } />
-                                </div> }
-                            { (pendingOffer.priceActivityPoints > 0) &&
-                                <div className="d-flex align-items-center justify-content-end gap-1">
-                                    <span className="text-black">{ pendingOffer.priceActivityPoints }</span>
-                                    <CurrencyIcon type={ pendingOffer.priceActivityPointsType } />
-                                </div> }
-                        </div>
-                    </div>
-                    { getPurchaseButton() }
-                </div> }
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
+                    <Text dangerouslySetInnerHTML={{ __html: LocalizeText('catalog.vip.buy.hccenter') }}></Text>
+                </Grid>
+            </Column>
+            <Column size={ 5 } overflow="hidden">
+                <Column fullHeight center overflow="hidden">
+                    { GetCatalogPageImage(pageParser, 1) && <img alt="" src={ GetCatalogPageImage(pageParser, 1) } /> }
+                    <Text center overflow="auto" dangerouslySetInnerHTML={{ __html: getSubscriptionDetails }} />
+                </Column>
+                { pendingOffer &&
+                    <Column fullWidth grow justifyContent="end">
+                        <Flex alignItems="end">
+                            <Column grow gap={ 0 }>
+                                <Text fontWeight="bold">{ getPurchaseHeader() }</Text>
+                                <Text>{ getPurchaseValidUntil() }</Text>
+                            </Column>
+                            <Column gap={ 1 }>
+                                { (pendingOffer.priceCredits > 0) &&
+                                    <Flex alignItems="center" justifyContent="end" gap={ 1 }>
+                                        <Text>{ pendingOffer.priceCredits }</Text>
+                                        <CurrencyIcon type={ -1 } />
+                                    </Flex> }
+                                { (pendingOffer.priceActivityPoints > 0) &&
+                                    <Flex alignItems="center" justifyContent="end" gap={ 1 }>
+                                        <Text>{ pendingOffer.priceActivityPoints }</Text>
+                                        <CurrencyIcon type={ pendingOffer.priceActivityPointsType } />
+                                    </Flex> }
+                            </Column>
+                        </Flex>
+                        { getPurchaseButton() }
+                    </Column> }
+            </Column>
+        </Grid>
     );
 }
diff --git a/src/views/catalog/views/page/offer/CatalogPageOfferView.tsx b/src/components/catalog/views/page/offers/CatalogPageOfferView.tsx
similarity index 79%
rename from src/views/catalog/views/page/offer/CatalogPageOfferView.tsx
rename to src/components/catalog/views/page/offers/CatalogPageOfferView.tsx
index fb2fae74..544ffc83 100644
--- a/src/views/catalog/views/page/offer/CatalogPageOfferView.tsx
+++ b/src/components/catalog/views/page/offers/CatalogPageOfferView.tsx
@@ -1,9 +1,14 @@
-import { MouseEventType } from '@nitrots/nitro-renderer';
+import { CatalogPageMessageOfferData, MouseEventType } from '@nitrots/nitro-renderer';
 import { FC, MouseEvent, useCallback, useState } from 'react';
 import { useCatalogContext } from '../../../context/CatalogContext';
 import { CatalogActions } from '../../../reducers/CatalogReducer';
 import { CatalogProductView } from '../product/CatalogProductView';
-import { CatalogPageOfferViewProps } from './CatalogPageOfferView.types';
+
+export interface CatalogPageOfferViewProps
+{
+    isActive: boolean;
+    offer: CatalogPageMessageOfferData;
+}
 
 export const CatalogPageOfferView: FC<CatalogPageOfferViewProps> = props =>
 {
@@ -41,5 +46,5 @@ export const CatalogPageOfferView: FC<CatalogPageOfferViewProps> = props =>
 
     if(!product) return null;
 
-    return <CatalogProductView isActive={ isActive } product={ product } onClick={ onMouseEvent } onMouseDown={ onMouseEvent } onMouseUp={ onMouseEvent } onMouseOut={ onMouseEvent } />
+    return <CatalogProductView itemActive={ isActive } product={ product } onClick={ onMouseEvent } onMouseDown={ onMouseEvent } onMouseUp={ onMouseEvent } onMouseOut={ onMouseEvent } />
 }
diff --git a/src/components/catalog/views/page/offers/CatalogPageOffersView.tsx b/src/components/catalog/views/page/offers/CatalogPageOffersView.tsx
new file mode 100644
index 00000000..e89da63f
--- /dev/null
+++ b/src/components/catalog/views/page/offers/CatalogPageOffersView.tsx
@@ -0,0 +1,24 @@
+import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer';
+import { FC } from 'react';
+import { Grid, GridProps } from '../../../../../common/Grid';
+import { useCatalogContext } from '../../../context/CatalogContext';
+import { CatalogPageOfferView } from './CatalogPageOfferView';
+
+export interface CatalogPageOffersViewProps extends GridProps
+{
+    offers: CatalogPageMessageOfferData[];
+}
+
+export const CatalogPageOffersView: FC<CatalogPageOffersViewProps> = props =>
+{
+    const { offers = [], children = null, ...rest } = props;
+    const { catalogState = null } = useCatalogContext();
+    const { activeOffer = null } = catalogState;
+
+    return (
+        <Grid grow columnCount={ 5 } overflow="auto" { ...rest }>
+            { offers && (offers.length > 0) && offers.map((offer, index) => <CatalogPageOfferView key={ index } isActive={ (activeOffer === offer) } offer={ offer } />) }
+            { children }
+        </Grid>
+    );
+}
diff --git a/src/components/catalog/views/page/product-preview/CatalogProductPreviewView.tsx b/src/components/catalog/views/page/product-preview/CatalogProductPreviewView.tsx
new file mode 100644
index 00000000..a70a2bed
--- /dev/null
+++ b/src/components/catalog/views/page/product-preview/CatalogProductPreviewView.tsx
@@ -0,0 +1,51 @@
+import { CatalogPageMessageOfferData, CatalogPageMessageParser, RoomPreviewer } from '@nitrots/nitro-renderer';
+import { FC } from 'react';
+import { Base } from '../../../../../common/Base';
+import { Column } from '../../../../../common/Column';
+import { Text } from '../../../../../common/Text';
+import { BadgeImageView } from '../../../../../views/shared/badge-image/BadgeImageView';
+import { LimitedEditionCompletePlateView } from '../../../../../views/shared/limited-edition/LimitedEditionCompletePlateView';
+import { GetOfferName } from '../../../common/CatalogUtilities';
+import { CatalogRoomPreviewerView } from '../../catalog-room-previewer/CatalogRoomPreviewerView';
+import { CatalogPageDetailsView } from '../../page-details/CatalogPageDetailsView';
+import { CatalogPurchaseView } from '../purchase/CatalogPurchaseView';
+
+export interface CatalogProductPreviewViewProps
+{
+    pageParser: CatalogPageMessageParser;
+    activeOffer: CatalogPageMessageOfferData;
+    roomPreviewer: RoomPreviewer;
+    badgeCode?: string;
+    extra?: string;
+    disabled?: boolean;
+}
+
+export const CatalogProductPreviewView: FC<CatalogProductPreviewViewProps> = props =>
+{
+    const { pageParser = null, activeOffer = null, roomPreviewer = null, badgeCode = null, extra = '', disabled = false, children = null } = props;
+
+    const product = ((activeOffer && activeOffer.products[0]) || null);
+
+    if(!product) return <CatalogPageDetailsView pageParser={ pageParser } />;
+
+    return (
+        <>
+            <Column overflow="hidden" position="relative" gap={ 0 }>
+                { roomPreviewer && <CatalogRoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } /> }
+                { product.uniqueLimitedItem &&
+                    <Base fullWidth position="absolute" className="top-1">
+                        <LimitedEditionCompletePlateView className="mx-auto" uniqueLimitedItemsLeft={ product.uniqueLimitedItemsLeft } uniqueLimitedSeriesSize={ product.uniqueLimitedSeriesSize } />
+                    </Base> }
+                { badgeCode && badgeCode.length &&
+                    <Base position="absolute" className="top-1 end-1">
+                        <BadgeImageView badgeCode={ badgeCode } isGroup={ true } />
+                    </Base> }
+            </Column>
+            <Column grow>
+                <Text grow truncate>{ GetOfferName(activeOffer) }</Text>
+                { children }
+                <CatalogPurchaseView offer={ activeOffer } pageId={ pageParser.pageId } extra={ extra } disabled={ disabled } />
+            </Column>
+        </>
+    );
+}
diff --git a/src/components/catalog/views/page/product/CatalogProductView.tsx b/src/components/catalog/views/page/product/CatalogProductView.tsx
new file mode 100644
index 00000000..c0e39f5f
--- /dev/null
+++ b/src/components/catalog/views/page/product/CatalogProductView.tsx
@@ -0,0 +1,27 @@
+import { CatalogPageMessageProductData } from '@nitrots/nitro-renderer';
+import { FC } from 'react';
+import { LayoutGridItem, LayoutGridItemProps } from '../../../../../common/layout/LayoutGridItem';
+import { AvatarImageView } from '../../../../../views/shared/avatar-image/AvatarImageView';
+import { GetProductIconUrl } from '../../../common/GetProuductIconUrl';
+import { ProductTypeEnum } from '../../../common/ProductTypeEnum';
+
+export interface CatalogProductViewProps extends LayoutGridItemProps
+{
+    product: CatalogPageMessageProductData;
+}
+
+export const CatalogProductView: FC<CatalogProductViewProps> = props =>
+{
+    const { product = null, ...rest } = props;
+
+    if(!product) return null;
+
+    const iconUrl = GetProductIconUrl(product.furniClassId, product.productType, product.extraParam);
+
+    return (
+        <LayoutGridItem itemImage={ iconUrl } itemCount={ product.productCount } itemUniqueSoldout={ (product.uniqueLimitedSeriesSize && !product.uniqueLimitedItemsLeft) } itemUniqueNumber={ product.uniqueLimitedSeriesSize } { ...rest }>
+            { (product.productType === ProductTypeEnum.ROBOT) &&
+                <AvatarImageView figure={ product.extraParam } direction={ 3 } headOnly={ true } /> }
+        </LayoutGridItem>
+    );
+}
diff --git a/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx b/src/components/catalog/views/page/purchase/CatalogPurchaseButtonView.tsx
similarity index 50%
rename from src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx
rename to src/components/catalog/views/page/purchase/CatalogPurchaseButtonView.tsx
index acc9bafb..e5941127 100644
--- a/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.tsx
+++ b/src/components/catalog/views/page/purchase/CatalogPurchaseButtonView.tsx
@@ -1,16 +1,28 @@
-import { PurchaseFromCatalogComposer } from '@nitrots/nitro-renderer';
+import { CatalogPageMessageOfferData, PurchaseFromCatalogComposer } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
-import { LocalizeText } from '../../../../../../api';
-import { CatalogEvent } from '../../../../../../events';
-import { useUiEvent } from '../../../../../../hooks/events/ui/ui-event';
-import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
-import { LoadingSpinnerView } from '../../../../../../layout';
-import { GetCurrencyAmount } from '../../../../../purse/common/CurrencyHelper';
-import { CatalogPurchaseButtonViewProps, CatalogPurchaseState } from './CatalogPurchaseButtonView.types';
+import { LocalizeText } from '../../../../../api';
+import { Button, ButtonProps } from '../../../../../common/Button';
+import { CatalogEvent } from '../../../../../events';
+import { BatchUpdates } from '../../../../../hooks';
+import { useUiEvent } from '../../../../../hooks/events/ui/ui-event';
+import { SendMessageHook } from '../../../../../hooks/messages/message-event';
+import { LoadingSpinnerView } from '../../../../../layout';
+import { GetCurrencyAmount } from '../../../../../views/purse/common/CurrencyHelper';
+import { CatalogPurchaseState } from '../../../common/CatalogPurchaseState';
+
+export interface CatalogPurchaseButtonViewProps extends ButtonProps
+{
+    offer: CatalogPageMessageOfferData;
+    pageId: number;
+    extra?: string;
+    quantity?: number;
+    isPurchaseAllowed?: boolean;
+    beforePurchase?: () => void;
+}
 
 export const CatalogPurchaseButtonView: FC<CatalogPurchaseButtonViewProps> = props =>
 {
-    const { className = '', offer = null, pageId = -1, extra = null, quantity = 1, isPurchaseAllowed = true, disabled = false, beforePurchase = null } = props;
+    const { offer = null, pageId = -1, extra = null, quantity = 1, isPurchaseAllowed = true, beforePurchase = null, ...rest } = props;
     const [ purchaseState, setPurchaseState ] = useState(CatalogPurchaseState.NONE);
     const [ pendingApproval, setPendingApproval ] = useState(false);
 
@@ -47,8 +59,11 @@ export const CatalogPurchaseButtonView: FC<CatalogPurchaseButtonViewProps> = pro
 
         if(!isPurchaseAllowed)
         {
-            setPendingApproval(true);
-            setPurchaseState(CatalogPurchaseState.NONE);
+            BatchUpdates(() =>
+            {
+                setPendingApproval(true);
+                setPurchaseState(CatalogPurchaseState.NONE);
+            });
 
             return;
         }
@@ -77,31 +92,31 @@ export const CatalogPurchaseButtonView: FC<CatalogPurchaseButtonViewProps> = pro
 
     if(product && product.uniqueLimitedItem && !product.uniqueLimitedItemsLeft)
     {
-        return <button type="button" className={ 'btn btn-danger ' + className } disabled>{ LocalizeText('catalog.alert.limited_edition_sold_out.title') }</button>;
+        return <Button variant="danger" size="sm" disabled>{ LocalizeText('catalog.alert.limited_edition_sold_out.title') }</Button>;
     }
 
     if((offer.priceCredits * quantity) > GetCurrencyAmount(-1))
     {
-        return <button type="button" className={ 'btn btn-danger ' + className } disabled>{ LocalizeText('catalog.alert.notenough.title') }</button>;
+        return <Button variant="danger" size="sm" disabled>{ LocalizeText('catalog.alert.notenough.title') }</Button>;
     }
 
     if((offer.priceActivityPoints * quantity) > GetCurrencyAmount(offer.priceActivityPointsType))
     {
-        return <button type="button" className={ 'btn btn-danger ' + className } disabled>{ LocalizeText('catalog.alert.notenough.activitypoints.title.' + offer.priceActivityPointsType) }</button>;
+        return <Button variant="danger" size="sm" disabled>{ LocalizeText('catalog.alert.notenough.activitypoints.title.' + offer.priceActivityPointsType) }</Button>;
     }
 
     switch(purchaseState)
     {
         case CatalogPurchaseState.CONFIRM:
-            return <button type="button" className={ 'btn btn-warning ' + className } onClick={ attemptPurchase }>{ LocalizeText('catalog.marketplace.confirm_title') }</button>;
+            return <Button variant="warning" size="sm" onClick={ attemptPurchase } { ...rest }>{ LocalizeText('catalog.marketplace.confirm_title') }</Button>;
         case CatalogPurchaseState.PURCHASE:
-            return <button type="button" className={ 'btn btn-primary ' + className } disabled><LoadingSpinnerView /></button>;
+            return <Button variant="primary" size="sm" disabled { ...rest }><LoadingSpinnerView /></Button>;
         case CatalogPurchaseState.SOLD_OUT:
-            return <button type="button" className={ 'btn btn-danger ' + className } disabled>{ LocalizeText('generic.failed') + ' - ' + LocalizeText('catalog.alert.limited_edition_sold_out.title') }</button>;
+            return <Button variant="danger" size="sm" disabled { ...rest }>{ LocalizeText('generic.failed') + ' - ' + LocalizeText('catalog.alert.limited_edition_sold_out.title') }</Button>;
         case CatalogPurchaseState.FAILED:
-            return <button type="button" className={ 'btn btn-danger ' + className } disabled>{ LocalizeText('generic.failed') }</button>;
+            return <Button variant="danger" size="sm" disabled { ...rest }>{ LocalizeText('generic.failed') }</Button>;
         case CatalogPurchaseState.NONE:
         default:
-            return <button type="button" className={ 'btn btn-success ' + className } disabled={ disabled } onClick={ event => setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('buy') }</button>
+            return <Button variant="success" size="sm" onClick={ event => setPurchaseState(CatalogPurchaseState.CONFIRM) }>{ LocalizeText('buy') }</Button>
     }
 }
diff --git a/src/components/catalog/views/page/purchase/CatalogPurchaseGiftButtonView.tsx b/src/components/catalog/views/page/purchase/CatalogPurchaseGiftButtonView.tsx
new file mode 100644
index 00000000..3cb88c7a
--- /dev/null
+++ b/src/components/catalog/views/page/purchase/CatalogPurchaseGiftButtonView.tsx
@@ -0,0 +1,25 @@
+import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer';
+import { FC } from 'react';
+import { LocalizeText } from '../../../../../api';
+import { Button, ButtonProps } from '../../../../../common/Button';
+import { CatalogInitGiftEvent } from '../../../../../events/catalog/CatalogInitGiftEvent';
+import { dispatchUiEvent } from '../../../../../hooks';
+
+export interface CatalogPurchaseGiftButtonViewProps extends ButtonProps
+{
+    offer: CatalogPageMessageOfferData;
+    pageId: number;
+    extra?: string;
+}
+
+export const CatalogPurchaseGiftButtonView: FC<CatalogPurchaseGiftButtonViewProps> = props =>
+{
+    const { offer = null, pageId = -1, extra = null, ...rest } = props;
+    
+    const initGift = () =>
+    {
+        dispatchUiEvent(new CatalogInitGiftEvent(pageId, offer.offerId, extra));
+    }
+
+    return <Button variant="secondary" onClick={ initGift } { ...rest }>{ LocalizeText('catalog.purchase_confirmation.gift') }</Button>;
+}
diff --git a/src/views/catalog/views/page/purchase/CatalogPurchaseView.scss b/src/components/catalog/views/page/purchase/CatalogPurchaseView.scss
similarity index 100%
rename from src/views/catalog/views/page/purchase/CatalogPurchaseView.scss
rename to src/components/catalog/views/page/purchase/CatalogPurchaseView.scss
diff --git a/src/components/catalog/views/page/purchase/CatalogPurchaseView.tsx b/src/components/catalog/views/page/purchase/CatalogPurchaseView.tsx
new file mode 100644
index 00000000..e94a5fb8
--- /dev/null
+++ b/src/components/catalog/views/page/purchase/CatalogPurchaseView.tsx
@@ -0,0 +1,90 @@
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer';
+import { FC, useEffect, useState } from 'react';
+import { LocalizeText } from '../../../../../api';
+import { Column } from '../../../../../common/Column';
+import { Flex } from '../../../../../common/Flex';
+import { Text } from '../../../../../common/Text';
+import { CurrencyIcon } from '../../../../../views/shared/currency-icon/CurrencyIcon';
+import { CatalogPurchaseButtonView } from './CatalogPurchaseButtonView';
+import { CatalogPurchaseGiftButtonView } from './CatalogPurchaseGiftButtonView';
+
+export interface CatalogPurchaseViewProps
+{
+    offer: CatalogPageMessageOfferData;
+    pageId: number;
+    extra?: string;
+    disabled?: boolean;
+}
+
+export const CatalogPurchaseView: FC<CatalogPurchaseViewProps> = props =>
+{
+    const { offer = null, pageId = -1, extra = '', disabled = false } = props;
+    const [ quantity, setQuantity ] = useState(1);
+
+    const increaseQuantity = () =>
+    {
+        let newQuantity = quantity + 1;
+
+        if(newQuantity > 99) newQuantity = 99
+
+        setQuantity(newQuantity);
+    }
+
+    const decreaseQuantity = () =>
+    {
+        let newQuantity = quantity - 1;
+
+        if(newQuantity <= 0) newQuantity = 1;
+
+        setQuantity(newQuantity);
+    }
+
+    const updateQuantity = (amount: number) =>
+    {
+        if(isNaN(amount) || (amount <= 0)) amount = 1;
+
+        if(amount > 99) amount = 99;
+
+        setQuantity(amount);
+    }
+
+    useEffect(() =>
+    {
+        setQuantity(1);
+    }, [ offer ]);
+
+    const extraData = ((extra && extra.length) ? extra : (offer?.products[0]?.extraParam || null));
+    
+    return (
+        <Column fullWidth grow justifyContent="end">
+            <Flex alignItems="end">
+                <div className="flex-grow-1 align-items-end">
+                    <Text>{ LocalizeText('catalog.bundlewidget.price') }</Text>
+                    { offer.bundlePurchaseAllowed &&
+                        <Flex alignItems="center" gap={ 1 }>
+                            <FontAwesomeIcon icon="caret-left" className="text-black cursor-pointer" onClick={ decreaseQuantity } />
+                            <input type="number" className="form-control form-control-sm quantity-input" value={ quantity } onChange={ event => updateQuantity(event.target.valueAsNumber)} />
+                            <FontAwesomeIcon icon="caret-right" className="text-black cursor-pointer" onClick={ increaseQuantity } />
+                        </Flex> }
+                </div>
+                <Column gap={ 1 }>
+                    { (offer.priceCredits > 0) &&
+                        <Flex alignItems="center" justifyContent="end" gap={ 1 }>
+                            <Text>{ offer.priceCredits * quantity }</Text>
+                            <CurrencyIcon type={ -1 } />
+                        </Flex> }
+                    { (offer.priceActivityPoints > 0) &&
+                        <Flex alignItems="center" justifyContent="end" gap={ 1 }>
+                            <Text>{ offer.priceActivityPoints * quantity }</Text>
+                            <CurrencyIcon type={ offer.priceActivityPointsType } />
+                        </Flex> }
+                </Column>
+            </Flex>
+            <Column gap={ 1 }>
+                <CatalogPurchaseButtonView className="btn-sm w-100" offer={ offer } pageId={ pageId } extra={ extraData } quantity={ quantity } disabled={ disabled } />
+                { offer.giftable && <CatalogPurchaseGiftButtonView className="btn-sm w-100 mt-1" offer={ offer } pageId={ pageId } extra={ extraData } disabled={ disabled } /> }
+            </Column>
+        </Column>
+    );
+}
diff --git a/src/components/catalog/views/page/redeem-voucher/CatalogRedeemVoucherView.tsx b/src/components/catalog/views/page/redeem-voucher/CatalogRedeemVoucherView.tsx
new file mode 100644
index 00000000..2e3a97fa
--- /dev/null
+++ b/src/components/catalog/views/page/redeem-voucher/CatalogRedeemVoucherView.tsx
@@ -0,0 +1,68 @@
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { RedeemVoucherMessageComposer, VoucherRedeemErrorMessageEvent, VoucherRedeemOkMessageEvent } from '@nitrots/nitro-renderer';
+import { FC, useCallback, useState } from 'react';
+import { LocalizeText } from '../../../../../api';
+import { Button } from '../../../../../common/Button';
+import { Flex } from '../../../../../common/Flex';
+import { BatchUpdates, CreateMessageHook, SendMessageHook } from '../../../../../hooks';
+import { NotificationUtilities } from '../../../../../views/notification-center/common/NotificationUtilities';
+
+export interface CatalogRedeemVoucherViewProps
+{
+    text: string;
+}
+
+export const CatalogRedeemVoucherView: FC<CatalogRedeemVoucherViewProps> = props =>
+{
+    const { text = null } = props;
+    const [ voucher, setVoucher ] = useState<string>('');
+    const [ isWaiting, setIsWaiting ] = useState(false);
+
+    const redeemVoucher = () =>
+    {
+        if(!voucher || !voucher.length || isWaiting) return;
+
+        SendMessageHook(new RedeemVoucherMessageComposer(voucher));
+
+        setIsWaiting(true);
+    }
+
+    const onVoucherRedeemOkMessageEvent = useCallback((event: VoucherRedeemOkMessageEvent) =>
+    {
+        const parser = event.getParser();
+
+        let message = LocalizeText('catalog.alert.voucherredeem.ok.description');
+
+        if(parser.productName) message = LocalizeText('catalog.alert.voucherredeem.ok.description.furni', [ 'productName', 'productDescription' ], [ parser.productName, parser.productDescription ]);
+
+        NotificationUtilities.simpleAlert(message, null, null, null, LocalizeText('catalog.alert.voucherredeem.ok.title'));
+        
+        BatchUpdates(() =>
+        {
+            setIsWaiting(false);
+            setVoucher('');
+        });
+    }, []);
+
+    CreateMessageHook(VoucherRedeemOkMessageEvent, onVoucherRedeemOkMessageEvent);
+
+    const onVoucherRedeemErrorMessageEvent = useCallback((event: VoucherRedeemErrorMessageEvent) =>
+    {
+        const parser = event.getParser();
+
+        NotificationUtilities.simpleAlert(LocalizeText(`catalog.alert.voucherredeem.error.description.${ parser.errorCode }`), null, null, null, LocalizeText('catalog.alert.voucherredeem.error.title'));
+
+        setIsWaiting(false);
+    }, []);
+
+    CreateMessageHook(VoucherRedeemErrorMessageEvent, onVoucherRedeemErrorMessageEvent);
+
+    return (
+        <Flex gap={ 1 }>
+            <input type="text" className="form-control form-control-sm" placeholder={ text } value={ voucher } onChange={ event => setVoucher(event.target.value) } />
+            <Button variant="primary" size="sm" onClick={ redeemVoucher } disabled={ isWaiting }>
+                <FontAwesomeIcon icon="tag" />
+            </Button>
+        </Flex>
+    );
+}
diff --git a/src/components/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx b/src/components/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx
new file mode 100644
index 00000000..76839f8b
--- /dev/null
+++ b/src/components/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx
@@ -0,0 +1,49 @@
+import { IFurnitureData, RoomPreviewer } from '@nitrots/nitro-renderer';
+import { FC } from 'react';
+import { Base } from '../../../../../common/Base';
+import { Column } from '../../../../../common/Column';
+import { Grid } from '../../../../../common/Grid';
+import { Text } from '../../../../../common/Text';
+import { LimitedEditionCompletePlateView } from '../../../../../views/shared/limited-edition/LimitedEditionCompletePlateView';
+import { GetOfferName } from '../../../common/CatalogUtilities';
+import { useCatalogContext } from '../../../context/CatalogContext';
+import { CatalogRoomPreviewerView } from '../../catalog-room-previewer/CatalogRoomPreviewerView';
+import { CatalogPurchaseView } from '../purchase/CatalogPurchaseView';
+import { CatalogSearchResultOffersView } from './CatalogSearchResultOffersView';
+
+export interface CatalogLayoutSearchResultViewProps
+{
+    roomPreviewer: RoomPreviewer;
+    furnitureDatas: IFurnitureData[];
+}
+
+export const CatalogLayoutSearchResultView: FC<CatalogLayoutSearchResultViewProps> = props =>
+{
+    const { roomPreviewer = null, furnitureDatas = null } = props;
+    const { catalogState } = useCatalogContext();
+    const { activeOffer = null } = catalogState;
+
+    const product = ((activeOffer && activeOffer.products[0]) || null);
+
+    return (
+        <Grid>
+            <Column size={ 7 } overflow="hidden">
+                <CatalogSearchResultOffersView offers={ furnitureDatas } />
+            </Column>
+            { product &&
+                <Column size={ 5 } overflow="hidden">
+                    <Column overflow="hidden" position="relative" gap={ 0 }>
+                        { roomPreviewer && <CatalogRoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } /> }
+                        { product.uniqueLimitedItem &&
+                            <Base fullWidth position="absolute" className="top-1">
+                                <LimitedEditionCompletePlateView className="mx-auto" uniqueLimitedItemsLeft={ product.uniqueLimitedItemsLeft } uniqueLimitedSeriesSize={ product.uniqueLimitedSeriesSize } />
+                            </Base> }
+                    </Column>
+                    <Column grow>
+                        <Text grow truncate>{ GetOfferName(activeOffer) }</Text>
+                        <CatalogPurchaseView offer={ activeOffer } pageId={ -1 } />
+                    </Column>
+                </Column> }
+        </Grid>
+    );
+}
diff --git a/src/components/catalog/views/page/search-result/CatalogSearchResultOfferView.tsx b/src/components/catalog/views/page/search-result/CatalogSearchResultOfferView.tsx
new file mode 100644
index 00000000..10669a85
--- /dev/null
+++ b/src/components/catalog/views/page/search-result/CatalogSearchResultOfferView.tsx
@@ -0,0 +1,38 @@
+import { GetProductOfferComposer, IFurnitureData, MouseEventType } from '@nitrots/nitro-renderer';
+import { FC, MouseEvent, useCallback } from 'react';
+import { LayoutGridItem, LayoutGridItemProps } from '../../../../../common/layout/LayoutGridItem';
+import { SendMessageHook } from '../../../../../hooks/messages/message-event';
+import { AvatarImageView } from '../../../../../views/shared/avatar-image/AvatarImageView';
+import { GetProductIconUrl } from '../../../common/GetProuductIconUrl';
+import { ProductTypeEnum } from '../../../common/ProductTypeEnum';
+
+export interface CatalogSearchResultOfferViewProps extends LayoutGridItemProps
+{
+    offer: IFurnitureData;
+}
+
+export const CatalogSearchResultOfferView: FC<CatalogSearchResultOfferViewProps> = props =>
+{
+    const { offer = null, ...rest } = props;
+
+    const onMouseEvent = useCallback((event: MouseEvent) =>
+    {
+        switch(event.type)
+        {
+            case MouseEventType.MOUSE_DOWN:
+                SendMessageHook(new GetProductOfferComposer(offer.purchaseOfferId));
+                return;
+        }
+    }, [ offer ]);
+
+    if(!offer) return null;
+
+    const iconUrl = GetProductIconUrl(offer.id, offer.type, offer.customParams);
+
+    return (
+        <LayoutGridItem itemImage={ iconUrl } onMouseDown={ onMouseEvent } { ...rest }>
+            { (offer.type === ProductTypeEnum.ROBOT) &&
+                <AvatarImageView figure={ offer.customParams } direction={ 3 } headOnly={ true } /> }
+        </LayoutGridItem>
+    );
+}
diff --git a/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.tsx b/src/components/catalog/views/page/search-result/CatalogSearchResultOffersView.tsx
similarity index 51%
rename from src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.tsx
rename to src/components/catalog/views/page/search-result/CatalogSearchResultOffersView.tsx
index 9781545a..dc382e1d 100644
--- a/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.tsx
+++ b/src/components/catalog/views/page/search-result/CatalogSearchResultOffersView.tsx
@@ -1,14 +1,18 @@
-import { GetProductOfferComposer } from '@nitrots/nitro-renderer';
+import { GetProductOfferComposer, IFurnitureData } from '@nitrots/nitro-renderer';
 import { FC, useEffect } from 'react';
-import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
-import { NitroCardGridView } from '../../../../../../layout';
-import { useCatalogContext } from '../../../../context/CatalogContext';
-import { CatalogSearchResultOfferView } from '../offer/CatalogSearchResultOfferView';
-import { CatalogSearchResultOffersViewProps } from './CatalogSearchResultOffersView.types';
+import { Grid, GridProps } from '../../../../../common/Grid';
+import { SendMessageHook } from '../../../../../hooks/messages/message-event';
+import { useCatalogContext } from '../../../context/CatalogContext';
+import { CatalogSearchResultOfferView } from './CatalogSearchResultOfferView';
+
+export interface CatalogSearchResultOffersViewProps extends GridProps
+{
+    offers: IFurnitureData[];
+}
 
 export const CatalogSearchResultOffersView: FC<CatalogSearchResultOffersViewProps> = props =>
 {
-    const { offers = [], ...rest } = props;
+    const { offers = [], children = null, ...rest } = props;
     const { catalogState = null } = useCatalogContext();
     const { activeOffer = null } = catalogState;
 
@@ -20,13 +24,14 @@ export const CatalogSearchResultOffersView: FC<CatalogSearchResultOffersViewProp
     }, [ offers ]);
 
     return (
-        <NitroCardGridView { ...rest }>
+        <Grid grow columnCount={ 5 } overflow="auto" { ...rest }>
             { offers && (offers.length > 0) && offers.map((offer, index) =>
                 {
                     const isActive = (activeOffer && (activeOffer.products[0].furniClassId === offer.id));
 
-                    return <CatalogSearchResultOfferView key={ index } isActive={ isActive } offer={ offer } />
+                    return <CatalogSearchResultOfferView key={ index } itemActive={ isActive } offer={ offer } />
                 })}
-        </NitroCardGridView>
+            { children }
+        </Grid>
     );
 }
diff --git a/src/views/catalog/views/search/CatalogSearchView.tsx b/src/components/catalog/views/search/CatalogSearchView.tsx
similarity index 82%
rename from src/views/catalog/views/search/CatalogSearchView.tsx
rename to src/components/catalog/views/search/CatalogSearchView.tsx
index ecb9b430..15dea6fb 100644
--- a/src/views/catalog/views/search/CatalogSearchView.tsx
+++ b/src/components/catalog/views/search/CatalogSearchView.tsx
@@ -1,12 +1,14 @@
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { IFurnitureData, INodeData } from '@nitrots/nitro-renderer';
 import { FC, useCallback, useEffect, useState } from 'react';
 import { GetSessionDataManager, LocalizeText } from '../../../../api';
+import { Button } from '../../../../common/Button';
+import { Flex } from '../../../../common/Flex';
 import { GetOfferNodes } from '../../common/CatalogUtilities';
 import { useCatalogContext } from '../../context/CatalogContext';
 import { CatalogActions } from '../../reducers/CatalogReducer';
-import { CatalogSearchViewProps } from './CatalogSearchView.types';
 
-export const CatalogSearchView: FC<CatalogSearchViewProps> = props =>
+export const CatalogSearchView: FC<{}> = props =>
 {
     const [ searchValue, setSearchValue ] = useState('');
     const { catalogState = null, dispatchCatalogState = null } = useCatalogContext();
@@ -110,15 +112,11 @@ export const CatalogSearchView: FC<CatalogSearchViewProps> = props =>
     }, [ searchValue, processSearch ]);
 
     return (
-        <div className="d-flex">
-            <div className="d-flex flex-grow-1 me-1">
-                <input type="text" className="form-control form-control-sm" placeholder={ LocalizeText('generic.search') } value={ searchValue } onChange={ event => setSearchValue(event.target.value) } />
-            </div>
-            <div className="d-flex">
-                <button type="button" className="btn btn-primary btn-sm">
-                    <i className="fas fa-search"></i>
-                </button>
-            </div>
-        </div>
+        <Flex gap={ 1 }>
+            <input type="text" className="form-control form-control-sm" placeholder={ LocalizeText('generic.search') } value={ searchValue } onChange={ event => setSearchValue(event.target.value) } />
+            <Button variant="primary" size="sm">
+                <FontAwesomeIcon icon="search" />
+            </Button>
+        </Flex>
     );
 }
diff --git a/src/views/catalog/views/select-group/CatalogSelectGroupView.tsx b/src/components/catalog/views/select-group/CatalogSelectGroupView.tsx
similarity index 100%
rename from src/views/catalog/views/select-group/CatalogSelectGroupView.tsx
rename to src/components/catalog/views/select-group/CatalogSelectGroupView.tsx
diff --git a/src/views/catalog/views/select-group/CatalogSelectGroupView.types.ts b/src/components/catalog/views/select-group/CatalogSelectGroupView.types.ts
similarity index 100%
rename from src/views/catalog/views/select-group/CatalogSelectGroupView.types.ts
rename to src/components/catalog/views/select-group/CatalogSelectGroupView.types.ts
diff --git a/src/views/catalog/CatalogMessageHandler.types.ts b/src/views/catalog/CatalogMessageHandler.types.ts
deleted file mode 100644
index ea5607f8..00000000
--- a/src/views/catalog/CatalogMessageHandler.types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface CatalogMessageHandlerProps
-{
-    
-}
diff --git a/src/views/catalog/views/catalog-icon/CatalogIconView.scss b/src/views/catalog/views/catalog-icon/CatalogIconView.scss
deleted file mode 100644
index fcf54c95..00000000
--- a/src/views/catalog/views/catalog-icon/CatalogIconView.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.catalog-icon-image {
-    width: 20px;
-    height: 20px;
-    min-width: 20px;
-    min-height: 20px;
-    background-position: center;
-    background-repeat: no-repeat;
-}
diff --git a/src/views/catalog/views/catalog-icon/CatalogIconView.tsx b/src/views/catalog/views/catalog-icon/CatalogIconView.tsx
deleted file mode 100644
index 2267f5d4..00000000
--- a/src/views/catalog/views/catalog-icon/CatalogIconView.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { FC } from 'react';
-import { GetConfiguration } from '../../../../api';
-import { CatalogIconViewProps } from './CatalogIconView.types';
-
-export const CatalogIconView: FC<CatalogIconViewProps> = props =>
-{
-    const { icon = 0 } = props;
-
-    function getIconUrl(): string
-    {
-        return ((GetConfiguration<string>('catalog.asset.icon.url')).replace('%name%', icon.toString()));
-    }
-
-    const url = `url('${ getIconUrl() }')`;
-
-    return <div className="catalog-icon-image" style={ (url && url.length) ? { backgroundImage: url } : {} }></div>;
-}
diff --git a/src/views/catalog/views/catalog-icon/CatalogIconView.types.ts b/src/views/catalog/views/catalog-icon/CatalogIconView.types.ts
deleted file mode 100644
index 20affcb3..00000000
--- a/src/views/catalog/views/catalog-icon/CatalogIconView.types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface CatalogIconViewProps
-{
-    icon: number;
-}
diff --git a/src/views/catalog/views/gift/CatalogGiftView.tsx b/src/views/catalog/views/gift/CatalogGiftView.tsx
deleted file mode 100644
index 258d07f5..00000000
--- a/src/views/catalog/views/gift/CatalogGiftView.tsx
+++ /dev/null
@@ -1,239 +0,0 @@
-import { PurchaseFromCatalogAsGiftComposer } from '@nitrots/nitro-renderer';
-import classNames from 'classnames';
-import { FC, useCallback, useEffect, useMemo, useState } from 'react';
-import { GetSessionDataManager, LocalizeText } from '../../../../api';
-import { CatalogEvent } from '../../../../events';
-import { CatalogInitGiftEvent } from '../../../../events/catalog/CatalogInitGiftEvent';
-import { SendMessageHook, useUiEvent } from '../../../../hooks';
-import { NitroCardContentView, NitroCardHeaderView, NitroCardView, NitroLayoutGiftCardView } from '../../../../layout';
-import { CurrencyIcon } from '../../../shared/currency-icon/CurrencyIcon';
-import { FurniImageView } from '../../../shared/furni-image/FurniImageView';
-import { useCatalogContext } from '../../context/CatalogContext';
-
-export const CatalogGiftView: FC<{}> = props =>
-{
-    const { catalogState = null } = useCatalogContext();
-    const { giftConfiguration = null } = catalogState;
-
-    const [ isVisible, setIsVisible ] = useState<boolean>(false);
-    const [ pageId, setPageId ] = useState<number>(0);
-    const [ offerId, setOfferId ] = useState<number>(0);
-
-    const [ receiverName, setReceiverName ] = useState<string>('');
-    const [ showMyFace, setShowMyFace ] = useState<boolean>(true);
-    const [ message, setMessage ] = useState<string>('');
-    const [ colors, setColors ] = useState<{ id: number, color: string }[]>([]);
-    const [ selectedBoxIndex, setSelectedBoxIndex ] = useState<number>(0);
-    const [ selectedRibbonIndex, setSelectedRibbonIndex ] = useState<number>(0);
-    const [ selectedColorId, setSelectedColorId ] = useState<number>(0);
-    const [ maxBoxIndex, setMaxBoxIndex ] = useState<number>(0);
-    const [ maxRibbonIndex, setMaxRibbonIndex ] = useState<number>(0);
-
-    const [ receiverNotFound, setReceiverNotFound ] = useState<boolean>(false);
-
-    useEffect(() =>
-    {
-        setReceiverNotFound(false);
-    }, [ receiverName ]);
-
-    useEffect(() =>
-    {
-        if(!giftConfiguration) return;
-
-        setMaxBoxIndex(giftConfiguration.boxTypes.length - 1);
-        setMaxRibbonIndex(giftConfiguration.ribbonTypes.length - 1);
-
-        const newColors: { id: number, color: string }[] = [];
-
-        for(const colorId of giftConfiguration.stuffTypes)
-        {
-            const giftData = GetSessionDataManager().getFloorItemData(colorId);
-
-            if(!giftData) continue;
-
-            if(giftData.colors && giftData.colors.length > 0) newColors.push({ id: colorId, color: `#${giftData.colors[0].toString(16)}` });
-        }
-
-        if(newColors.length)
-        {
-            setSelectedColorId(newColors[0].id);
-            setColors(newColors);
-        }
-    }, [ giftConfiguration ]);
-
-    const close = useCallback(() =>
-    {
-        setIsVisible(false);
-        setPageId(0);
-        setOfferId(0);
-        setReceiverName('');
-        setShowMyFace(true);
-        setMessage('');
-        setSelectedBoxIndex(0);
-        setSelectedRibbonIndex(0);
-        
-        if(colors.length) setSelectedColorId(colors[0].id);
-    }, [ colors ]);
-
-    const onCatalogEvent = useCallback((event: CatalogEvent) =>
-    {
-        switch(event.type)
-        {
-            case CatalogEvent.PURCHASE_SUCCESS:
-                close();
-                return;
-            case CatalogEvent.INIT_GIFT:
-                const castedEvent = (event as CatalogInitGiftEvent);
-                close();
-
-                setPageId(castedEvent.pageId);
-                setOfferId(castedEvent.offerId);
-                setIsVisible(true);
-                return;
-            case CatalogEvent.GIFT_RECEIVER_NOT_FOUND:
-                setReceiverNotFound(true);
-                return;
-        }
-    }, [ close ]);
-
-    useUiEvent(CatalogEvent.PURCHASE_SUCCESS, onCatalogEvent);
-    useUiEvent(CatalogEvent.INIT_GIFT, onCatalogEvent);
-    useUiEvent(CatalogEvent.GIFT_RECEIVER_NOT_FOUND, onCatalogEvent);
-
-    const isBoxDefault = useMemo(() =>
-    {
-        return giftConfiguration ? giftConfiguration.defaultStuffTypes.findIndex(s => s === giftConfiguration.boxTypes[selectedBoxIndex]) > -1 : true;
-    }, [ giftConfiguration, selectedBoxIndex ]);
-
-    const boxName = useMemo(() =>
-    {
-        return isBoxDefault ? 'catalog.gift_wrapping_new.box.default' : `catalog.gift_wrapping_new.box.${selectedBoxIndex}`;
-    }, [ isBoxDefault, selectedBoxIndex ]);
-
-    const ribbonName = useMemo(() =>
-    {
-        return `catalog.gift_wrapping_new.ribbon.${selectedRibbonIndex}`;
-    }, [ selectedRibbonIndex ]);
-
-    const priceText = useMemo(() =>
-    {
-        return isBoxDefault ? 'catalog.gift_wrapping_new.freeprice' : 'catalog.gift_wrapping_new.price';
-    }, [ isBoxDefault ]);
-
-    const extraData = useMemo(() =>
-    {
-        if(!giftConfiguration) return '';
-
-        return ((giftConfiguration.boxTypes[selectedBoxIndex] * 1000) + giftConfiguration.ribbonTypes[selectedRibbonIndex]).toString();
-    }, [ giftConfiguration, selectedBoxIndex, selectedRibbonIndex ]);
-
-    const isColorable = useMemo(() =>
-    {
-        if(!giftConfiguration) return false;
-        
-        const boxType = giftConfiguration.boxTypes[selectedBoxIndex];
-
-        return (boxType === 8 || (boxType >= 3 && boxType <= 6)) ? false : true;
-    }, [ giftConfiguration, selectedBoxIndex ]);
-
-    const handleAction = useCallback((action: string) =>
-    {
-        switch(action)
-        {
-            case 'prev_box':
-                setSelectedBoxIndex(value =>
-                    {
-                        return (value === 0 ? maxBoxIndex : value - 1);
-                    });
-                return;
-            case 'next_box':
-                setSelectedBoxIndex(value =>
-                    {
-                        return (value === maxBoxIndex ? 0 : value + 1);
-                    });
-                return;
-            case 'prev_ribbon':
-                setSelectedRibbonIndex(value =>
-                    {
-                        return (value === 0 ? maxRibbonIndex : value - 1);
-                    });
-                return;
-            case 'next_ribbon':
-                setSelectedRibbonIndex(value =>
-                    {
-                        return (value === maxRibbonIndex ? 0 : value + 1);
-                    });
-                return;
-            case 'buy':
-                if(!receiverName || receiverName.length === 0)
-                {
-                    setReceiverNotFound(true);
-                    return;
-                }
-                
-                SendMessageHook(new PurchaseFromCatalogAsGiftComposer(pageId, offerId, extraData, receiverName, message, selectedColorId, selectedBoxIndex, selectedRibbonIndex, showMyFace));
-                return;
-        }
-    }, [ extraData, maxBoxIndex, maxRibbonIndex, message, offerId, pageId, receiverName, selectedBoxIndex, selectedColorId, selectedRibbonIndex, showMyFace ]);
-
-    if(!giftConfiguration || !giftConfiguration.isEnabled || !isVisible) return null;
-
-    return (
-        <NitroCardView uniqueKey="catalog-gift" className="nitro-catalog-gift" simple={ true }>
-            <NitroCardHeaderView headerText={ LocalizeText('catalog.gift_wrapping.title') } onCloseClick={ close } />
-            <NitroCardContentView className="text-black">
-                <div className="form-group">
-                    <label>{ LocalizeText('catalog.gift_wrapping.receiver') }</label>
-                    <input type="text" className={ 'form-control form-control-sm' + classNames({ ' is-invalid': receiverNotFound }) } value={ receiverName } onChange={ (e) => setReceiverName(e.target.value) } />
-                    { receiverNotFound && <div className="invalid-feedback">{ LocalizeText('catalog.gift_wrapping.receiver_not_found.title') }</div> }
-                </div>
-                <div className="mt-2">
-                    <NitroLayoutGiftCardView figure={ GetSessionDataManager().figure } userName={ GetSessionDataManager().userName } message={ message } editable={ true } onChange={ (value) => setMessage(value) } />
-                </div>
-                <div className="form-check mt-1">
-                    <input className="form-check-input" type="checkbox" name="showMyFace" checked={ showMyFace } onChange={ (e) => setShowMyFace(value => !value) } />
-                    <label className="form-check-label">{ LocalizeText('catalog.gift_wrapping.show_face.title') }</label>
-                </div>
-                <div className="d-flex gap-2 mt-1 align-items-center">
-                    <div className="gift-preview">
-                        { selectedColorId && <FurniImageView spriteId={ selectedColorId } type="s" extras={ extraData } /> }
-                    </div>
-                    <div className="d-flex flex-column gap-2">
-                        <div className="d-flex gap-2">
-                            <div className="btn-group">
-                                <button className="btn btn-primary" onClick={ () => handleAction('prev_box') }><i className="fas fa-chevron-left" /></button>
-                                <button className="btn btn-primary" onClick={ () => handleAction('next_box') }><i className="fas fa-chevron-right" /></button>
-                            </div>
-                            <div>
-                                <div className="fw-bold">{ LocalizeText(boxName) }</div>
-                                <div className="d-flex align-items-center gap-1">{ LocalizeText(priceText, ['price'], [giftConfiguration.price.toString()]) }<CurrencyIcon type={ -1 } /></div>
-                            </div>
-                        </div>
-                        <div className="d-flex gap-2 align-items-center">
-                            <div className="btn-group">
-                                <button className="btn btn-primary" onClick={ () => handleAction('prev_ribbon') }><i className="fas fa-chevron-left" /></button>
-                                <button className="btn btn-primary" onClick={ () => handleAction('next_ribbon') }><i className="fas fa-chevron-right" /></button>
-                            </div>
-                            <div>
-                                <div className="fw-bold">{ LocalizeText(ribbonName) }</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div className="mt-1">
-                    <div className="fw-bold">{ LocalizeText('catalog.gift_wrapping.pick_color') }</div>
-                    <div className="btn-group w-100">
-                        { colors.map(color =>
-                            {
-                                return <button key={ color.id } className={ 'btn btn-dark btn-sm' + classNames({ ' active': color.id === selectedColorId }) } disabled={ !isColorable } style={{ backgroundColor: color.color }} onClick={ () => setSelectedColorId(color.id) }></button>
-                            }) }
-                    </div>
-                </div>
-                <div className="d-flex justify-content-between align-items-center mt-2">
-                    <div className="text-decoration-underline cursor-pointer" onClick={ close }>{ LocalizeText('cancel') }</div>
-                    <button className="btn btn-success" onClick={ () => handleAction('buy') }>{ LocalizeText('catalog.gift_wrapping.give_gift') }</button>
-                </div>
-            </NitroCardContentView>
-        </NitroCardView>
-    );
-};
diff --git a/src/views/catalog/views/navigation/CatalogNavigationView.types.ts b/src/views/catalog/views/navigation/CatalogNavigationView.types.ts
deleted file mode 100644
index 6e248f42..00000000
--- a/src/views/catalog/views/navigation/CatalogNavigationView.types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { INodeData } from '@nitrots/nitro-renderer';
-import { Dispatch, SetStateAction } from 'react';
-
-export interface CatalogNavigationViewProps
-{
-    page: INodeData;
-    pendingTree: INodeData[];
-    setPendingTree: Dispatch<SetStateAction<INodeData[]>>;
-}
diff --git a/src/views/catalog/views/navigation/item/CatalogNavigationItemView.types.ts b/src/views/catalog/views/navigation/item/CatalogNavigationItemView.types.ts
deleted file mode 100644
index 455964fc..00000000
--- a/src/views/catalog/views/navigation/item/CatalogNavigationItemView.types.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { INodeData } from '@nitrots/nitro-renderer';
-import { Dispatch, SetStateAction } from 'react';
-
-export interface CatalogNavigationItemViewProps
-{
-    page: INodeData;
-    isActive: boolean;
-    pendingTree: INodeData[];
-    setPendingTree: Dispatch<SetStateAction<INodeData[]>>;
-    setActiveChild: Dispatch<SetStateAction<INodeData>>;
-}
diff --git a/src/views/catalog/views/navigation/set/CatalogNavigationSetView.types.ts b/src/views/catalog/views/navigation/set/CatalogNavigationSetView.types.ts
deleted file mode 100644
index 7f42bd83..00000000
--- a/src/views/catalog/views/navigation/set/CatalogNavigationSetView.types.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { INodeData } from '@nitrots/nitro-renderer';
-import { Dispatch, SetStateAction } from 'react';
-
-export interface CatalogNavigationSetViewProps
-{
-    page: INodeData;
-    isFirstSet?: boolean;
-    pendingTree: INodeData[];
-    setPendingTree: Dispatch<SetStateAction<INodeData[]>>;
-}
diff --git a/src/views/catalog/views/page/CatalogPageView.types.ts b/src/views/catalog/views/page/CatalogPageView.types.ts
deleted file mode 100644
index 77b9e586..00000000
--- a/src/views/catalog/views/page/CatalogPageView.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { RoomPreviewer } from '@nitrots/nitro-renderer';
-
-export interface CatalogPageViewProps
-{
-    roomPreviewer: RoomPreviewer;
-}
diff --git a/src/views/catalog/views/page/layout/CatalogLayout.scss b/src/views/catalog/views/page/layout/CatalogLayout.scss
deleted file mode 100644
index 3302b3b8..00000000
--- a/src/views/catalog/views/page/layout/CatalogLayout.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import './frontpage4/CatalogLayoutFrontpage4View';
-@import './info-loyalty/CatalogLayoutInfoLoyaltyView.scss';
-@import './vip-buy/CatalogLayoutVipBuyView';
-@import './marketplace/marketplace-item/MarketplaceItemView';
-@import './marketplace/post-offer/MarketplacePostOfferView';
diff --git a/src/views/catalog/views/page/layout/badge-display/CatalogLayoutBadgeDisplayView.types.ts b/src/views/catalog/views/page/layout/badge-display/CatalogLayoutBadgeDisplayView.types.ts
deleted file mode 100644
index 172af17b..00000000
--- a/src/views/catalog/views/page/layout/badge-display/CatalogLayoutBadgeDisplayView.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutBadgeDisplayViewProps extends CatalogLayoutProps
-{
-
-}
diff --git a/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.types.ts b/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.types.ts
deleted file mode 100644
index 7f68bff0..00000000
--- a/src/views/catalog/views/page/layout/default/CatalogLayoutDefaultView.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutDefaultViewProps extends CatalogLayoutProps
-{
-    
-}
diff --git a/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.scss b/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.scss
deleted file mode 100644
index 4d79a2c7..00000000
--- a/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-.nitro-front-page-item {
-    background-position: center;
-    background-repeat: no-repeat;
-    cursor: pointer;
-
-    .front-page-item-caption {
-        position: absolute;
-        background: rgba(0, 0, 0, .5);
-        color: #fff;
-        font-size: 16px;
-        border-radius: 5px;
-        margin: 10px;
-        padding: 5px 15px;
-        bottom: 0;
-        text-shadow: 2px 2px rgba(0, 0, 0, .2);
-    }
-}
diff --git a/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.types.ts b/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.types.ts
deleted file mode 100644
index 292e4989..00000000
--- a/src/views/catalog/views/page/layout/frontpage4/CatalogLayoutFrontpage4View.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutFrontpage4ViewProps extends CatalogLayoutProps
-{
-    
-}
diff --git a/src/views/catalog/views/page/layout/frontpage4/item/CatalogLayoutFrontPageItemView.tsx b/src/views/catalog/views/page/layout/frontpage4/item/CatalogLayoutFrontPageItemView.tsx
deleted file mode 100644
index 9ead2796..00000000
--- a/src/views/catalog/views/page/layout/frontpage4/item/CatalogLayoutFrontPageItemView.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { FC, useMemo } from 'react';
-import { GetConfiguration } from '../../../../../../../api';
-import { NitroLayoutBase } from '../../../../../../../layout/base';
-import { CatalogLayoutFrontPageItemViewProps } from './CatalogLayoutFrontPageItemView.types';
-
-export const CatalogLayoutFrontPageItemView: FC<CatalogLayoutFrontPageItemViewProps> = props =>
-{
-    const { item = null, className = '', style = null, ...rest } = props;
-
-    const getClassName = useMemo(() =>
-    {
-        let newClassName = 'position-relative rounded h-100 nitro-front-page-item';
-
-        if(className && className.length) newClassName += ' ' + className;
-
-        return newClassName;
-    }, [ className ]);
-
-    const getStyle = useMemo(() =>
-    {
-        const newStyle = { ...style };
-
-        newStyle.backgroundImage = `url('${ GetConfiguration<string>('image.library.url') }${ item.itemPromoImage }')`;
-
-        return newStyle;
-    }, [ style, item ]);
-
-    if(!item) return null;
-
-    return (
-        <NitroLayoutBase className={ getClassName } style={ getStyle } { ...rest }>
-            <div className="front-page-item-caption">{ item.itemName }</div>
-        </NitroLayoutBase>
-    );
-}
diff --git a/src/views/catalog/views/page/layout/frontpage4/item/CatalogLayoutFrontPageItemView.types.ts b/src/views/catalog/views/page/layout/frontpage4/item/CatalogLayoutFrontPageItemView.types.ts
deleted file mode 100644
index 6f6135d1..00000000
--- a/src/views/catalog/views/page/layout/frontpage4/item/CatalogLayoutFrontPageItemView.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { FrontPageItem } from '@nitrots/nitro-renderer';
-import { DetailedHTMLProps, HTMLAttributes } from 'react';
-
-export interface CatalogLayoutFrontPageItemViewProps extends DetailedHTMLProps<HTMLAttributes<HTMLDivElement>, HTMLDivElement>
-{
-    item: FrontPageItem;
-}
diff --git a/src/views/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.types.ts b/src/views/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.types.ts
deleted file mode 100644
index 581b6f9a..00000000
--- a/src/views/catalog/views/page/layout/guild-custom-furni/CatalogLayoutGuildCustomFurniView.types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutGuildCustomFurniViewProps extends CatalogLayoutProps
-{}
diff --git a/src/views/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.types.ts b/src/views/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.types.ts
deleted file mode 100644
index 5ea8ffac..00000000
--- a/src/views/catalog/views/page/layout/guild-forum/CatalogLayoutGuildForumView.types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutGuildForumViewProps extends CatalogLayoutProps
-{}
diff --git a/src/views/catalog/views/page/layout/guild-frontpage/CatalogLayoutGuildFrontpageView.tsx b/src/views/catalog/views/page/layout/guild-frontpage/CatalogLayoutGuildFrontpageView.tsx
deleted file mode 100644
index 2ad9bd2e..00000000
--- a/src/views/catalog/views/page/layout/guild-frontpage/CatalogLayoutGuildFrontpageView.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { FC } from 'react';
-import { CreateLinkEvent, LocalizeText } from '../../../../../../api';
-import { NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
-import { NitroLayoutBase } from '../../../../../../layout/base';
-import { GetCatalogPageImage, GetCatalogPageText } from '../../../../common/CatalogUtilities';
-import { CatalogLayoutGuildFrontpageViewProps } from './CatalogLayoutGuildFrontpageView.types';
-
-export const CatalogLayouGuildFrontpageView: FC<CatalogLayoutGuildFrontpageViewProps> = props =>
-{
-    const { pageParser = null } = props;
-    
-    return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn className="bg-muted rounded p-2 text-black overflow-hidden" size={ 7 }>
-                <NitroLayoutBase dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 2) } } />
-                <NitroLayoutBase className="overflow-auto" dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 0) } } />
-                <NitroLayoutBase dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 1) } } />
-            </NitroLayoutGridColumn>
-            <NitroLayoutGridColumn size={ 5 }>
-                <div className="d-block mb-2">
-                    <img alt="" src={ GetCatalogPageImage(pageParser, 1) } />
-                </div>
-                <div className="col position-relative d-flex flex-column justify-content-center" onClick={ () => CreateLinkEvent('groups/create') }>
-                    <button className="btn btn-sm btn-primary mt-1">{ LocalizeText('catalog.start.guild.purchase.button') }</button>
-                </div>
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
-    );
-}
diff --git a/src/views/catalog/views/page/layout/guild-frontpage/CatalogLayoutGuildFrontpageView.types.ts b/src/views/catalog/views/page/layout/guild-frontpage/CatalogLayoutGuildFrontpageView.types.ts
deleted file mode 100644
index 9ff88511..00000000
--- a/src/views/catalog/views/page/layout/guild-frontpage/CatalogLayoutGuildFrontpageView.types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutGuildFrontpageViewProps extends CatalogLayoutProps
-{}
diff --git a/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.scss b/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.scss
deleted file mode 100644
index 8bb939db..00000000
--- a/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-.nitro-catalog-layout-info-loyalty {
-
-    .info-loyalty-content {
-        background-repeat: no-repeat;
-        background-position: top right;
-        background-image: url('../../../../../../assets/images/catalog/diamond_info_illustration.gif');
-        padding-right:123px;
-    }
-
-    .info-image {
-        width: 123px;
-        height:350px;
-        background-image: url('../../../../../../assets/images/catalog/diamond_info_illustration.gif');
-    }
-}
diff --git a/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.types.ts b/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.types.ts
deleted file mode 100644
index 81405a89..00000000
--- a/src/views/catalog/views/page/layout/info-loyalty/CatalogLayoutInfoLoyaltyView.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutInfoLoyaltyViewProps extends CatalogLayoutProps
-{
-    
-}
diff --git a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.types.ts b/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.types.ts
deleted file mode 100644
index 8a967b49..00000000
--- a/src/views/catalog/views/page/layout/pets/CatalogLayoutPetView.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutPetViewProps extends CatalogLayoutProps
-{
-    
-}
diff --git a/src/views/catalog/views/page/layout/pets/name-approval/CatalogPetNameApprovalView.types.ts b/src/views/catalog/views/page/layout/pets/name-approval/CatalogPetNameApprovalView.types.ts
deleted file mode 100644
index 0df0c181..00000000
--- a/src/views/catalog/views/page/layout/pets/name-approval/CatalogPetNameApprovalView.types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Dispatch, SetStateAction } from 'react';
-
-export interface CatalogPetNameApprovalViewProps
-{
-    petNameValue: string;
-    setPetNameValue: Dispatch<SetStateAction<string>>;
-    nameApproved: boolean;
-    setNameApproved: Dispatch<SetStateAction<boolean>>;
-}
diff --git a/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.tsx b/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.tsx
deleted file mode 100644
index c7b02518..00000000
--- a/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { ApproveNameMessageComposer } from '@nitrots/nitro-renderer';
-import { FC, useCallback, useState } from 'react';
-import { LocalizeText } from '../../../../../../../api';
-import { CatalogEvent } from '../../../../../../../events';
-import { useUiEvent } from '../../../../../../../hooks/events/ui/ui-event';
-import { SendMessageHook } from '../../../../../../../hooks/messages/message-event';
-import { CurrencyIcon } from '../../../../../../shared/currency-icon/CurrencyIcon';
-import { CatalogPurchaseButtonView } from '../../../purchase/purchase-button/CatalogPurchaseButtonView';
-import { CatalogPurchaseGiftButtonView } from '../../../purchase/purchase-gift-button/CatalogPurchaseGiftButtonView';
-import { CatalogPetNameApprovalView } from '../name-approval/CatalogPetNameApprovalView';
-import { CatalogLayoutPetPurchaseViewProps } from './CatalogLayoutPetPurchaseView.types';
-
-export const CatalogLayoutPetPurchaseView: FC<CatalogLayoutPetPurchaseViewProps> = props =>
-{
-    const { offer = null, pageId = -1, extra = '' } = props;
-    const [ petNameValue, setPetNameValue ] = useState('');
-    const [ nameApproved, setNameApproved ] = useState(false);
-
-    const onCatalogEvent = useCallback((event: CatalogEvent) =>
-    {
-        switch(event.type)
-        {
-            case CatalogEvent.PURCHASE_SUCCESS:
-                setNameApproved(false);
-                return;
-        }
-    }, []);
-
-    useUiEvent(CatalogEvent.PURCHASE_SUCCESS, onCatalogEvent);
-
-    const beforePurchase = useCallback(() =>
-    {
-        SendMessageHook(new ApproveNameMessageComposer(petNameValue, 1));
-    }, [ petNameValue ]);
-
-    const extraData = `${ petNameValue }\n${ extra }`;
-    
-    return (
-        <>
-            <div className="d-flex flex-grow-1 justify-content-center align-items-center">
-                <CatalogPetNameApprovalView petNameValue={ petNameValue } setPetNameValue={ setPetNameValue } nameApproved={ nameApproved } setNameApproved={ setNameApproved } />
-            </div>
-            <div className="d-flex flex-column flex-grow-1 justify-content-end w-100">
-                <div className="d-flex align-items-end">
-                    <div className="flex-grow-1 align-items-end">
-                        <span className="text-black">{ LocalizeText('catalog.bundlewidget.price') }</span>
-                    </div>
-                    <div className="d-flex flex-column">
-                        { (offer.priceCredits > 0) &&
-                            <div className="d-flex align-items-center justify-content-end">
-                                <span className="text-black ms-1">{ offer.priceCredits }</span>
-                                <CurrencyIcon type={ -1 } />
-                            </div> }
-                        { (offer.priceActivityPoints > 0) &&
-                            <div className="d-flex align-items-center justify-content-end">
-                                <span className="text-black ms-1">{ offer.priceActivityPoints }</span>
-                                <CurrencyIcon type={ offer.priceActivityPointsType } />
-                            </div> }
-                    </div>
-                </div>
-                <div className="d-flex flex-column mt-1">
-                    <CatalogPurchaseButtonView className="btn-sm w-100" offer={ offer } pageId={ pageId } extra={ extraData } quantity={ 1 } isPurchaseAllowed={ nameApproved } beforePurchase={ beforePurchase } />
-                    { offer.giftable &&
-                        <CatalogPurchaseGiftButtonView className="btn-sm w-100 mt-1" offer={ offer } pageId={ pageId } extra={ extraData } disabled={ nameApproved } /> }
-                </div>
-            </div>
-        </>
-    );
-}
diff --git a/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.types.ts b/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.types.ts
deleted file mode 100644
index 070edca1..00000000
--- a/src/views/catalog/views/page/layout/pets/purchase/CatalogLayoutPetPurchaseView.types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer';
-
-export interface CatalogLayoutPetPurchaseViewProps
-{
-    offer: CatalogPageMessageOfferData;
-    pageId: number;
-    extra?: string;
-}
diff --git a/src/views/catalog/views/page/layout/pets2/CatalogLayoutPets2View.types.ts b/src/views/catalog/views/page/layout/pets2/CatalogLayoutPets2View.types.ts
deleted file mode 100644
index 28a4c845..00000000
--- a/src/views/catalog/views/page/layout/pets2/CatalogLayoutPets2View.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutPets2ViewProps extends CatalogLayoutProps
-{
-    
-}
diff --git a/src/views/catalog/views/page/layout/pets3/CatalogLayoutPets3View.tsx b/src/views/catalog/views/page/layout/pets3/CatalogLayoutPets3View.tsx
deleted file mode 100644
index 8e1977f5..00000000
--- a/src/views/catalog/views/page/layout/pets3/CatalogLayoutPets3View.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { FC } from 'react';
-import { NitroLayoutFlex, NitroLayoutFlexColumn, NitroLayoutGrid, NitroLayoutGridColumn } from '../../../../../../layout';
-import { NitroLayoutBase } from '../../../../../../layout/base';
-import { GetCatalogPageImage, GetCatalogPageText } from '../../../../common/CatalogUtilities';
-import { CatalogLayoutPets3ViewProps } from './CatalogLayoutPets3View.types';
-
-export const CatalogLayoutPets3View: FC<CatalogLayoutPets3ViewProps> = props =>
-{
-    const { pageParser = null } = props;
-
-    const imageUrl = GetCatalogPageImage(pageParser, 1);
-    
-    return (
-        <NitroLayoutGrid>
-            <NitroLayoutGridColumn className="bg-muted rounded text-black p-2" overflow="hidden" size={ 12 }>
-                <NitroLayoutFlex className="align-items-center" gap={ 2 }>
-                    { imageUrl && <img alt="" src={ GetCatalogPageImage(pageParser, 1) } /> }
-                    <NitroLayoutBase className="fs-5" dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 1) } } />
-                </NitroLayoutFlex>
-                <NitroLayoutFlexColumn className="align-items-center flex-grow-1" overflow="auto">
-                    <NitroLayoutBase dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 2) } } />
-                </NitroLayoutFlexColumn>
-                <NitroLayoutFlex className="align-items-center">
-                    <NitroLayoutBase className="fw-bold" dangerouslySetInnerHTML={ { __html: GetCatalogPageText(pageParser, 3) } } />
-                </NitroLayoutFlex>
-            </NitroLayoutGridColumn>
-        </NitroLayoutGrid>
-    );
-}
diff --git a/src/views/catalog/views/page/layout/pets3/CatalogLayoutPets3View.types.ts b/src/views/catalog/views/page/layout/pets3/CatalogLayoutPets3View.types.ts
deleted file mode 100644
index 7575e8f5..00000000
--- a/src/views/catalog/views/page/layout/pets3/CatalogLayoutPets3View.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutPets3ViewProps extends CatalogLayoutProps
-{
-    
-}
diff --git a/src/views/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.types.ts b/src/views/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.types.ts
deleted file mode 100644
index a718b35e..00000000
--- a/src/views/catalog/views/page/layout/single-bundle/CatalogLayoutSingleBundleView.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutSingleBundleViewProps extends CatalogLayoutProps
-{
-    
-}
diff --git a/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.types.ts b/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.types.ts
deleted file mode 100644
index 1408ebf0..00000000
--- a/src/views/catalog/views/page/layout/spaces-new/CatalogLayoutSpacesView.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutSpacesViewProps extends CatalogLayoutProps
-{
-    
-}
diff --git a/src/views/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.types.ts b/src/views/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.types.ts
deleted file mode 100644
index 3f0cef1c..00000000
--- a/src/views/catalog/views/page/layout/trophies/CatalogLayoutTrophiesView.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutTrophiesViewProps extends CatalogLayoutProps
-{
-
-}
diff --git a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.scss b/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.scss
deleted file mode 100644
index e2684851..00000000
--- a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-.nitro-catalog-layout-vip-buy {
-
-    .vip-buy-grid {
-
-        .grid-item-container {
-            height: 80px !important;
-            max-height: 80px !important;
-        }
-
-        .hc-banner {
-            width: 68px;
-            height: 40px;
-            background: url(../../../../../../assets/images/catalog/hc_big.png) center no-repeat;
-        }
-    }
-}
diff --git a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.types.ts b/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.types.ts
deleted file mode 100644
index 071bf0cc..00000000
--- a/src/views/catalog/views/page/layout/vip-buy/CatalogLayoutVipBuyView.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CatalogLayoutProps } from '../CatalogLayout.types';
-
-export interface CatalogLayoutVipBuyViewProps extends CatalogLayoutProps
-{
-
-}
diff --git a/src/views/catalog/views/page/offer/CatalogPageOfferView.types.ts b/src/views/catalog/views/page/offer/CatalogPageOfferView.types.ts
deleted file mode 100644
index c2bc146f..00000000
--- a/src/views/catalog/views/page/offer/CatalogPageOfferView.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer';
-
-export interface CatalogPageOfferViewProps
-{
-    isActive: boolean;
-    offer: CatalogPageMessageOfferData;
-}
diff --git a/src/views/catalog/views/page/offers/CatalogPageOffersView.tsx b/src/views/catalog/views/page/offers/CatalogPageOffersView.tsx
deleted file mode 100644
index 620cc498..00000000
--- a/src/views/catalog/views/page/offers/CatalogPageOffersView.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { FC } from 'react';
-import { NitroCardGridView } from '../../../../../layout';
-import { useCatalogContext } from '../../../context/CatalogContext';
-import { CatalogPageOfferView } from '../offer/CatalogPageOfferView';
-import { CatalogPageOffersViewProps } from './CatalogPageOffersView.types';
-
-export const CatalogPageOffersView: FC<CatalogPageOffersViewProps> = props =>
-{
-    const { offers = [], ...rest } = props;
-    const { catalogState = null, dispatchCatalogState = null } = useCatalogContext();
-    const { activeOffer = null } = catalogState;
-
-    return (
-        <NitroCardGridView { ...rest }>
-            { offers && (offers.length > 0) && offers.map((offer, index) =>
-                {
-                    return <CatalogPageOfferView key={ index } isActive={ (activeOffer === offer) } offer={ offer } />
-                })}
-        </NitroCardGridView>
-    );
-}
diff --git a/src/views/catalog/views/page/offers/CatalogPageOffersView.types.ts b/src/views/catalog/views/page/offers/CatalogPageOffersView.types.ts
deleted file mode 100644
index 451510cc..00000000
--- a/src/views/catalog/views/page/offers/CatalogPageOffersView.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer';
-import { DetailsHTMLAttributes } from 'react';
-
-export interface CatalogPageOffersViewProps extends DetailsHTMLAttributes<HTMLDivElement>
-{
-    offers: CatalogPageMessageOfferData[];
-}
diff --git a/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.tsx b/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.tsx
deleted file mode 100644
index 7d72cbb1..00000000
--- a/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { FC } from 'react';
-import { NitroLayoutFlexColumn } from '../../../../../layout';
-import { NitroLayoutBase } from '../../../../../layout/base';
-import { BadgeImageView } from '../../../../shared/badge-image/BadgeImageView';
-import { LimitedEditionCompletePlateView } from '../../../../shared/limited-edition/complete-plate/LimitedEditionCompletePlateView';
-import { GetOfferName } from '../../../common/CatalogUtilities';
-import { CatalogRoomPreviewerView } from '../../catalog-room-previewer/CatalogRoomPreviewerView';
-import { CatalogPageDetailsView } from '../../page-details/CatalogPageDetailsView';
-import { CatalogPurchaseView } from '../purchase/CatalogPurchaseView';
-import { CatalogProductPreviewViewProps } from './CatalogProductPreviewView.types';
-
-export const CatalogProductPreviewView: FC<CatalogProductPreviewViewProps> = props =>
-{
-    const { pageParser = null, activeOffer = null, roomPreviewer = null, badgeCode = null, extra = '', disabled = false, children = null } = props;
-
-    const product = ((activeOffer && activeOffer.products[0]) || null);
-
-    if(!product) return <CatalogPageDetailsView pageParser={ pageParser } />;
-
-    return (
-        <>
-            <NitroLayoutFlexColumn overflow="hidden" position="relative">
-                { roomPreviewer && <CatalogRoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } /> }
-                { product.uniqueLimitedItem &&
-                    <NitroLayoutBase className="top-2 end-2" position="absolute">
-                        <LimitedEditionCompletePlateView uniqueLimitedItemsLeft={ product.uniqueLimitedItemsLeft } uniqueLimitedSeriesSize={ product.uniqueLimitedSeriesSize } />
-                    </NitroLayoutBase> }
-                { badgeCode && badgeCode.length &&
-                    <NitroLayoutBase className="top-2 end-2" position="absolute">
-                        <BadgeImageView badgeCode={ badgeCode } isGroup={ true } />
-                    </NitroLayoutBase> }
-            </NitroLayoutFlexColumn>
-            <NitroLayoutFlexColumn className="flex-grow-1" gap={ 2 }>
-                <NitroLayoutBase className="flex-grow-1 text-black text-truncate">{ GetOfferName(activeOffer) }</NitroLayoutBase>
-                { children }
-                <CatalogPurchaseView offer={ activeOffer } pageId={ pageParser.pageId } extra={ extra } disabled={ disabled } />
-            </NitroLayoutFlexColumn>
-        </>
-    );
-}
diff --git a/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.types.ts b/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.types.ts
deleted file mode 100644
index 5aa1a744..00000000
--- a/src/views/catalog/views/page/product-preview/CatalogProductPreviewView.types.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { CatalogPageMessageOfferData, CatalogPageMessageParser, RoomPreviewer } from '@nitrots/nitro-renderer';
-
-export interface CatalogProductPreviewViewProps
-{
-    pageParser: CatalogPageMessageParser;
-    activeOffer: CatalogPageMessageOfferData;
-    roomPreviewer: RoomPreviewer;
-    badgeCode?: string;
-    extra?: string;
-    disabled?: boolean;
-
-}
diff --git a/src/views/catalog/views/page/product/CatalogProductView.tsx b/src/views/catalog/views/page/product/CatalogProductView.tsx
deleted file mode 100644
index 406f6e21..00000000
--- a/src/views/catalog/views/page/product/CatalogProductView.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { FC, useMemo } from 'react';
-import { NitroCardGridItemView } from '../../../../../layout';
-import { AvatarImageView } from '../../../../shared/avatar-image/AvatarImageView';
-import { GetProductIconUrl } from '../../../common/GetProuductIconUrl';
-import { ProductTypeEnum } from '../../../common/ProductTypeEnum';
-import { CatalogProductViewProps } from './CatalogProductView.types';
-
-export const CatalogProductView: FC<CatalogProductViewProps> = props =>
-{
-    const { isActive = false, product = null, ...rest } = props;
-
-    const iconUrl = useMemo(() =>
-    {
-        if(!product) return null;
-        
-        return GetProductIconUrl(product.furniClassId, product.productType, product.extraParam);
-    }, [ product ]);
-
-    const getUniqueNumber = useMemo(() =>
-    {
-        if(!product.uniqueLimitedItem) return 0;
-
-        if(!product.uniqueLimitedItemsLeft) return -1;
-
-        return product.uniqueLimitedSeriesSize;
-    }, [ product ]);
-
-    if(!product) return null;
-
-    return (
-        <NitroCardGridItemView itemImage={ iconUrl } itemActive={ isActive } itemCount={ product.productCount } itemUniqueNumber={ getUniqueNumber } { ...rest }>
-            { (product.productType === ProductTypeEnum.ROBOT) &&
-                <AvatarImageView figure={ product.extraParam } direction={ 3 } headOnly={ true } /> }
-        </NitroCardGridItemView>
-    );
-}
diff --git a/src/views/catalog/views/page/product/CatalogProductView.types.ts b/src/views/catalog/views/page/product/CatalogProductView.types.ts
deleted file mode 100644
index b2d94bde..00000000
--- a/src/views/catalog/views/page/product/CatalogProductView.types.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { CatalogPageMessageProductData } from '@nitrots/nitro-renderer';
-import { DetailsHTMLAttributes } from 'react';
-
-export interface CatalogProductViewProps extends DetailsHTMLAttributes<HTMLDivElement>
-{
-    isActive: boolean;
-    product: CatalogPageMessageProductData;
-}
diff --git a/src/views/catalog/views/page/purchase/CatalogPurchaseView.tsx b/src/views/catalog/views/page/purchase/CatalogPurchaseView.tsx
deleted file mode 100644
index 794319aa..00000000
--- a/src/views/catalog/views/page/purchase/CatalogPurchaseView.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { FC, useEffect, useState } from 'react';
-import { LocalizeText } from '../../../../../api';
-import { CurrencyIcon } from '../../../../shared/currency-icon/CurrencyIcon';
-import { CatalogPurchaseViewProps } from './CatalogPurchaseView.types';
-import { CatalogPurchaseButtonView } from './purchase-button/CatalogPurchaseButtonView';
-import { CatalogPurchaseGiftButtonView } from './purchase-gift-button/CatalogPurchaseGiftButtonView';
-
-export const CatalogPurchaseView: FC<CatalogPurchaseViewProps> = props =>
-{
-    const { offer = null, pageId = -1, extra = '', disabled = false } = props;
-    const [ quantity, setQuantity ] = useState(1);
-
-    useEffect(() =>
-    {
-        setQuantity(1);
-    }, [ offer ]);
-
-    function increaseQuantity(): void
-    {
-        let newQuantity = quantity + 1;
-
-        if(newQuantity > 99) newQuantity = 99
-
-        setQuantity(newQuantity);
-    }
-
-    function decreaseQuantity(): void
-    {
-        let newQuantity = quantity - 1;
-
-        if(newQuantity <= 0) newQuantity = 1;
-
-        setQuantity(newQuantity);
-    }
-
-    function updateQuantity(amount: number): void
-    {
-        if(isNaN(amount) || (amount <= 0)) amount = 1;
-
-        if(amount > 99) amount = 99;
-
-        setQuantity(amount);
-    }
-
-    const extraData = ((extra && extra.length) ? extra : (offer?.products[0]?.extraParam || null));
-    
-    return (
-        <div className="d-flex flex-column flex-grow-1 justify-content-end w-100">
-            <div className="d-flex align-items-end">
-                <div className="flex-grow-1 align-items-end">
-                    <span className="text-black">{ LocalizeText('catalog.bundlewidget.price') }</span>
-                    { offer.bundlePurchaseAllowed &&
-                        <div className="d-flex align-items-center">
-                            <i className="fas fa-caret-left cursor-pointer me-1 text-black" onClick={ decreaseQuantity } />
-                            <input type="number" className="form-control form-control-sm quantity-input" value={ quantity } onChange={ event => updateQuantity(event.target.valueAsNumber)} />
-                            <i className="fas fa-caret-right cursor-pointer ms-1 text-black" onClick={ increaseQuantity } />
-                        </div> }
-                </div>
-                <div className="d-flex flex-column">
-                    { (offer.priceCredits > 0) &&
-                        <div className="d-flex align-items-center justify-content-end">
-                            <span className="text-black ms-1">{ offer.priceCredits * quantity }</span>
-                            <CurrencyIcon type={ -1 } />
-                        </div> }
-                    { (offer.priceActivityPoints > 0) &&
-                        <div className="d-flex align-items-center justify-content-end">
-                            <span className="text-black ms-1">{ offer.priceActivityPoints * quantity }</span>
-                            <CurrencyIcon type={ offer.priceActivityPointsType } />
-                        </div> }
-                </div>
-            </div>
-            <div className="d-flex flex-column mt-1">
-                <CatalogPurchaseButtonView className="btn-sm w-100" offer={ offer } pageId={ pageId } extra={ extraData } quantity={ quantity } disabled={ disabled } />
-                { offer.giftable && <CatalogPurchaseGiftButtonView className="btn-sm w-100 mt-1" offer={ offer } pageId={ pageId } extra={ extraData } disabled={ disabled } /> }
-            </div>
-        </div>
-    );
-}
diff --git a/src/views/catalog/views/page/purchase/CatalogPurchaseView.types.ts b/src/views/catalog/views/page/purchase/CatalogPurchaseView.types.ts
deleted file mode 100644
index b697acd0..00000000
--- a/src/views/catalog/views/page/purchase/CatalogPurchaseView.types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer';
-
-export interface CatalogPurchaseViewProps
-{
-    offer: CatalogPageMessageOfferData;
-    pageId: number;
-    extra?: string;
-    disabled?: boolean;
-}
diff --git a/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.types.ts b/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.types.ts
deleted file mode 100644
index 95bc055f..00000000
--- a/src/views/catalog/views/page/purchase/purchase-button/CatalogPurchaseButtonView.types.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer';
-
-export interface CatalogPurchaseButtonViewProps
-{
-    className?: string;
-    offer: CatalogPageMessageOfferData;
-    pageId: number;
-    extra?: string;
-    quantity?: number;
-    isPurchaseAllowed?: boolean;
-    disabled?: boolean;
-    beforePurchase?: () => void;
-}
-
-export class CatalogPurchaseState
-{
-    public static NONE = 0;
-    public static CONFIRM = 1;
-    public static PURCHASE = 2;
-    public static NO_CREDITS = 3;
-    public static NO_POINTS = 4;
-    public static SOLD_OUT = 5;
-    public static FAILED = 6;
-}
diff --git a/src/views/catalog/views/page/purchase/purchase-gift-button/CatalogPurchaseGiftButtonView.tsx b/src/views/catalog/views/page/purchase/purchase-gift-button/CatalogPurchaseGiftButtonView.tsx
deleted file mode 100644
index b55f1aba..00000000
--- a/src/views/catalog/views/page/purchase/purchase-gift-button/CatalogPurchaseGiftButtonView.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { FC, useCallback } from 'react';
-import { LocalizeText } from '../../../../../../api';
-import { CatalogInitGiftEvent } from '../../../../../../events/catalog/CatalogInitGiftEvent';
-import { dispatchUiEvent } from '../../../../../../hooks';
-import { CatalogPurchaseGiftButtonViewProps } from './CatalogPurchaseGiftButtonView.types';
-
-export const CatalogPurchaseGiftButtonView: FC<CatalogPurchaseGiftButtonViewProps> = props =>
-{
-    const { className = '', offer = null, pageId = -1, extra = null, disabled = false } = props;
-    
-    const initGift = useCallback(() =>
-    {
-        dispatchUiEvent(new CatalogInitGiftEvent(pageId, offer.offerId, extra));
-    }, [ extra, offer, pageId ]);
-
-    return (
-        <button type="button" className={ 'btn btn-secondary ' + className } onClick={ initGift } disabled={ disabled }>{ LocalizeText('catalog.purchase_confirmation.gift') }</button>
-    );
-}
diff --git a/src/views/catalog/views/page/purchase/purchase-gift-button/CatalogPurchaseGiftButtonView.types.ts b/src/views/catalog/views/page/purchase/purchase-gift-button/CatalogPurchaseGiftButtonView.types.ts
deleted file mode 100644
index e3c3a580..00000000
--- a/src/views/catalog/views/page/purchase/purchase-gift-button/CatalogPurchaseGiftButtonView.types.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { CatalogPageMessageOfferData } from '@nitrots/nitro-renderer';
-
-export interface CatalogPurchaseGiftButtonViewProps
-{
-    className?: string;
-    offer: CatalogPageMessageOfferData;
-    pageId: number;
-    extra?: string;
-    disabled?: boolean;
-}
diff --git a/src/views/catalog/views/page/redeem-voucher/CatalogRedeemVoucherView.tsx b/src/views/catalog/views/page/redeem-voucher/CatalogRedeemVoucherView.tsx
deleted file mode 100644
index d7af5357..00000000
--- a/src/views/catalog/views/page/redeem-voucher/CatalogRedeemVoucherView.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { RedeemVoucherMessageComposer, VoucherRedeemErrorMessageEvent, VoucherRedeemOkMessageEvent } from '@nitrots/nitro-renderer';
-import { FC, useCallback, useState } from 'react';
-import { CreateMessageHook, SendMessageHook } from '../../../../../hooks';
-import { CatalogRedeemVoucherViewProps } from './CatalogRedeemVoucherView.types';
-
-export const CatalogRedeemVoucherView: FC<CatalogRedeemVoucherViewProps> = props =>
-{
-    const { text = null } = props;
-    const [ voucher, setVoucher ] = useState<string>('');
-    const [ isWaiting, setIsWaiting ] = useState(false);
-
-    const redeemVoucher = useCallback(() =>
-    {
-        if(!voucher || !voucher.length || isWaiting) return;
-
-        SendMessageHook(new RedeemVoucherMessageComposer(voucher));
-
-        setIsWaiting(true);
-    }, [ voucher, isWaiting ]);
-
-    const onVoucherRedeemOkMessageEvent = useCallback((event: VoucherRedeemOkMessageEvent) =>
-    {
-        const parser = event.getParser();
-        
-        console.log(event);
-        setIsWaiting(false);
-    }, []);
-
-    CreateMessageHook(VoucherRedeemOkMessageEvent, onVoucherRedeemOkMessageEvent);
-
-    const onVoucherRedeemErrorMessageEvent = useCallback((event: VoucherRedeemErrorMessageEvent) =>
-    {
-        const parser = event.getParser();
-
-        console.log(event);
-        setIsWaiting(false);
-    }, []);
-
-    CreateMessageHook(VoucherRedeemErrorMessageEvent, onVoucherRedeemErrorMessageEvent);
-
-    return (
-        <div className="d-flex">
-            <div className="d-flex flex-grow-1 me-1">
-                <input type="text" className="form-control form-control-sm" placeholder={ text } value={ voucher } onChange={ event => setVoucher(event.target.value) } />
-            </div>
-            <div className="d-flex">
-                <button type="button" className="btn btn-primary btn-sm" onClick={ redeemVoucher } disabled={ isWaiting }>
-                    <i className="fas fa-tag"></i>
-                </button>
-            </div>
-        </div>
-    )
-}
diff --git a/src/views/catalog/views/page/redeem-voucher/CatalogRedeemVoucherView.types.ts b/src/views/catalog/views/page/redeem-voucher/CatalogRedeemVoucherView.types.ts
deleted file mode 100644
index 9389f65a..00000000
--- a/src/views/catalog/views/page/redeem-voucher/CatalogRedeemVoucherView.types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface CatalogRedeemVoucherViewProps
-{
-    text: string;
-}
diff --git a/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx b/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx
deleted file mode 100644
index 00e30a25..00000000
--- a/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { FC } from 'react';
-import { LimitedEditionCompletePlateView } from '../../../../shared/limited-edition/complete-plate/LimitedEditionCompletePlateView';
-import { GetOfferName } from '../../../common/CatalogUtilities';
-import { useCatalogContext } from '../../../context/CatalogContext';
-import { CatalogRoomPreviewerView } from '../../catalog-room-previewer/CatalogRoomPreviewerView';
-import { CatalogPurchaseView } from '../purchase/CatalogPurchaseView';
-import { CatalogLayoutSearchResultViewProps } from './CatalogLayoutSearchResultView.types';
-import { CatalogSearchResultOffersView } from './offers/CatalogSearchResultOffersView';
-
-export const CatalogLayoutSearchResultView: FC<CatalogLayoutSearchResultViewProps> = props =>
-{
-    const { roomPreviewer = null, furnitureDatas = null } = props;
-    const { catalogState } = useCatalogContext();
-    const { activeOffer = null } = catalogState;
-
-    const product = ((activeOffer && activeOffer.products[0]) || null);
-
-    return (
-        <div className="row h-100">
-            <div className="d-flex flex-column col-7 h-100">
-                <CatalogSearchResultOffersView offers={ furnitureDatas } />
-            </div>
-            { product &&
-                <div className="position-relative d-flex flex-column col">
-                    <CatalogRoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } />
-                    { product.uniqueLimitedItem &&
-                        <LimitedEditionCompletePlateView uniqueLimitedItemsLeft={ product.uniqueLimitedItemsLeft } uniqueLimitedSeriesSize={ product.uniqueLimitedSeriesSize } /> }
-                    <div className="fs-6 text-black mt-1 overflow-hidden">{ GetOfferName(activeOffer) }</div>
-                    <CatalogPurchaseView offer={ activeOffer } pageId={ -1 } />
-                </div> }
-        </div>
-    );
-}
diff --git a/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.types.ts b/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.types.ts
deleted file mode 100644
index 8cd52f48..00000000
--- a/src/views/catalog/views/page/search-result/CatalogLayoutSearchResultView.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { IFurnitureData, RoomPreviewer } from '@nitrots/nitro-renderer';
-
-export interface CatalogLayoutSearchResultViewProps
-{
-    roomPreviewer: RoomPreviewer;
-    furnitureDatas: IFurnitureData[];
-}
diff --git a/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.tsx b/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.tsx
deleted file mode 100644
index b7ff3534..00000000
--- a/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { GetProductOfferComposer, MouseEventType } from '@nitrots/nitro-renderer';
-import { FC, MouseEvent, useCallback, useMemo } from 'react';
-import { SendMessageHook } from '../../../../../../hooks/messages/message-event';
-import { NitroCardGridItemView } from '../../../../../../layout';
-import { AvatarImageView } from '../../../../../shared/avatar-image/AvatarImageView';
-import { GetProductIconUrl } from '../../../../common/GetProuductIconUrl';
-import { ProductTypeEnum } from '../../../../common/ProductTypeEnum';
-import { CatalogSearchResultOfferViewProps } from './CatalogSearchResultOfferView.types';
-
-export const CatalogSearchResultOfferView: FC<CatalogSearchResultOfferViewProps> = props =>
-{
-    const { isActive = false, offer = null } = props;
-
-    const onMouseEvent = useCallback((event: MouseEvent) =>
-    {
-        switch(event.type)
-        {
-            case MouseEventType.MOUSE_DOWN:
-                SendMessageHook(new GetProductOfferComposer(offer.purchaseOfferId));
-                return;
-        }
-    }, [ offer ]);
-
-    const iconUrl = useMemo(() =>
-    {
-        if(!offer) return null;
-        
-        return GetProductIconUrl(offer.id, offer.type, offer.customParams);
-    }, [ offer ]);
-
-    if(!offer) return null;
-
-    return (
-        <NitroCardGridItemView itemImage={ iconUrl } itemActive={ isActive } onMouseDown={ onMouseEvent }>
-            { (offer.type === ProductTypeEnum.ROBOT) &&
-                <AvatarImageView figure={ offer.customParams } direction={ 3 } headOnly={ true } /> }
-        </NitroCardGridItemView>
-    );
-}
diff --git a/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.types.ts b/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.types.ts
deleted file mode 100644
index 1d7056e7..00000000
--- a/src/views/catalog/views/page/search-result/offer/CatalogSearchResultOfferView.types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { IFurnitureData } from '@nitrots/nitro-renderer';
-
-export interface CatalogSearchResultOfferViewProps
-{
-    isActive: boolean;
-    offer: IFurnitureData;
-}
diff --git a/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.types.ts b/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.types.ts
deleted file mode 100644
index 875e277e..00000000
--- a/src/views/catalog/views/page/search-result/offers/CatalogSearchResultOffersView.types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { IFurnitureData } from '@nitrots/nitro-renderer';
-
-export interface CatalogSearchResultOffersViewProps
-{
-    offers: IFurnitureData[];
-}
diff --git a/src/views/catalog/views/search/CatalogSearchView.types.ts b/src/views/catalog/views/search/CatalogSearchView.types.ts
deleted file mode 100644
index ac0164e4..00000000
--- a/src/views/catalog/views/search/CatalogSearchView.types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface CatalogSearchViewProps
-{
-
-}