diff --git a/pages/console/[[...id]].js b/pages/console/[[...id]].js
index b4bcf2548..d13d6f687 100644
--- a/pages/console/[[...id]].js
+++ b/pages/console/[[...id]].js
@@ -1,7 +1,7 @@
 import AppLayout from 'components/layout/AppLayout';
 import TestConsole from 'components/pages/console/TestConsole';
 
-export default function ConsolePage({ disabled }) {
+export default function ({ disabled }) {
   if (disabled) {
     return null;
   }
diff --git a/pages/index.js b/pages/index.js
index 7d93cef12..bd4c74be7 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { useRouter } from 'next/router';
 
-export default function DefaultPage() {
+export default function () {
   const router = useRouter();
 
   useEffect(() => {
diff --git a/pages/login.js b/pages/login.js
index 9a1f3c457..a43f8c1f2 100644
--- a/pages/login.js
+++ b/pages/login.js
@@ -1,7 +1,7 @@
 import LoginLayout from 'components/pages/login/LoginLayout';
 import LoginForm from 'components/pages/login/LoginForm';
 
-export default function LoginPage({ disabled }) {
+export default function ({ disabled }) {
   if (disabled) {
     return null;
   }
diff --git a/pages/logout.js b/pages/logout.js
index 6ffe23e14..675f1932d 100644
--- a/pages/logout.js
+++ b/pages/logout.js
@@ -4,7 +4,7 @@ import useApi from 'hooks/useApi';
 import { setUser } from 'store/app';
 import { removeClientAuthToken } from 'lib/client';
 
-export default function LogoutPage({ disabled }) {
+export default function ({ disabled }) {
   const router = useRouter();
   const { post } = useApi();
 
diff --git a/pages/realtime/[id].js b/pages/realtime/[id].js
deleted file mode 100644
index c9e82622d..000000000
--- a/pages/realtime/[id].js
+++ /dev/null
@@ -1,26 +0,0 @@
-import { useRouter } from 'next/router';
-import AppLayout from 'components/layout/AppLayout';
-import RealtimeDashboard from 'components/pages/realtime/RealtimeDashboard';
-import useMessages from 'hooks/useMessages';
-import useApi from 'hooks/useApi';
-
-export default function RealtimeDetailsPage() {
-  const router = useRouter();
-  const { id: websiteId } = router.query;
-  const { formatMessage, labels } = useMessages();
-  const { get, useQuery } = useApi();
-  const { data: website } = useQuery(['websites', websiteId], () => get(`/websites/${websiteId}`), {
-    enabled: !!websiteId,
-  });
-  const title = `${formatMessage(labels.realtime)}${website?.name ? ` - ${website.name}` : ''}`;
-
-  if (!websiteId) {
-    return null;
-  }
-
-  return (
-    <AppLayout title={title}>
-      <RealtimeDashboard key={websiteId} websiteId={websiteId} />
-    </AppLayout>
-  );
-}
diff --git a/pages/realtime/index.js b/pages/realtime/index.js
deleted file mode 100644
index bb016173c..000000000
--- a/pages/realtime/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import AppLayout from 'components/layout/AppLayout';
-import RealtimeHome from 'components/pages/realtime/RealtimeHome';
-import useMessages from 'hooks/useMessages';
-
-export default function RealtimePage() {
-  const { formatMessage, labels } = useMessages();
-  return (
-    <AppLayout title={formatMessage(labels.realtime)}>
-      <RealtimeHome />
-    </AppLayout>
-  );
-}
diff --git a/pages/reports/[id].js b/pages/reports/[id].js
index 36a84a2e8..2520e87db 100644
--- a/pages/reports/[id].js
+++ b/pages/reports/[id].js
@@ -3,7 +3,7 @@ import AppLayout from 'components/layout/AppLayout';
 import ReportDetails from 'components/pages/reports/ReportDetails';
 import { useApi, useMessages } from 'hooks';
 
-export default function ReportsPage() {
+export default function () {
   const { formatMessage, labels } = useMessages();
   const router = useRouter();
   const { id } = router.query;
diff --git a/pages/reports/create.js b/pages/reports/create.js
index 421b9c0ac..763e2c63f 100644
--- a/pages/reports/create.js
+++ b/pages/reports/create.js
@@ -2,7 +2,7 @@ import AppLayout from 'components/layout/AppLayout';
 import ReportTemplates from 'components/pages/reports/ReportTemplates';
 import { useMessages } from 'hooks';
 
-export default function ReportsPage() {
+export default function () {
   const { formatMessage, labels } = useMessages();
 
   return (
diff --git a/pages/reports/event-data.js b/pages/reports/event-data.js
index b5749c96e..4566b3201 100644
--- a/pages/reports/event-data.js
+++ b/pages/reports/event-data.js
@@ -2,7 +2,7 @@ import AppLayout from 'components/layout/AppLayout';
 import EventDataReport from 'components/pages/reports/event-data/EventDataReport';
 import { useMessages } from 'hooks';
 
-export default function Report() {
+export default function () {
   const { formatMessage, labels } = useMessages();
 
   return (
diff --git a/pages/reports/funnel.js b/pages/reports/funnel.js
index 731ffa474..4acdef37d 100644
--- a/pages/reports/funnel.js
+++ b/pages/reports/funnel.js
@@ -2,7 +2,7 @@ import AppLayout from 'components/layout/AppLayout';
 import FunnelReport from 'components/pages/reports/funnel/FunnelReport';
 import useMessages from 'hooks/useMessages';
 
-export default function Funnel() {
+export default function () {
   const { formatMessage, labels } = useMessages();
 
   return (
diff --git a/pages/reports/index.js b/pages/reports/index.js
index 237f31ee0..e74bc05f0 100644
--- a/pages/reports/index.js
+++ b/pages/reports/index.js
@@ -1,13 +1,13 @@
 import AppLayout from 'components/layout/AppLayout';
 import useMessages from 'hooks/useMessages';
-import ReportsList from 'components/pages/reports/ReportsList';
+import ReportsPage from 'components/pages/reports/ReportsPage';
 
-export default function ReportsPage() {
+export default function () {
   const { formatMessage, labels } = useMessages();
 
   return (
     <AppLayout title={formatMessage(labels.reports)}>
-      <ReportsList />
+      <ReportsPage />
     </AppLayout>
   );
 }
diff --git a/pages/settings/profile/index.js b/pages/settings/profile/index.js
index aef21bb6d..8827f1daa 100644
--- a/pages/settings/profile/index.js
+++ b/pages/settings/profile/index.js
@@ -3,7 +3,7 @@ import SettingsLayout from 'components/layout/SettingsLayout';
 import ProfileSettings from 'components/pages/settings/profile/ProfileSettings';
 import useMessages from 'hooks/useMessages';
 
-export default function ProfilePage() {
+export default function () {
   const { formatMessage, labels } = useMessages();
   return (
     <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.profile)}`}>
diff --git a/pages/settings/teams/[id].js b/pages/settings/teams/[id].js
index 6eb631b15..a68ef80c3 100644
--- a/pages/settings/teams/[id].js
+++ b/pages/settings/teams/[id].js
@@ -4,7 +4,7 @@ import TeamSettings from 'components/pages/settings/teams/TeamSettings';
 import { useRouter } from 'next/router';
 import useMessages from 'hooks/useMessages';
 
-export default function TeamDetailPage({ disabled }) {
+export default function ({ disabled }) {
   const router = useRouter();
   const { id } = router.query;
   const { formatMessage, labels } = useMessages();
diff --git a/pages/settings/teams/index.js b/pages/settings/teams/index.js
index 471ddf0fc..51739c316 100644
--- a/pages/settings/teams/index.js
+++ b/pages/settings/teams/index.js
@@ -3,7 +3,7 @@ import SettingsLayout from 'components/layout/SettingsLayout';
 import TeamsList from 'components/pages/settings/teams/TeamsList';
 import useMessages from 'hooks/useMessages';
 
-export default function TeamsPage({ disabled }) {
+export default function ({ disabled }) {
   const { formatMessage, labels } = useMessages();
   if (disabled) {
     return null;
diff --git a/pages/settings/users/[id].js b/pages/settings/users/[id].js
index 94df69511..d1e53419b 100644
--- a/pages/settings/users/[id].js
+++ b/pages/settings/users/[id].js
@@ -4,7 +4,7 @@ import UserSettings from 'components/pages/settings/users/UserSettings';
 import { useRouter } from 'next/router';
 import useMessages from 'hooks/useMessages';
 
-export default function TeamDetailPage({ disabled }) {
+export default function ({ disabled }) {
   const router = useRouter();
   const { id } = router.query;
   const { formatMessage, labels } = useMessages();
diff --git a/pages/settings/users/index.js b/pages/settings/users/index.js
index 6e021a748..ee325adca 100644
--- a/pages/settings/users/index.js
+++ b/pages/settings/users/index.js
@@ -3,7 +3,7 @@ import SettingsLayout from 'components/layout/SettingsLayout';
 import UsersList from 'components/pages/settings/users/UsersList';
 import useMessages from 'hooks/useMessages';
 
-export default function UsersPage({ disabled }) {
+export default function ({ disabled }) {
   const { formatMessage, labels } = useMessages();
   if (disabled) {
     return null;
diff --git a/pages/settings/websites/[id].js b/pages/settings/websites/[id].js
index 7b97b8f5f..f828369e0 100644
--- a/pages/settings/websites/[id].js
+++ b/pages/settings/websites/[id].js
@@ -4,7 +4,7 @@ import WebsiteSettings from 'components/pages/settings/websites/WebsiteSettings'
 import SettingsLayout from 'components/layout/SettingsLayout';
 import useMessages from 'hooks/useMessages';
 
-export default function WebsiteSettingsPage({ disabled }) {
+export default function ({ disabled }) {
   const router = useRouter();
   const { id } = router.query;
   const { formatMessage, labels } = useMessages();
diff --git a/pages/settings/websites/index.js b/pages/settings/websites/index.js
index c115b0814..899ad7c71 100644
--- a/pages/settings/websites/index.js
+++ b/pages/settings/websites/index.js
@@ -3,7 +3,7 @@ import SettingsLayout from 'components/layout/SettingsLayout';
 import WebsitesList from 'components/pages/settings/websites/WebsitesList';
 import useMessages from 'hooks/useMessages';
 
-export default function WebsitesPage({ disabled }) {
+export default function ({ disabled }) {
   const { formatMessage, labels } = useMessages();
   if (disabled) {
     return null;
diff --git a/pages/share/[...id].js b/pages/share/[...id].js
index aa6caab36..1e4243821 100644
--- a/pages/share/[...id].js
+++ b/pages/share/[...id].js
@@ -1,9 +1,9 @@
 import { useRouter } from 'next/router';
 import ShareLayout from 'components/layout/ShareLayout';
-import WebsiteDetails from 'components/pages/websites/WebsiteDetails';
+import WebsiteDetailsPage from 'components/pages/websites/WebsiteDetailsPage';
 import useShareToken from 'hooks/useShareToken';
 
-export default function SharePage() {
+export default function () {
   const router = useRouter();
   const { id } = router.query;
   const shareId = id?.[0];
@@ -15,7 +15,7 @@ export default function SharePage() {
 
   return (
     <ShareLayout>
-      <WebsiteDetails websiteId={shareToken.websiteId} />
+      <WebsiteDetailsPage websiteId={shareToken.websiteId} />
     </ShareLayout>
   );
 }
diff --git a/pages/sso.js b/pages/sso.js
index c3d499c30..6e6352061 100644
--- a/pages/sso.js
+++ b/pages/sso.js
@@ -3,7 +3,7 @@ import { Loading } from 'react-basics';
 import { useRouter } from 'next/router';
 import { setClientAuthToken } from 'lib/client';
 
-export default function SingleSignOnPage() {
+export default function () {
   const router = useRouter();
   const { token, url } = router.query;
 
diff --git a/pages/websites/[id].js b/pages/websites/[id]/event-data.js
similarity index 71%
rename from pages/websites/[id].js
rename to pages/websites/[id]/event-data.js
index d2a258e12..7b060d202 100644
--- a/pages/websites/[id].js
+++ b/pages/websites/[id]/event-data.js
@@ -1,9 +1,9 @@
 import { useRouter } from 'next/router';
 import AppLayout from 'components/layout/AppLayout';
-import WebsiteDetails from 'components/pages/websites/WebsiteDetails';
+import WebsiteEventData from 'components/pages/websites/WebsiteEventData';
 import useMessages from 'hooks/useMessages';
 
-export default function DetailsPage() {
+export default function () {
   const { formatMessage, labels } = useMessages();
   const router = useRouter();
   const { id } = router.query;
@@ -14,7 +14,7 @@ export default function DetailsPage() {
 
   return (
     <AppLayout title={formatMessage(labels.websites)}>
-      <WebsiteDetails websiteId={id} />
+      <WebsiteEventData websiteId={id} />
     </AppLayout>
   );
 }
diff --git a/pages/websites/[id]/index.js b/pages/websites/[id]/index.js
new file mode 100644
index 000000000..bec7a45f6
--- /dev/null
+++ b/pages/websites/[id]/index.js
@@ -0,0 +1,20 @@
+import { useRouter } from 'next/router';
+import AppLayout from 'components/layout/AppLayout';
+import WebsiteDetailsPage from 'components/pages/websites/WebsiteDetailsPage';
+import useMessages from 'hooks/useMessages';
+
+export default function () {
+  const { formatMessage, labels } = useMessages();
+  const router = useRouter();
+  const { id } = router.query;
+
+  if (!id) {
+    return null;
+  }
+
+  return (
+    <AppLayout title={formatMessage(labels.websites)}>
+      <WebsiteDetailsPage websiteId={id} />
+    </AppLayout>
+  );
+}
diff --git a/pages/websites/[id]/realtime.js b/pages/websites/[id]/realtime.js
new file mode 100644
index 000000000..ceab7ad22
--- /dev/null
+++ b/pages/websites/[id]/realtime.js
@@ -0,0 +1,18 @@
+import { useRouter } from 'next/router';
+import AppLayout from 'components/layout/AppLayout';
+import RealtimeDashboard from 'components/pages/realtime/RealtimeDashboard';
+
+export default function () {
+  const router = useRouter();
+  const { id: websiteId } = router.query;
+
+  if (!websiteId) {
+    return null;
+  }
+
+  return (
+    <AppLayout>
+      <RealtimeDashboard websiteId={websiteId} />
+    </AppLayout>
+  );
+}
diff --git a/pages/websites/[id]/reports.js b/pages/websites/[id]/reports.js
new file mode 100644
index 000000000..2035b539e
--- /dev/null
+++ b/pages/websites/[id]/reports.js
@@ -0,0 +1,18 @@
+import { useRouter } from 'next/router';
+import AppLayout from 'components/layout/AppLayout';
+import WebsiteReports from 'components/pages/websites/WebsiteReports';
+
+export default function () {
+  const router = useRouter();
+  const { id: websiteId } = router.query;
+
+  if (!websiteId) {
+    return null;
+  }
+
+  return (
+    <AppLayout>
+      <WebsiteReports websiteId={websiteId} />
+    </AppLayout>
+  );
+}