diff --git a/src/api/room/widgets/BotSkillsEnum.ts b/src/api/room/widgets/BotSkillsEnum.ts
index b879cdc..8eef2d1 100644
--- a/src/api/room/widgets/BotSkillsEnum.ts
+++ b/src/api/room/widgets/BotSkillsEnum.ts
@@ -11,6 +11,7 @@ export class BotSkillsEnum
     public static NUX_PROCEED: number = 8;
     public static CHANGE_BOT_MOTTO: number = 9;
     public static NUX_TAKE_TOUR: number = 10;
+    public static ROTATE: number = 11;
     public static NO_PICK_UP: number = 12;
     public static NAVIGATOR_SEARCH: number = 14;
     public static DONATE_TO_USER: number = 24;
diff --git a/src/components/navigator/NavigatorView.tsx b/src/components/navigator/NavigatorView.tsx
index 7819c96..10203ef 100644
--- a/src/components/navigator/NavigatorView.tsx
+++ b/src/components/navigator/NavigatorView.tsx
@@ -7,8 +7,8 @@ import createRoomImg from '../../assets/images/navigator/create_room.png';
 import randomRoomImg from '../../assets/images/navigator/random_room.png';
 import promoteRoomImg from '../../assets/images/navigator/promote_room.png';
 import { CreateLinkEvent, LocalizeText, SendMessageComposer, TryVisitRoom } from '../../api';
-import { Flex, Text } from '../../common';
-import { useNavigatorData, useNavigatorSearch, useNavigatorUiState, useNavigatorUiStore, useNitroEvent } from '../../hooks';
+import { Flex, Text, WidgetErrorBoundary } from '../../common';
+import { useNavigatorActions, useNavigatorData, useNavigatorUiState, useNavigatorUiStore, useNitroEvent } from '../../hooks';
 import { NavigatorDoorStateView } from './views/NavigatorDoorStateView';
 import { NavigatorRoomCreatorView } from './views/NavigatorRoomCreatorView';
 import { NavigatorRoomInfoView } from './views/NavigatorRoomInfoView';
@@ -178,13 +178,26 @@ export const NavigatorView: FC<{}> = props =>
                                     </Flex>
                                 </div>
                             </div> }
-                        { isCreatorOpen && <NavigatorRoomCreatorView /> }
+                        { isCreatorOpen &&
+                            <WidgetErrorBoundary name="NavigatorRoomCreator">
+                                <NavigatorRoomCreatorView />
+                            </WidgetErrorBoundary> }
                     </NitroCard.Content>
                 </NitroCard> }
-            <NavigatorDoorStateView />
-            { isRoomInfoOpen && <NavigatorRoomInfoView onCloseClick={ () => useNavigatorUiStore.getState().setRoomInfoOpen(false) } /> }
-            { isRoomLinkOpen && <NavigatorRoomLinkView onCloseClick={ () => useNavigatorUiStore.getState().setRoomLinkOpen(false) } /> }
-            <NavigatorRoomSettingsView />
+            <WidgetErrorBoundary name="NavigatorDoorState">
+                <NavigatorDoorStateView />
+            </WidgetErrorBoundary>
+            { isRoomInfoOpen &&
+                <WidgetErrorBoundary name="NavigatorRoomInfo">
+                    <NavigatorRoomInfoView onCloseClick={ () => useNavigatorUiStore.getState().setRoomInfoOpen(false) } />
+                </WidgetErrorBoundary> }
+            { isRoomLinkOpen &&
+                <WidgetErrorBoundary name="NavigatorRoomLink">
+                    <NavigatorRoomLinkView onCloseClick={ () => useNavigatorUiStore.getState().setRoomLinkOpen(false) } />
+                </WidgetErrorBoundary> }
+            <WidgetErrorBoundary name="NavigatorRoomSettings">
+                <NavigatorRoomSettingsView />
+            </WidgetErrorBoundary>
         </>
     );
 };
diff --git a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetRentableBotView.tsx b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetRentableBotView.tsx
index f9e962b..9953ace 100644
--- a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetRentableBotView.tsx
+++ b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetRentableBotView.tsx
@@ -109,6 +109,10 @@ export const AvatarInfoWidgetRentableBotView: FC<AvatarInfoWidgetRentableBotView
                 case 'dance':
                     SendMessageComposer(new BotSkillSaveComposer(avatarInfo.webID, BotSkillsEnum.DANCE, ''));
                     break;
+                case 'rotate':
+                    SendMessageComposer(new BotSkillSaveComposer(avatarInfo.webID, BotSkillsEnum.ROTATE, ''));
+                    hideMenu = false;
+                    break;
                 case 'nux_take_tour':
                     CreateLinkEvent('help/tour');
                     SendMessageComposer(new BotSkillSaveComposer(avatarInfo.webID, BotSkillsEnum.NUX_TAKE_TOUR, ''));
@@ -170,6 +174,10 @@ export const AvatarInfoWidgetRentableBotView: FC<AvatarInfoWidgetRentableBotView
                         <ContextMenuListItemView onClick={ event => processAction('dance') }>
                             { LocalizeText('avatar.widget.dance') }
                         </ContextMenuListItemView> }
+                    { (avatarInfo.botSkills.indexOf(BotSkillsEnum.ROTATE) >= 0) &&
+                        <ContextMenuListItemView onClick={ event => processAction('rotate') }>
+                            { LocalizeText('tooltip.roombuilding.rotate') }
+                        </ContextMenuListItemView> }
                     { (avatarInfo.botSkills.indexOf(BotSkillsEnum.NO_PICK_UP) === -1) &&
                         <ContextMenuListItemView onClick={ event => processAction('pick') }>
                             { LocalizeText('avatar.widget.pick_up') }