diff --git a/src/interfaces/tableProps.ts b/src/interfaces/tableProps.ts
index f12e209..96b4d92 100644
--- a/src/interfaces/tableProps.ts
+++ b/src/interfaces/tableProps.ts
@@ -22,14 +22,18 @@ export enum TableHeaderKey {
 interface ICommonTableHeader {
   [TableHeaderKey.Search]?: {
     searchProps?: string[];
+    render?: (key: string) => React.JSX.Element;
   };
 }
 
 export interface ITableWithPaginationHeader extends ICommonTableHeader {
   [TableHeaderKey.AddRow]?: {
     openAddRowModal: () => void;
+    render?: (key: string) => React.JSX.Element;
+  };
+  [TableHeaderKey.SelectType]?: ISelectComponent & {
+    render?: (key: string) => React.JSX.Element;
   };
-  [TableHeaderKey.SelectType]?: ISelectComponent;
 }
 
 export interface ITableWithLoadMoreHeader extends ICommonTableHeader {
diff --git a/src/routers/index.tsx b/src/routers/index.tsx
index b338b46..e161af4 100644
--- a/src/routers/index.tsx
+++ b/src/routers/index.tsx
@@ -13,14 +13,35 @@ export default function Router() {
       <Header />
       <Routes>
         {/* Public routes */}
-        <Route path="/login" element={<Suspense fallback={null}><LoginForm /></Suspense>} />
+        <Route
+          path="/login"
+          element={
+            <Suspense fallback={null}>
+              <LoginForm />
+            </Suspense>
+          }
+        />
 
         {/* Protected routes */}
         <Route path="/" element={<Navigate to="/channels" replace />} />
-        <Route path="/channels" element={<Suspense fallback={null}><ProtectedRoute component={<ChannelList />} /></Suspense>} />
-        <Route path="/channels/:channelId" element={<Suspense fallback={null}><ProtectedRoute component={<ChannelDetail />} /></Suspense>} />
+        <Route
+          path="/:applicationId/channels"
+          element={
+            <Suspense fallback={null}>
+              <ProtectedRoute component={<ChannelList />} />
+            </Suspense>
+          }
+        />
+        <Route
+          path="/channels/:channelId"
+          element={
+            <Suspense fallback={null}>
+              <ProtectedRoute component={<ChannelDetail />} />
+            </Suspense>
+          }
+        />
         {/* Fallback route */}
-        <Route path="*" element={<Navigate to="/login" replace />} />
+        {/* <Route path="*" element={<Navigate to="/login" replace />} /> */}
       </Routes>
     </BrowserRouter>
   );
diff --git a/src/routers/url-routes.ts b/src/routers/url-routes.ts
index 76e6660..533bc96 100644
--- a/src/routers/url-routes.ts
+++ b/src/routers/url-routes.ts
@@ -26,4 +26,4 @@ export default {
     path: 'dashboard',
     icon: faTh
   }
-};
\ No newline at end of file
+};