diff --git a/gui/rpk-gui/src/App.tsx b/gui/rpk-gui/src/App.tsx
index cdbadfc..6342d60 100644
--- a/gui/rpk-gui/src/App.tsx
+++ b/gui/rpk-gui/src/App.tsx
@@ -23,8 +23,8 @@ import { ForgotPassword } from "./components/auth/ForgotPassword";
 import { UpdatePassword } from "./components/auth/UpdatePassword";
 
 import { Header } from "./components";
-import { Hub } from "./pages/hub";
-import { CreateFirm } from "./pages/hub/CreateFirm";
+import { HubRoutes } from "./pages/hub";
+import { FirmRoutes } from "./pages/firm";
 
 function App() {
   return (
@@ -43,26 +43,42 @@ function App() {
                 syncWithLocation: true,
                 warnWhenUnsavedChanges: true,
                 useNewQueryKeys: true,
-                disableTelemetry: true
+                disableTelemetry: true,
+                reactQuery: {
+                  clientConfig: {
+                    defaultOptions: {
+                      queries: {
+                        retry: (failureCount, error) => {
+                          // @ts-ignore
+                          if (error.status >= 400 && error.status <= 499) {
+                            return false
+                          }
+                          return failureCount < 4
+                        },
+                      }
+                    }
+                  }
+                }
               }}
             >
-              <Header />
               <Routes>
                 <Route
-                    element={(
-                        <Authenticated key="authenticated-routes" redirectOnFail="/login" fallback={<CatchAllNavigate  to="/login"/>}>
-                            <Outlet />
-                        </Authenticated>
-                    )}
+                  element={(
+                    <Authenticated key="authenticated-routes" redirectOnFail="/auth/login" fallback={<CatchAllNavigate  to="/auth/login"/>}>
+                      <Outlet />
+                    </Authenticated>
+                  )}
                 >
-                  <Route path="/hub" element={ <Hub /> } />
-                  <Route path="/hub/create-firm" element={ <CreateFirm /> } />
+                  <Route path="hub/*" element={<HubRoutes />} />
+                  <Route path="firm/*" element={<FirmRoutes />} />
                 </Route>
-                <Route index element={<h1>HOME&nbsp;<Link to={"/login"}>Login</Link></h1>} />
-                <Route path="/login" element={<Login />} />
-                <Route path="/register" element={<Register />} />
-                <Route path="/forgot-password" element={<ForgotPassword />} />
-                <Route path="/update-password" element={<UpdatePassword />} />
+                <Route path="auth/*" element={<><Header /><Outlet /></>}>
+                  <Route path="login" element={<Login />} />
+                  <Route path="register" element={<Register />} />
+                  <Route path="forgot-password" element={<ForgotPassword />} />
+                  <Route path="update-password" element={<UpdatePassword />} />
+                </Route>
+                <Route index element={<><Header /><h1>HOME&nbsp;<Link to={"/auth/login"}>Login</Link></h1></>} />
               </Routes>
               <UnsavedChangesNotifier />
               <DocumentTitleHandler />
diff --git a/gui/rpk-gui/src/components/header/index.tsx b/gui/rpk-gui/src/components/header/index.tsx
index 74ca12a..bb0f56e 100644
--- a/gui/rpk-gui/src/components/header/index.tsx
+++ b/gui/rpk-gui/src/components/header/index.tsx
@@ -12,11 +12,13 @@ import React, { useContext } from "react";
 import { ColorModeContext } from "../../contexts/color-mode";
 import { Logout } from "../auth/Logout";
 import { IUser } from "../../interfaces";
+import { FirmContext } from "../../contexts/FirmContext";
 
 export const Header: React.FC<RefineThemedLayoutV2HeaderProps> = ({
   sticky = true,
 }) => {
   const { mode, setMode } = useContext(ColorModeContext);
+  const { currentFirm } = useContext(FirmContext);
 
   const { data: user } = useGetIdentity<IUser>();
 
diff --git a/gui/rpk-gui/src/contexts/FirmContext.tsx b/gui/rpk-gui/src/contexts/FirmContext.tsx
new file mode 100644
index 0000000..536bd56
--- /dev/null
+++ b/gui/rpk-gui/src/contexts/FirmContext.tsx
@@ -0,0 +1,25 @@
+import React, { createContext, PropsWithChildren } from 'react';
+import { IFirm } from "../interfaces";
+import { useParams } from "react-router";
+
+type FirmContextType = {
+  currentFirm: IFirm,
+}
+
+export const FirmContext = createContext<FirmContextType>(
+  {} as FirmContextType
+);
+
+
+export const FirmContextProvider: React.FC<PropsWithChildren> = ({ children }: PropsWithChildren) => {
+  const { instance, firm } = useParams<IFirm>()
+
+  if (instance === undefined || firm === undefined) {
+    return "Error"
+  }
+  return (
+    <FirmContext.Provider value={{currentFirm: {instance, firm}}} >
+      { children }
+    </FirmContext.Provider>
+  );
+}
diff --git a/gui/rpk-gui/src/interfaces/index.tsx b/gui/rpk-gui/src/interfaces/index.tsx
index d6e795a..cf7eb48 100644
--- a/gui/rpk-gui/src/interfaces/index.tsx
+++ b/gui/rpk-gui/src/interfaces/index.tsx
@@ -1,7 +1,7 @@
 
 export type IFirm = {
   instance: string,
-  name: string
+  firm: string
 }
 
 type User = {
diff --git a/gui/rpk-gui/src/pages/firm/index.tsx b/gui/rpk-gui/src/pages/firm/index.tsx
new file mode 100644
index 0000000..ecb648d
--- /dev/null
+++ b/gui/rpk-gui/src/pages/firm/index.tsx
@@ -0,0 +1,28 @@
+import {Route, Routes} from "react-router";
+import React, { useContext } from "react";
+import { FirmContext, FirmContextProvider } from "../../contexts/FirmContext";
+import { Header } from "../../components";
+
+export const FirmRoutes = () => {
+  return (
+    <>
+      <Header />
+      <Routes>
+        <Route path="/:instance/:firm/*" element={
+          <FirmContextProvider>
+            <Routes>
+              <Route index element={ <FirmHome /> } />
+            </Routes>
+          </FirmContextProvider>
+        } />
+      </Routes>
+    </>
+  );
+}
+
+const FirmHome = () => {
+  const { currentFirm } = useContext(FirmContext);
+  return (
+    <h1>This is la firme {currentFirm.instance} / {currentFirm.firm}</h1>
+  );
+}
diff --git a/gui/rpk-gui/src/pages/hub/index.tsx b/gui/rpk-gui/src/pages/hub/index.tsx
index 2901ab4..aa36b1c 100644
--- a/gui/rpk-gui/src/pages/hub/index.tsx
+++ b/gui/rpk-gui/src/pages/hub/index.tsx
@@ -1,14 +1,30 @@
 import { Button } from "@mui/material";
-import { Link } from "react-router";
+import ExitToAppIcon from '@mui/icons-material/ExitToApp';
+import React from 'react';
+import {Link, Route, Routes} from "react-router";
 import { useGetIdentity, useList } from "@refinedev/core";
 import { IAuthUser, IFirm } from "../../interfaces";
+import {CreateFirm} from "./CreateFirm";
+import {Header} from "../../components";
 
 
-export const Hub = () => {
-  const { data: user } = useGetIdentity<IAuthUser>();
+export const HubRoutes = () => {
+  return (
+    <>
+      <Header />
+      <Routes>
+        <Route index element={ <HubHome /> } />
+        <Route path="create-firm" element={ <CreateFirm /> } />
+      </Routes>
+    </>
+  );
+};
+
+const HubHome = () => {
+  const { data: user, refetch } = useGetIdentity<IAuthUser>();
   const { data: list } = useList<IFirm>({resource: "hub/users/firms/", pagination: { mode: "off" }}, )
   if (user === undefined || list === undefined) {
-    return <p>Loading</p>
+    return <p>Loading</p>;
   }
   console.log("list data: ", list);
   const ownedFirms = list.data;
@@ -16,23 +32,25 @@ export const Hub = () => {
     return <p>Loading</p>
   }
   console.log("owned firms: ", ownedFirms);
-
   return (
     <div>
       <h1>HUB</h1>
       <p>List of managed firms</p>
       <ul>
         {ownedFirms.map((f: IFirm, index) => (
-             <li key={index}>{f.instance} / {f.name}</li>
+             <li key={index}>{f.instance} / {f.firm}</li>
          ))}
       </ul>
       <p>List of firm you're working at</p>
       <ul>
         {user.firms.map((f: IFirm, index) => (
-             <li key={index}>{f.instance} / {f.name}</li>
+             <li key={index}>
+               {f.instance} / {f.firm}&nbsp;<Link to={`/firm/${f.instance}/${f.firm}`}><ExitToAppIcon /></Link>
+             </li>
          ))}
       </ul>
-      <Link to="/hub/create-firm" ><Button >Create a new firm</Button></Link>
+      <Link to="/hub/create-firm" ><Button>Create a new firm</Button></Link>
+      <Button onClick={() => refetch()}>Refresh</Button>
     </div>
-  );
-};
+  )
+}
diff --git a/gui/rpk-gui/src/providers/auth-provider.tsx b/gui/rpk-gui/src/providers/auth-provider.tsx
index 3355254..38ee3ba 100644
--- a/gui/rpk-gui/src/providers/auth-provider.tsx
+++ b/gui/rpk-gui/src/providers/auth-provider.tsx
@@ -7,9 +7,12 @@ const LOCAL_STORAGE_USER_KEY = "rpk-gui-current-user";
 const GOOGLE_SCOPES = { "scopes": "https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email" };
 const DISCORD_SCOPES = { "scopes": "identify email" }
 
+const DEFAULT_LOGIN_REDIRECT = "/hub"
+
 export const authProvider: AuthProvider = {
   login: async ({ providerName, email, password }) => {
     const to_param = findGetParameter("to");
+    const redirect = to_param === null ? DEFAULT_LOGIN_REDIRECT : to_param
     if (providerName) {
       let scope = {};
       if (providerName === "google") {
@@ -22,11 +25,14 @@ export const authProvider: AuthProvider = {
       const response = await fetch(url, { method: "GET", },);
       const body = await response.json();
 
-      if (to_param) {
-        localStorage.setItem("redirect_after_login", to_param);
-      }
+
+      localStorage.setItem("redirect_after_login", redirect);
+
       window.location.href = body.authorization_url;
-      return { success: true };
+      return {
+        success: true,
+        redirectTo: ""
+      };
     } else if (email !== undefined && password !== undefined) {
       const params = new URLSearchParams({"grant_type": "password", "username": email, "password": password});
       const response = await fetch(
@@ -42,7 +48,10 @@ export const authProvider: AuthProvider = {
         const user = await response.json();
         store_user(user);
 
-        return { success: true };
+        return {
+          success: true,
+          redirectTo: redirect,
+        };
       }
     }
 
@@ -60,7 +69,7 @@ export const authProvider: AuthProvider = {
     if (get_user() == null) {
       return {
         authenticated: false,
-        redirectTo: "/login",
+        redirectTo: "/auth/login",
         logout: true
       }
     }
@@ -142,7 +151,7 @@ export const authProvider: AuthProvider = {
     if (error?.status === 401) {
       forget_user();
       return {
-        redirectTo: "/login",
+        redirectTo: "/auth/login",
         logout: true,
         error: { message: "Authentication required" },
       } as OnErrorResponse;