diff --git a/a2cps_cms/src/taccsite_custom/a2cps_cms/templates/fullwidth.html b/a2cps_cms/src/taccsite_custom/a2cps_cms/templates/fullwidth.html
index c0f92047..fcd9df54 100644
--- a/a2cps_cms/src/taccsite_custom/a2cps_cms/templates/fullwidth.html
+++ b/a2cps_cms/src/taccsite_custom/a2cps_cms/templates/fullwidth.html
@@ -5,4 +5,4 @@
   {{ block.super }}
 
   {% include "./assets_custom.html" %}
-{% endblock assets_custom %}
+{% endblock assets_custom %}
\ No newline at end of file
diff --git a/apcd-cms/Dockerfile b/apcd-cms/Dockerfile
index 4ac9a632..003ae508 100644
--- a/apcd-cms/Dockerfile
+++ b/apcd-cms/Dockerfile
@@ -13,4 +13,5 @@ RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
 RUN apt-get install -y nodejs
 
 RUN chmod u+x /code/client/build_client.sh && /code/client/build_client.sh
-RUN cp /code/client/dist/apcd-components.es.js /code/taccsite_custom/apcd_cms/static/
+RUN cp -R /code/client/dist/static/assets/. /code/taccsite_custom/apcd_cms/static/assets/
+RUN cp -R /code/client/dist/react-assets.html /code/taccsite_custom/apcd_cms/templates/react-asset.html
\ No newline at end of file
diff --git a/apcd-cms/docker-compose.dev.yml b/apcd-cms/docker-compose.dev.yml
index 677f9089..3cb36cef 100644
--- a/apcd-cms/docker-compose.dev.yml
+++ b/apcd-cms/docker-compose.dev.yml
@@ -15,7 +15,6 @@ services:
       - ./src/taccsite_cms/settings_custom.py:/code/taccsite_cms/settings_custom.py
       - ./src/taccsite_cms/settings_local.py:/code/taccsite_cms/settings_local.py
       - ./src/taccsite_cms/secrets.py:/code/taccsite_cms/secrets.py
-      - ${PWD}/src/client/dist/:/code/taccsite_custom/apcd_cms/static/
     networks:
       - core_cms_net
 
diff --git a/apcd-cms/src/apps/admin_regis_table/templates/list_registrations.html b/apcd-cms/src/apps/admin_regis_table/templates/list_registrations.html
index d7f272af..bf5efe49 100644
--- a/apcd-cms/src/apps/admin_regis_table/templates/list_registrations.html
+++ b/apcd-cms/src/apps/admin_regis_table/templates/list_registrations.html
@@ -1,19 +1,11 @@
-{% extends "standard.html" %}
+{% extends "apcd_cms/templates/standard.html" %}
+
 {% load static %}
 {% block content %}
-
 <link rel="stylesheet" href="{% static 'apcd-cms/css/table.css' %}">
 <link rel="stylesheet" href="{% static 'apcd-cms/css/modal.css' %}">
 <link rel="stylesheet" href="{% static 'admin_regis_table/css/table.css' %}">
 
-
-{% block extra_js %}
-<script type="module">
-import { setupAdminRegistrations } from "{% static 'apcd-components.es.js' %}";
-setupAdminRegistrations();
-</script>
-{% endblock %}
-
 <div class="container">
   {% include "nav_cms_breadcrumbs.html" %}
 
@@ -40,7 +32,7 @@ <h1>List Registrations</h1>
       {% endif %}
     </div>
   </div>
-  <div id="react-root"></div>
+  <div id="list-registrations-root"></div>
   {% include 'paginator.html' %}
 </div>
 <script>
@@ -49,9 +41,9 @@ <h1>List Registrations</h1>
     dropdown = document.getElementById("statusFilter");
     statusFilter =  dropdown.value;
     url_params = `?status=${statusFilter}`;
-    {% if selected_org %}
-      url_params += `&org={{selected_org}}`;
-    {% endif %}
+    // {% if selected_org %}
+    //   url_params += `&org={{selected_org}}`;
+    // {% endif %}
     url = `/administration/list-registration-requests/${url_params}`;
     xhr = new XMLHttpRequest();
     xhr.open('GET', url);
@@ -64,9 +56,9 @@ <h1>List Registrations</h1>
     input = document.getElementById("organizationFilter");
     orgFilter = input.value.replace("&", encodeURIComponent('&'));
     url_params = `?org=${orgFilter}`;
-    {% if selected_status %}
-      url_params = `?status={{selected_status}}&org=${orgFilter}`;
-    {% endif %}
+    // {% if selected_status %}
+    //   url_params = `?status={{selected_status}}&org=${orgFilter}`;
+    // {% endif %}
     url = `/administration/list-registration-requests/${url_params}`;
     xhr = new XMLHttpRequest();
     xhr.open('GET', url);
diff --git a/apcd-cms/src/apps/admin_submissions/templates/list_admin_submissions.html b/apcd-cms/src/apps/admin_submissions/templates/list_admin_submissions.html
index 9679a776..f1ffe915 100644
--- a/apcd-cms/src/apps/admin_submissions/templates/list_admin_submissions.html
+++ b/apcd-cms/src/apps/admin_submissions/templates/list_admin_submissions.html
@@ -1,4 +1,4 @@
-{% extends "standard.html" %}
+{% extends "apcd_cms/templates/standard.html" %}
 {% load static %}
 
 {% block content %}
