diff --git a/frontend/app/components/Dashboard/NewDashboard.tsx b/frontend/app/components/Dashboard/NewDashboard.tsx
index 93f3cda8e..9e4168cfc 100644
--- a/frontend/app/components/Dashboard/NewDashboard.tsx
+++ b/frontend/app/components/Dashboard/NewDashboard.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect } from 'react';
-import withPageTitle from 'HOCs/withPageTitle';
-import { observer, useObserver } from "mobx-react-lite";
+import { useObserver } from "mobx-react-lite";
 import { useStore } from 'App/mstore';
 import { withRouter } from 'react-router-dom';
 import DashboardSideMenu from './components/DashboardSideMenu';
@@ -36,4 +35,4 @@ function NewDashboard(props) {
     ));
 }
 
-export default withPageTitle('New Dashboard')(withRouter(NewDashboard));
\ No newline at end of file
+export default withRouter(NewDashboard);
\ No newline at end of file
diff --git a/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx b/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx
index b412dc1f2..16803e34c 100644
--- a/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx
+++ b/frontend/app/components/Dashboard/components/DashboardView/DashboardView.tsx
@@ -12,6 +12,7 @@ import DashboardModal from '../DashboardModal';
 import DashboardEditModal from '../DashboardEditModal';
 import DateRange from 'Shared/DateRange';
 import AlertFormModal from 'App/components/Alerts/AlertFormModal';
+import withPageTitle from 'HOCs/withPageTitle';
 
 interface Props {
     siteId: number;
@@ -125,4 +126,4 @@ function DashboardView(props: Props) {
     ));
 }
 
-export default withRouter(withModal(DashboardView));
\ No newline at end of file
+export default withPageTitle('Dashboards - OpenReplay')(withRouter(withModal(DashboardView)));
\ No newline at end of file
diff --git a/frontend/app/components/Dashboard/components/MetricsView/MetricsView.tsx b/frontend/app/components/Dashboard/components/MetricsView/MetricsView.tsx
index af296b14a..9d82d6288 100644
--- a/frontend/app/components/Dashboard/components/MetricsView/MetricsView.tsx
+++ b/frontend/app/components/Dashboard/components/MetricsView/MetricsView.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Button, PageTitle, Icon, Link } from 'UI';
-import { withSiteId, metricCreate } from 'App/routes';
+import withPageTitle from 'HOCs/withPageTitle';
 import MetricsList from '../MetricsList';
 import MetricsSearch from '../MetricsSearch';
 import { useStore } from 'App/mstore';
@@ -34,4 +34,4 @@ function MetricsView(props: Props) {
     ));
 }
 
-export default MetricsView;
\ No newline at end of file
+export default withPageTitle('Metrics - OpenReplay')(MetricsView);
\ No newline at end of file
diff --git a/frontend/app/components/Header/Header.js b/frontend/app/components/Header/Header.js
index f3aa726d1..219463499 100644
--- a/frontend/app/components/Header/Header.js
+++ b/frontend/app/components/Header/Header.js
@@ -104,7 +104,7 @@ const Header = (props) => {
         className={ styles.nav }
         activeClassName={ styles.active }
       >         
-        <span>{ 'Dashboard' }</span>
+        <span>{ 'Dashboards' }</span>
       </NavLink>
       <div className={ styles.right }>
         <Announcements />
diff --git a/frontend/app/mstore/dashboardStore.ts b/frontend/app/mstore/dashboardStore.ts
index 2f7ec0d66..56c92e4b9 100644
--- a/frontend/app/mstore/dashboardStore.ts
+++ b/frontend/app/mstore/dashboardStore.ts
@@ -221,11 +221,10 @@ export default class DashboardStore implements IDashboardSotre {
                 runInAction(() => {
                     if (isCreating) {
                         toast.success('Dashboard created successfully')
-                        this.addDashboard(_dashboard)
-                        console.log('_dashboard', _dashboard)
+                        this.addDashboard(new Dashboard().fromJson(_dashboard))
                     } else {
                         toast.success('Dashboard updated successfully')
-                        this.updateDashboard(_dashboard)
+                        this.updateDashboard(new Dashboard().fromJson(_dashboard))
                     }
                     resolve(_dashboard)
                 })