diff --git a/ui/src/app/App.router.js b/ui/src/app/App.router.js
index 01dfe80ce..1091dd091 100644
--- a/ui/src/app/App.router.js
+++ b/ui/src/app/App.router.js
@@ -1,4 +1,4 @@
-import { createBrowserRouter, Navigate } from "react-router-dom";
+import { createBrowserRouter, Navigate, Outlet } from "react-router-dom";
 import { BASE_PATH } from "./App.constant";
 import { Root } from "./App.root";
 import Dashboard from "./dashboard/view/Dashboard";
@@ -68,6 +68,7 @@ import MetadataFilterSelector from "./metadata/hoc/MetadataFilterSelector";
 import { EditFilter } from "./metadata/view/EditFilter";
 import MetadataSelector from "./metadata/hoc/MetadataSelector";
 import { MetadataFilterList } from "./metadata/editor/MetadataFilterList";
+import { Error } from './core/Error';
 
 export const router = createBrowserRouter([
     {
@@ -75,347 +76,353 @@ export const router = createBrowserRouter([
         element: <Navigate to="/" replace />
     },
     {
-        path: `/`,
         element: <Root />,
+        errorElement: <Error />,
         children: [
             {
-                index: true,
-                element: <Navigate to="/dashboard" replace />
-            },
-            {
-                path: `/dashboard`,
-                element: <Dashboard />,
+                element: <Outlet />,
                 children: [
                     {
-                        path: `metadata/manager/resolvers`,
-                        element: <SourcesTab />,
-                    },
-                    {
-                        path: `metadata/manager/providers`,
-                        element: <ProvidersTab />,
-                    },
-                    {
-                        path: `dynamic-registration`,
-                        element: <DynamicRegistrationsTab />,
+                        index: true,
+                        element: <Navigate to="/dashboard" replace />
                     },
                     {
-                        path: `admin/actions`,
-                        element: <ActionsTab />,
+                        path: `/dashboard`,
+                        element: <Dashboard />,
                         children: [
                             {
-                                index: true,
-                                element: <Navigate to="approve-sources" replace />
+                                path: `metadata/manager/resolvers`,
+                                element: <SourcesTab />,
                             },
                             {
-                                path: `approve-sources`,
-                                element: <ApproveSources />
+                                path: `metadata/manager/providers`,
+                                element: <ProvidersTab />,
                             },
                             {
-                                path: `approve-registrations`,
-                                element: <ApproveRegistrations />
+                                path: `dynamic-registration`,
+                                element: <DynamicRegistrationsTab />,
                             },
                             {
-                                path: `enable-sources`,
-                                element: <EnableSources />
+                                path: `admin/actions`,
+                                element: <ActionsTab />,
+                                children: [
+                                    {
+                                        index: true,
+                                        element: <Navigate to="approve-sources" replace />
+                                    },
+                                    {
+                                        path: `approve-sources`,
+                                        element: <ApproveSources />
+                                    },
+                                    {
+                                        path: `approve-registrations`,
+                                        element: <ApproveRegistrations />
+                                    },
+                                    {
+                                        path: `enable-sources`,
+                                        element: <EnableSources />
+                                    },
+                                    {
+                                        path: `enable-registrations`,
+                                        element: <EnableRegistrations />
+                                    },
+                                    {
+                                        path: `useraccess`,
+                                        element: <UserAccess />
+                                    }
+                                ]
                             },
                             {
-                                path: `enable-registrations`,
-                                element: <EnableRegistrations />
+                                path: `admin/management`,
+                                element: <ProtectRoute redirectTo="/dashboard">
+                                        <AdminTab />
+                                    </ProtectRoute>
                             },
                             {
-                                path: `useraccess`,
-                                element: <UserAccess />
+                                index: true,
+                                element: <Navigate to="metadata/manager/resolvers" replace />
                             }
-                        ]
-                    },
-                    {
-                        path: `admin/management`,
-                        element: <ProtectRoute redirectTo="/dashboard">
-                                <AdminTab />
-                            </ProtectRoute>
-                    },
-                    {
-                        index: true,
-                        element: <Navigate to="metadata/manager/resolvers" replace />
-                    }
-                ],
-            },
-            {
-                path: `metadata/:type/:id/`,
-                element: <Metadata />,
-                children: [
-                    {
-                        path: `configuration/options`,
-                        element: <MetadataDetail>
-                                    <MetadataOptions></MetadataOptions>
-                                </MetadataDetail>,
-                    },
-                    {
-                        path: `configuration/xml`,
-                        element: <MetadataDetail>
-                                    <MetadataXml></MetadataXml>
-                                </MetadataDetail>,
-                    },
-                    {
-                        path: `configuration/history`,
-                        element: <MetadataDetail>
-                                    <MetadataHistory></MetadataHistory>
-                                </MetadataDetail>,
-                    },
-                    {
-                        path: `configuration/compare`,
-                        element: <MetadataDetail>
-                                    <MetadataComparison></MetadataComparison>
-                                </MetadataDetail>,
+                        ],
                     },
                     {
-                        path: `configuration/version/:versionId/options`,
-                        element: <MetadataDetail>
-                                    <MetadataVersion></MetadataVersion>
-                                </MetadataDetail>,
-                    },
-                    {
-                        path: `edit/:section`,
-                        element: <MetadataEdit />,
+                        path: `metadata/:type/:id/`,
+                        element: <Metadata />,
+                        children: [
+                            {
+                                path: `configuration/options`,
+                                element: <MetadataDetail>
+                                            <MetadataOptions></MetadataOptions>
+                                        </MetadataDetail>,
+                            },
+                            {
+                                path: `configuration/xml`,
+                                element: <MetadataDetail>
+                                            <MetadataXml></MetadataXml>
+                                        </MetadataDetail>,
+                            },
+                            {
+                                path: `configuration/history`,
+                                element: <MetadataDetail>
+                                            <MetadataHistory></MetadataHistory>
+                                        </MetadataDetail>,
+                            },
+                            {
+                                path: `configuration/compare`,
+                                element: <MetadataDetail>
+                                            <MetadataComparison></MetadataComparison>
+                                        </MetadataDetail>,
+                            },
+                            {
+                                path: `configuration/version/:versionId/options`,
+                                element: <MetadataDetail>
+                                            <MetadataVersion></MetadataVersion>
+                                        </MetadataDetail>,
+                            },
+                            {
+                                path: `edit/:section`,
+                                element: <MetadataEdit />,
+                            },
+                            {
+                                path: `restore/:versionId/:section`,
+                                element: <MetadataConfirmRestore />,
+                            },
+                            {
+                                path: `restore/:versionId/:section/edit`,
+                                element: <MetadataRestore />,
+                            },
+                            {
+                                index: true,
+                                element: <Navigate to={`configuration/options`} />,
+                            },
+                        ]
                     },
                     {
-                        path: `restore/:versionId/:section`,
-                        element: <MetadataConfirmRestore />,
+                        path: 'metadata/source/new',
+                        element: <NewSource />,
+                        children: [
+                            {
+                                path: `blank`,
+                                element: <MetadataSourceProtocolSelector>
+                                        {(data, onRestart) =>
+                                        <MetadataSchema type={data.protocol} wizard={true}>
+                                            <MetadataWizard type="source"
+                                                onCallback={onRestart}
+                                                data={{
+                                                    protocol: data.protocol,
+                                                    serviceProviderName: data.serviceProviderName,
+                                                    entityId: data.entityId
+                                                }} />
+                                        </MetadataSchema>
+                                        }
+                                    </MetadataSourceProtocolSelector>,
+                            },
+                            {
+                                path: `upload`,
+                                element: <MetadataUpload />,
+                            },
+                            {
+                                path: `copy`,
+                                element: <MetadataSchema type={'SAML'} wizard={true}>
+                                        <MetadataCopy />
+                                    </MetadataSchema>,
+                            },
+                            {
+                                index: true,
+                                element: <Navigate to={`blank`} />,
+                            },
+                        ]
                     },
                     {
-                        path: `restore/:versionId/:section/edit`,
-                        element: <MetadataRestore />,
+                        path: `metadata/provider/new`,
+                        element: <ProtectRoute redirectTo="/dashboard">
+                            <NewProvider />
+                        </ProtectRoute>
                     },
                     {
-                        index: true,
-                        element: <Navigate to={`configuration/options`} />,
+                        path: `metadata/provider/:id/filter`,
+                        element: <Filter />,
+                        children: [
+                            {
+                                path: `list`,
+                                element: <MetadataSelector type="provider">
+                                    {(entity) =>
+                                        <MetadataSchema type={entity['@type']}>
+                                            <MetadataFilterList />
+                                        </MetadataSchema>
+                                    }
+                                </MetadataSelector>,
+                            },
+                            {
+                                path: `new/:section`,
+                                element: <NewFilter />
+                            },
+                            {
+                                path: `:filterId/edit/:section`,
+                                element: <MetadataFilterSelector>
+                                <EditFilter />
+                            </MetadataFilterSelector>
+                            },
+                            {
+                                path: `new`,
+                                element: <Navigate to={`common`} />
+                            }
+                        ]
                     },
-                ]
-            },
-            {
-                path: 'metadata/source/new',
-                element: <NewSource />,
-                children: [
                     {
-                        path: `blank`,
-                        element: <MetadataSourceProtocolSelector>
-                                {(data, onRestart) =>
-                                <MetadataSchema type={data.protocol} wizard={true}>
-                                    <MetadataWizard type="source"
-                                        onCallback={onRestart}
-                                        data={{
-                                            protocol: data.protocol,
-                                            serviceProviderName: data.serviceProviderName,
-                                            entityId: data.entityId
-                                        }} />
-                                </MetadataSchema>
+                        path: `groups`,
+                        element: <Groups />,
+                        children: [
+                            {
+                                path: `list`,
+                                element: <GroupsProvider>
+                                {(groups, onDelete) =>
+                                    <GroupsList groups={groups} onDelete={onDelete} />
                                 }
-                            </MetadataSourceProtocolSelector>,
-                    },
-                    {
-                        path: `upload`,
-                        element: <MetadataUpload />,
-                    },
-                    {
-                        path: `copy`,
-                        element: <MetadataSchema type={'SAML'} wizard={true}>
-                                <MetadataCopy />
-                            </MetadataSchema>,
-                    },
-                    {
-                        index: true,
-                        element: <Navigate to={`blank`} />,
-                    },
-                ]
-            },
-            {
-                path: `metadata/provider/new`,
-                element: <ProtectRoute redirectTo="/dashboard">
-                    <NewProvider />
-                </ProtectRoute>
-            },
-            {
-                path: `metadata/provider/:id/filter`,
-                element: <Filter />,
-                children: [
-                    {
-                        path: `list`,
-                        element: <MetadataSelector type="provider">
-                            {(entity) =>
-                                <MetadataSchema type={entity['@type']}>
-                                    <MetadataFilterList />
-                                </MetadataSchema>
+                            </GroupsProvider>,
+                            },
+                            {
+                                path: `new`,
+                                element: <GroupsProvider>
+                                {(groups, onDelete, loading) =>
+                                    <Fragment>{ loading ? <div className="d-flex justify-content-center text-primary"><Spinner size="4x" /></div> : <NewGroup groups={groups} /> }</Fragment>
+                                }
+                            </GroupsProvider>,
+                            },
+                            {
+                                path: `:id/edit`,
+                                element: <GroupsProvider>
+                                {(groups, onDelete, loading) =>
+                                    <Fragment>{ loading ? <div className="d-flex justify-content-center text-primary"><Spinner size="4x" /></div> : <EditGroup groups={groups} /> }</Fragment>
+                                }
+                            </GroupsProvider>,
+                            },
+                            {
+                                index: true,
+                                element: <Navigate to={`list`} />,
                             }
-                        </MetadataSelector>,
-                    },
-                    {
-                        path: `new/:section`,
-                        element: <NewFilter />
-                    },
-                    {
-                        path: `:filterId/edit/:section`,
-                        element: <MetadataFilterSelector>
-                        <EditFilter />
-                    </MetadataFilterSelector>
-                    },
-                    {
-                        path: `new`,
-                        element: <Navigate to={`common`} />
-                    }
-                ]
-            },
-            {
-                path: `groups`,
-                element: <Groups />,
-                children: [
-                    {
-                        path: `list`,
-                        element: <GroupsProvider>
-                        {(groups, onDelete) =>
-                            <GroupsList groups={groups} onDelete={onDelete} />
-                        }
-                    </GroupsProvider>,
-                    },
-                    {
-                        path: `new`,
-                        element: <GroupsProvider>
-                        {(groups, onDelete, loading) =>
-                            <Fragment>{ loading ? <div className="d-flex justify-content-center text-primary"><Spinner size="4x" /></div> : <NewGroup groups={groups} /> }</Fragment>
-                        }
-                    </GroupsProvider>,
-                    },
-                    {
-                        path: `:id/edit`,
-                        element: <GroupsProvider>
-                        {(groups, onDelete, loading) =>
-                            <Fragment>{ loading ? <div className="d-flex justify-content-center text-primary"><Spinner size="4x" /></div> : <EditGroup groups={groups} /> }</Fragment>
-                        }
-                    </GroupsProvider>,
-                    },
-                    {
-                        index: true,
-                        element: <Navigate to={`list`} />,
-                    }
-                ]
-            },
-            {
-                path: `configurations`,
-                element: <Groups />,
-                children: [
-                    {
-                        path: `list`,
-                        element: <ConfigurationsProvider>
-                        {(configurations, onDelete) =>
-                            <ConfigurationList configurations={configurations} onDelete={onDelete} />
-                        }
-                    </ConfigurationsProvider>,
-                    },
-                    {
-                        path: `new`,
-                        element:<ConfigurationsProvider>
-                        {(configurations) =>
-                            <NewConfiguration configurations={configurations} />
-                        }
-                    </ConfigurationsProvider>,
-                    },
-                    {
-                        path: `:id/edit`,
-                        element: <ConfigurationsProvider>
-                        {(configurations) =>
-                            <EditConfiguration configurations={configurations} />
-                        }
-                    </ConfigurationsProvider>,
-                    },
-                    {
-                        index: true,
-                        element: <Navigate to={`list`} />,
-                    }
-                ]
-            },
-            {
-                path: `roles`,
-                element: <Roles />,
-                children: [
-                    {
-                        path: `list`,
-                        element: <RolesProvider>
-                        {(roles, onDelete) =>
-                            <RoleList roles={roles} onDelete={onDelete} />
-                        }
-                    </RolesProvider>,
-                    },
-                    {
-                        path: `new`,
-                        element:<NewRole />,
-                    },
-                    {
-                        path: `:id/edit`,
-                        element: <EditRole />,
-                    },
-                    {
-                        index: true,
-                        element: <Navigate to={`list`} />,
-                    }
-                ]
-            },
-            {
-                path: `dynamic-registration`,
-                element: <DynamicRegistration />,
-                children: [
-                    {
-                        path: `new`,
-                        element: <DynamicRegistrationCreate />,
-                    },
-                    {
-                        path: `:id`,
-                        element: <DynamicRegistrationDetail />,
+                        ]
                     },
                     {
-                        path: `:id/edit`,
-                        element: <DynamicRegistrationEdit />,
-                    }
-                ]
-            },
-            {
-                path: `metadata/attributes`,
-                element: <ProtectRoute redirectTo="/dashboard">
-                    <Attribute />
-                </ProtectRoute>,
-                children: [
-                    {
-                        path: `list`,
-                        element: <MetadataAttributes>
-                            {(entities, onDelete) =>
-                                <MetadataAttributeList entities={entities} onDelete={onDelete} />
+                        path: `configurations`,
+                        element: <Groups />,
+                        children: [
+                            {
+                                path: `list`,
+                                element: <ConfigurationsProvider>
+                                {(configurations, onDelete) =>
+                                    <ConfigurationList configurations={configurations} onDelete={onDelete} />
+                                }
+                            </ConfigurationsProvider>,
+                            },
+                            {
+                                path: `new`,
+                                element:<ConfigurationsProvider>
+                                {(configurations) =>
+                                    <NewConfiguration configurations={configurations} />
+                                }
+                            </ConfigurationsProvider>,
+                            },
+                            {
+                                path: `:id/edit`,
+                                element: <ConfigurationsProvider>
+                                {(configurations) =>
+                                    <EditConfiguration configurations={configurations} />
+                                }
+                            </ConfigurationsProvider>,
+                            },
+                            {
+                                index: true,
+                                element: <Navigate to={`list`} />,
                             }
-                        </MetadataAttributes>,
-                    },
-                    {
-                        path: `new`,
-                        element:<NewAttribute/>,
-                    },
-                    {
-                        path: `:id/edit`,
-                        element: <MetadataAttributeEdit />,
-                    },
-                    {
-                        path: `bundles`,
-                        element: <MetadataAttributeBundles />
+                        ]
                     },
                     {
-                        path: `bundles/new`,
-                        element: <NewBundle />
+                        path: `roles`,
+                        element: <Roles />,
+                        children: [
+                            {
+                                path: `list`,
+                                element: <RolesProvider>
+                                {(roles, onDelete) =>
+                                    <RoleList roles={roles} onDelete={onDelete} />
+                                }
+                            </RolesProvider>,
+                            },
+                            {
+                                path: `new`,
+                                element:<NewRole />,
+                            },
+                            {
+                                path: `:id/edit`,
+                                element: <EditRole />,
+                            },
+                            {
+                                index: true,
+                                element: <Navigate to={`list`} />,
+                            }
+                        ]
                     },
                     {
-                        path: `bundles/:id/edit`,
-                        element: <MetadataAttributeBundleEdit />
+                        path: `dynamic-registration`,
+                        element: <DynamicRegistration />,
+                        children: [
+                            {
+                                path: `new`,
+                                element: <DynamicRegistrationCreate />,
+                            },
+                            {
+                                path: `:id`,
+                                element: <DynamicRegistrationDetail />,
+                            },
+                            {
+                                path: `:id/edit`,
+                                element: <DynamicRegistrationEdit />,
+                            }
+                        ]
                     },
                     {
-                        index: true,
-                        element: <Navigate to={`list`} />,
+                        path: `metadata/attributes`,
+                        element: <ProtectRoute redirectTo="/dashboard">
+                            <Attribute />
+                        </ProtectRoute>,
+                        children: [
+                            {
+                                path: `list`,
+                                element: <MetadataAttributes>
+                                    {(entities, onDelete) =>
+                                        <MetadataAttributeList entities={entities} onDelete={onDelete} />
+                                    }
+                                </MetadataAttributes>,
+                            },
+                            {
+                                path: `new`,
+                                element:<NewAttribute/>,
+                            },
+                            {
+                                path: `:id/edit`,
+                                element: <MetadataAttributeEdit />,
+                            },
+                            {
+                                path: `bundles`,
+                                element: <MetadataAttributeBundles />
+                            },
+                            {
+                                path: `bundles/new`,
+                                element: <NewBundle />
+                            },
+                            {
+                                path: `bundles/:id/edit`,
+                                element: <MetadataAttributeBundleEdit />
+                            },
+                            {
+                                index: true,
+                                element: <Navigate to={`list`} />,
+                            }
+                        ]
                     }
                 ]
-            }
+            },
+            
         ]
     }
 ], {
diff --git a/ui/src/app/core/Error.js b/ui/src/app/core/Error.js
new file mode 100644
index 000000000..7571b8bcc
--- /dev/null
+++ b/ui/src/app/core/Error.js
@@ -0,0 +1,24 @@
+import React, { Fragment } from 'react';
+
+import { Alert } from 'react-bootstrap';
+import { Link } from 'react-router-dom';
+
+import Footer from './components/Footer';
+import Header from './components/Header';
+
+export function Error () {
+    return (
+        <Fragment>
+            <Header />
+                <main className="container my-5">
+                    <Alert variant='danger'>
+                        <h4 class="alert-heading">Oops!</h4>
+                        <p>There was a problem processing this request.</p>
+                        <hr />
+                        <Link to="/dashboard" className="btn btn-dark">Go to dashboard</Link>
+                    </Alert>
+                </main>
+            <Footer />
+        </Fragment>
+    );
+}
\ No newline at end of file