diff --git a/src/Inc.TeamAssistant.Stories/Features/Dashboard/Dashboard.stories.razor b/src/Inc.TeamAssistant.Stories/Features/Dashboard/Dashboard.stories.razor
index e28ec97f..dee6f82b 100644
--- a/src/Inc.TeamAssistant.Stories/Features/Dashboard/Dashboard.stories.razor
+++ b/src/Inc.TeamAssistant.Stories/Features/Dashboard/Dashboard.stories.razor
@@ -9,7 +9,7 @@
                 BotId="BotId"
                 TeamId="TeamId"
                 State="LoadingState.Done()"
-                Widgets="_widgets"
+                Widgets="_allWidgets"
                 Load="() => Task.CompletedTask"
                 WidgetParametersFactory="CreateWidgetParameters">
                 <Toolbar>
@@ -30,13 +30,175 @@
             </Dashboard>
         </Template>
     </Story>
+    <Story Name="With Reviewer widgets">
+        <Template>
+            <Dashboard
+                BotId="BotId"
+                TeamId="TeamId"
+                State="LoadingState.Done()"
+                Widgets="_reviewerWidgets"
+                Load="() => Task.CompletedTask"
+                WidgetParametersFactory="CreateWidgetParameters">
+                <Toolbar>
+                    <DashboardTeamSelector
+                        BotId="BotId"
+                        TeamId="TeamId"
+                        State="LoadingState.Done()"
+                        Bots="_bots"
+                        Retry="() => Task.CompletedTask"
+                        BotChanged="_ => { }"
+                        TeamChanged="_ => { }" />
+
+                    <DashboardTeamConnector
+                        Team="_team"
+                        State="LoadingState.Done()"
+                        Retry="() => Task.CompletedTask" />
+                </Toolbar>
+            </Dashboard>
+        </Template>
+    </Story>
+    <Story Name="With Appraiser widgets">
+        <Template>
+            <Dashboard
+                BotId="BotId"
+                TeamId="TeamId"
+                State="LoadingState.Done()"
+                Widgets="_appraiserWidgets"
+                Load="() => Task.CompletedTask"
+                WidgetParametersFactory="CreateWidgetParameters">
+                <Toolbar>
+                    <DashboardTeamSelector
+                        BotId="BotId"
+                        TeamId="TeamId"
+                        State="LoadingState.Done()"
+                        Bots="_bots"
+                        Retry="() => Task.CompletedTask"
+                        BotChanged="_ => { }"
+                        TeamChanged="_ => { }" />
+
+                    <DashboardTeamConnector
+                        Team="_team"
+                        State="LoadingState.Done()"
+                        Retry="() => Task.CompletedTask" />
+                </Toolbar>
+            </Dashboard>
+        </Template>
+    </Story>
+    <Story Name="With RandomCoffee widgets">
+        <Template>
+            <Dashboard
+                BotId="BotId"
+                TeamId="TeamId"
+                State="LoadingState.Done()"
+                Widgets="_randomCoffeeWidgets"
+                Load="() => Task.CompletedTask"
+                WidgetParametersFactory="CreateWidgetParameters">
+                <Toolbar>
+                    <DashboardTeamSelector
+                        BotId="BotId"
+                        TeamId="TeamId"
+                        State="LoadingState.Done()"
+                        Bots="_bots"
+                        Retry="() => Task.CompletedTask"
+                        BotChanged="_ => { }"
+                        TeamChanged="_ => { }" />
+
+                    <DashboardTeamConnector
+                        Team="_team"
+                        State="LoadingState.Done()"
+                        Retry="() => Task.CompletedTask" />
+                </Toolbar>
+            </Dashboard>
+        </Template>
+    </Story>
+    <Story Name="With CheckIn widgets">
+        <Template>
+            <Dashboard
+                BotId="BotId"
+                TeamId="TeamId"
+                State="LoadingState.Done()"
+                Widgets="_mapWidgets"
+                Load="() => Task.CompletedTask"
+                WidgetParametersFactory="CreateWidgetParameters">
+                <Toolbar>
+                    <DashboardTeamSelector
+                        BotId="BotId"
+                        TeamId="TeamId"
+                        State="LoadingState.Done()"
+                        Bots="_bots"
+                        Retry="() => Task.CompletedTask"
+                        BotChanged="_ => { }"
+                        TeamChanged="_ => { }" />
+
+                    <DashboardTeamConnector
+                        Team="_team"
+                        State="LoadingState.Done()"
+                        Retry="() => Task.CompletedTask" />
+                </Toolbar>
+            </Dashboard>
+        </Template>
+    </Story>
+    <Story Name="Loading">
+        <Template>
+            <Dashboard
+                BotId="BotId"
+                TeamId="TeamId"
+                State="LoadingState.Loading()"
+                Widgets="_allWidgets"
+                Load="() => Task.CompletedTask"
+                WidgetParametersFactory="CreateWidgetParameters">
+                <Toolbar>
+                    <DashboardTeamSelector
+                        BotId="BotId"
+                        TeamId="TeamId"
+                        State="LoadingState.Loading()"
+                        Bots="_bots"
+                        Retry="() => Task.CompletedTask"
+                        BotChanged="_ => { }"
+                        TeamChanged="_ => { }" />
+
+                    <DashboardTeamConnector
+                        Team="_team"
+                        State="LoadingState.Loading()"
+                        Retry="() => Task.CompletedTask" />
+                </Toolbar>
+            </Dashboard>
+        </Template>
+    </Story>
+    <Story Name="Error">
+        <Template>
+            <Dashboard
+                BotId="BotId"
+                TeamId="TeamId"
+                State="LoadingState.Error()"
+                Widgets="_allWidgets"
+                Load="() => Task.CompletedTask"
+                WidgetParametersFactory="CreateWidgetParameters">
+                <Toolbar>
+                    <DashboardTeamSelector
+                        BotId="BotId"
+                        TeamId="TeamId"
+                        State="LoadingState.Error()"
+                        Bots="_bots"
+                        Retry="() => Task.CompletedTask"
+                        BotChanged="_ => { }"
+                        TeamChanged="_ => { }" />
+
+                    <DashboardTeamConnector
+                        Team="_team"
+                        State="LoadingState.Error()"
+                        Retry="() => Task.CompletedTask" />
+                </Toolbar>
+            </Dashboard>
+        </Template>
+    </Story>
 </Stories>
 
 @code {
     private static readonly Guid BotId = Guid.NewGuid();
     private static readonly Guid TeamId = Guid.NewGuid();
 
-    private readonly IReadOnlyCollection<Type> _widgets =
+    private readonly IReadOnlyCollection<Type> _allWidgets =
     [
         typeof(TeammatesWidget),
         typeof(ReviewAverageStatsWidget),
@@ -47,6 +209,33 @@
         typeof(RandomCoffeeHistoryWidget),
         typeof(MapWidget)
     ];
+    
+    private readonly IReadOnlyCollection<Type> _reviewerWidgets =
+    [
+        typeof(TeammatesWidget),
+        typeof(ReviewAverageStatsWidget),
+        typeof(ReviewHistoryWidget),
+        typeof(ReviewTotalStatsWidget)
+    ];
+    
+    private readonly IReadOnlyCollection<Type> _appraiserWidgets =
+    [
+        typeof(TeammatesWidget),
+        typeof(AppraiserHistoryWidget),
+        typeof(AppraiserIntegrationWidget)
+    ];
+    
+    private readonly IReadOnlyCollection<Type> _randomCoffeeWidgets =
+    [
+        typeof(TeammatesWidget),
+        typeof(RandomCoffeeHistoryWidget)
+    ];
+    
+    private readonly IReadOnlyCollection<Type> _mapWidgets =
+    [
+        typeof(TeammatesWidget),
+        typeof(MapWidget)
+    ];
 
     private readonly IReadOnlyCollection<BotDto> _bots =
     [
@@ -240,7 +429,7 @@
                     new MapDto(Id: Guid.NewGuid(), Name: "Chat 1")
                 ])),
                 ["Retry"] = () => Task.CompletedTask,