@@ -10,13 +10,6 @@
 <link rel="stylesheet" href="{% static 'admin_submissions/css/admin_table.css' %}">
 <link rel="stylesheet" href="{% static 'admin_regis_table/css/table.css' %}">
 
-{% block extra_js %}
-  <script type="module">
-    import { setupAdminSubmissions } from "{% static 'apcd-components.es.js' %}";
-    setupAdminSubmissions();
-  </script>
-{% endblock %}
-
 <div class="container">
   {% include "nav_cms_breadcrumbs.html" %}
 
@@ -24,7 +17,7 @@ <h1>View Submissions</h1>
   <hr />
   <p style="margin-bottom: 30px">All completed submissions by organizations</p>
   <hr />
-  <div id="react-root"></div>
+  <div id="list-admin-submissions"></div>
   {% include 'paginator.html' %}
 </div>
 {% endblock %}
diff --git a/apcd-cms/src/apps/view_users/templates/view_users.html b/apcd-cms/src/apps/view_users/templates/view_users.html
index 63a5609b..96ebc2e8 100644
--- a/apcd-cms/src/apps/view_users/templates/view_users.html
+++ b/apcd-cms/src/apps/view_users/templates/view_users.html
@@ -1,4 +1,4 @@
-{% extends "standard.html" %}
+{% extends "apcd_cms/templates/standard.html" %}
 {% load static %}
 
 {% block content %}
@@ -9,9 +9,7 @@
 
 <div class="container">
   {% include "nav_cms_breadcrumbs.html" %}
-  <div id="react-root"></div>
+  <div id="view-users-root"></div>
 </div>
 
-<script src="{% static 'apcd-components.es.js' %}"></script> 
-
 {% endblock %}
\ No newline at end of file
diff --git a/apcd-cms/src/client/react-assets.html b/apcd-cms/src/client/react-assets.html
new file mode 100644
index 00000000..7a986e3d
--- /dev/null
+++ b/apcd-cms/src/client/react-assets.html
@@ -0,0 +1 @@
+<script type="module" src="/src/main.tsx"></script>
diff --git a/apcd-cms/src/client/src/components/library.tsx b/apcd-cms/src/client/src/components/library.tsx
deleted file mode 100644
index 6f890452..00000000
--- a/apcd-cms/src/client/src/components/library.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-// library.tsx
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { BrowserRouter } from 'react-router-dom';
-import { AdminRegistrations } from './Admin/Registrations';
-import { ViewUsers } from './Admin/ViewUsers';
-import { AdminSubmissions } from './Admin/Submissions';
-import { QueryClient, QueryClientProvider } from 'react-query';
-
-const queryClient = new QueryClient();
-
-function setupAdminRegistrations(): void {
-  const root = document.getElementById('admin-registrations-root');
-  if (root) {
-    ReactDOM.render(
-      <QueryClientProvider client={queryClient}>
-        <BrowserRouter>
-          <AdminRegistrations />
-        </BrowserRouter>
-      </QueryClientProvider>,
-      root
-    );
-  }
-}
-
-function setupViewUsers(): void {
-  const root = document.getElementById('react-root');
-  if (root) {
-    ReactDOM.render(
-      <QueryClientProvider client={queryClient}>
-        <BrowserRouter>
-          <ViewUsers />
-        </BrowserRouter>
-      </QueryClientProvider>,
-      root
-    );
-  }
-}
-
-function setupAdminSubmissions(): void {
-  ReactDOM.render(
-    <QueryClientProvider client={queryClient}>
-      <AdminSubmissions />
-    </QueryClientProvider>,
-    document.getElementById('react-root')
-  );
-}
-
-export { setupAdminRegistrations, setupAdminSubmissions, setupViewUsers };
diff --git a/apcd-cms/src/client/src/main.tsx b/apcd-cms/src/client/src/main.tsx
new file mode 100644
index 00000000..a62d94dc
--- /dev/null
+++ b/apcd-cms/src/client/src/main.tsx
@@ -0,0 +1,43 @@
+// library.tsx
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { BrowserRouter } from 'react-router-dom';
+import { AdminRegistrations } from './components/Admin/Registrations';
+import { ViewUsers } from './components/Admin/ViewUsers';
+import { AdminSubmissions } from './components/Admin/Submissions';
+import { QueryClient, QueryClientProvider } from 'react-query';
+
+const queryClient = new QueryClient();
+
+function setupComponent(rootId: string, Component: React.ComponentType): void {
+  const root = document.getElementById(rootId);
+  if (root) {
+    ReactDOM.render(
+      <QueryClientProvider client={queryClient}>
+        <BrowserRouter>
+          <Component />
+        </BrowserRouter>
+      </QueryClientProvider>,
+      root
+    );
+  }
+}
+
+// Mapping of element IDs to components
+const componentMap: { [key: string]: React.ComponentType } = {
+  'list-registrations-root': AdminRegistrations,
+  'view-users-root': ViewUsers,
+  'list-admin-submissions': AdminSubmissions,
+  // Add new components with html id in the list above.
+};
+
+function setupApp(): void {
+  Object.keys(componentMap).forEach(id => {
+    const elem = document.getElementById(id);
+    if (elem) {
+      setupComponent(id, componentMap[id]);
+    }
+  });
+}
+
+document.addEventListener('DOMContentLoaded', setupApp);
\ No newline at end of file
diff --git a/apcd-cms/src/client/tsconfig.json b/apcd-cms/src/client/tsconfig.json
index 2bbf5891..da2f1d74 100644
--- a/apcd-cms/src/client/tsconfig.json
+++ b/apcd-cms/src/client/tsconfig.json
@@ -37,5 +37,5 @@
     "src/**/*.spec.jsx",
     "src/**/*.test.jsx"
   ],
-  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx"]
+  "include": ["src/**/*.js", "src/**/*.jsx", "src/**/*.ts", "src/**/*.tsx", "main.tsx"]
 }
diff --git a/apcd-cms/src/client/vite.config.ts b/apcd-cms/src/client/vite.config.ts
index 3690b67a..f71ace9b 100644
--- a/apcd-cms/src/client/vite.config.ts
+++ b/apcd-cms/src/client/vite.config.ts
@@ -1,18 +1,23 @@
 import eslint from '@rollup/plugin-eslint';
 import { defineConfig, type PluginOption } from 'vite';
 import react from '@vitejs/plugin-react';
-import {resolve} from 'path';
+import path, {resolve} from 'path';
 
 
 export default defineConfig({
     css: { preprocessorOptions: { scss: { charset: false } } },
     build: {
       outDir: 'dist',
-      lib: {
-        entry: resolve(__dirname, 'src/components/library.tsx'),
-        name: 'APCDComponents',
-        fileName: 'apcd-components'
-    }
+      rollupOptions: {
+        input: {
+          imports: path.resolve(__dirname, 'react-assets.html'),
+        },
+        output: {
+          entryFileNames: 'static/assets/[name].[hash].js',
+          chunkFileNames: 'static/assets/[name].[hash].js',
+          assetFileNames: 'static/assets/[name].[hash].[ext]'
+        }
+      },
   },
     resolve: {
       alias: {
diff --git a/apcd-cms/src/taccsite_cms/custom_app_settings.py b/apcd-cms/src/taccsite_cms/custom_app_settings.py
index f27eab60..5ee9b090 100644
--- a/apcd-cms/src/taccsite_cms/custom_app_settings.py
+++ b/apcd-cms/src/taccsite_cms/custom_app_settings.py
@@ -1,4 +1,4 @@
 CUSTOM_APPS = ['apps.admin_regis_table', 'apps.apcd_login', 'apps.registrations', 'apps.submissions', 'apps.exception', 'apps.admin_submissions', 'apps.admin_extension', 'apps.admin_exception', 'apps.extension', 'apps.submitter_renewals_listing', 'apps.view_users', 'apps.components.paginator', 'apps.utils']
 CUSTOM_MIDDLEWARE = []
-STATICFILES_DIRS = ('taccsite_custom/apcd-cms', 'apps/admin_regis_table', 'apps/submissions', 'apps/exception', 'apps/extension', 'apps/submitter_renewals_listing', 'apps/view_users', 'apps/components/paginator', 'apps/utils', 'client/dist')
+STATICFILES_DIRS = ('taccsite_custom/apcd_cms', 'apps/admin_regis_table', 'apps/submissions', 'apps/exception', 'apps/extension', 'apps/submitter_renewals_listing', 'apps/view_users', 'apps/components/paginator', 'apps/utils', 'client/dist')
 
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/apcd-components.es.js b/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/apcd-components.es.js
deleted file mode 100755
index e69de29b..00000000
diff --git a/apcd-cms/src/taccsite_custom/apcd_cms/templates/standard.html b/apcd-cms/src/taccsite_custom/apcd_cms/templates/standard.html
new file mode 100644
index 00000000..910d7f15
--- /dev/null
+++ b/apcd-cms/src/taccsite_custom/apcd_cms/templates/standard.html
@@ -0,0 +1,23 @@
+
+{% extends "standard.html" %}
+{% load cms_tags %}
+
+{% block assets_custom %}
+  {{ block.super }}
+
+  {% include "./assets_custom.html" %}
+
+  {% if settings.DEBUG %}
+    <script type="module">
+        import RefreshRuntime from 'http://localhost:3000/@react-refresh';
+        RefreshRuntime.injectIntoGlobalHook(window);
+        window.$RefreshReg$ = () => {};
+        window.$RefreshSig$ = () => (type) => type;
+        window.__vite_plugin_react_preamble_installed__ = true;
+    </script>
+    <script type="module" src="http://localhost:3000/@vite/client"></script>
+    <script type="module" src="http://localhost:3000/src/main.tsx"></script>
+  {% else %}
+      {% include "./react-assets.html" %}
+  {% endif %}
+{% endblock assets_custom %}