-                ["LinkFactory"] = (string _) => string.Empty
+                ["LinkFactory"] = (string _) => "/imgs/map.png"
             };
         
         throw new NotSupportedException($"{type.Name} is not supported.");
diff --git a/src/Inc.TeamAssistant.Stories/wwwroot/imgs/map.png b/src/Inc.TeamAssistant.Stories/wwwroot/imgs/map.png
new file mode 100644
index 00000000..121174fb
Binary files /dev/null and b/src/Inc.TeamAssistant.Stories/wwwroot/imgs/map.png differ
diff --git a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/CheckIn/MapWidget.razor b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/CheckIn/MapWidget.razor
index 8ab72115..1057bfc7 100644
--- a/src/Inc.TeamAssistant.WebUI/Features/Dashboard/CheckIn/MapWidget.razor
+++ b/src/Inc.TeamAssistant.WebUI/Features/Dashboard/CheckIn/MapWidget.razor
@@ -19,7 +19,7 @@
                 var mapUrl = LinkFactory(routeSegment);
 
                 <div class="checkin-map">
-                    <iframe src="@mapUrl/true" class="checkin-map__body"></iframe>
+                    <iframe src="@mapUrl?DisableLayout=true" class="checkin-map__body"></iframe>
                     <div class="checkin-map__bg"></div>
                     <div class="checkin-map__controls">
                         <div class="checkin-map__controls-body">
diff --git a/src/Inc.TeamAssistant.WebUI/Features/Map/MapContainer.razor b/src/Inc.TeamAssistant.WebUI/Features/Map/MapContainer.razor
index 3304d705..4554d9ec 100644
--- a/src/Inc.TeamAssistant.WebUI/Features/Map/MapContainer.razor
+++ b/src/Inc.TeamAssistant.WebUI/Features/Map/MapContainer.razor
@@ -1,9 +1,6 @@
 @page "/map/{id:guid}"
 @page "/en/map/{id:guid}"
 @page "/ru/map/{id:guid}"
-@page "/map/{id:guid}/{DisableLayout:bool}"
-@page "/en/map/{id:guid}/{DisableLayout:bool}"
-@page "/ru/map/{id:guid}/{DisableLayout:bool}"
 
 @inject ICheckInService CheckInService
 
@@ -28,7 +25,7 @@
     [Parameter]
     public Guid Id { get; set; }
     
-    [Parameter]
+    [Parameter, SupplyParameterFromQuery]
     public bool DisableLayout { get; set; }
 
     private IReadOnlyDictionary<string, IReadOnlyCollection<LocationDto>> _locations