diff --git a/app/blueprints/assessments/routes.py b/app/blueprints/assessments/routes.py
index 515b9a34..65e74e6b 100644
--- a/app/blueprints/assessments/routes.py
+++ b/app/blueprints/assessments/routes.py
@@ -59,9 +59,7 @@
 from app.blueprints.authentication.validation import (
     check_access_fund_short_name_round_sn,
 )
-from app.blueprints.authentication.validation import get_countries_from_roles
 from app.blueprints.authentication.validation import has_access_to_fund
-from app.blueprints.authentication.validation import has_devolved_authority_validation
 from app.blueprints.scoring.helpers import get_scoring_class
 from app.blueprints.services.aws import get_file_for_download_from_aws
 from app.blueprints.services.data_services import (
@@ -123,12 +121,7 @@
 from config.display_value_mappings import funding_types
 from config.display_value_mappings import joint_application_options
 from config.display_value_mappings import landing_filters
-from config.display_value_mappings import search_params_cof
-from config.display_value_mappings import search_params_cof_eoi
-from config.display_value_mappings import search_params_cyp
-from config.display_value_mappings import search_params_dpif
-from config.display_value_mappings import search_params_hsra
-from config.display_value_mappings import search_params_nstf
+from config.display_value_mappings import search_params_default
 
 assessment_bp = Blueprint(
     "assessment_bp",
@@ -220,20 +213,8 @@ def landing():
 )
 @check_access_fund_short_name_round_sn
 def fund_dashboard(fund_short_name: str, round_short_name: str):
-    if fund_short_name.upper() == "NSTF":
-        search_params = {**search_params_nstf}
-    elif fund_short_name.upper() == "COF":
-        search_params = {**search_params_cof}
-    elif fund_short_name.upper() == "CYP":
-        search_params = {**search_params_cyp}
-    elif fund_short_name.upper() == "DPIF":
-        search_params = {**search_params_dpif}
-    elif fund_short_name.upper() == "COF-EOI":
-        search_params = {**search_params_cof_eoi}
-    elif fund_short_name.upper() == "HSRA":
-        search_params = {**search_params_hsra}
-    else:
-        search_params = {**search_params_cof}
+
+    search_params = {**search_params_default}
 
     fund = get_fund(
         fund_short_name,
@@ -252,15 +233,6 @@ def fund_dashboard(fund_short_name: str, round_short_name: str):
         return redirect("/assess/assessor_tool_dashboard/")
     fund_id, round_id = fund.id, _round.id
 
-    countries = {"ALL"}
-    if has_devolved_authority_validation(fund_id=fund_id):
-        countries = get_countries_from_roles(fund.short_name)
-
-    search_params = {
-        **search_params,
-        "countries": ",".join(countries),
-    }
-
     # matches the query parameters provided in the search and filter form
     search_params, show_clear_filters = match_search_params(search_params, request.args)
 
@@ -271,7 +243,7 @@ def fund_dashboard(fund_short_name: str, round_short_name: str):
     )
 
     # The first call is to get the location data such as country, region and local_authority
-    # from all the existing applications (i.e withou search parameters as we don't want to filter
+    # from all the existing applications (i.e without search parameters as we don't want to filter
     # the stats at all).  see https://dluhcdigital.atlassian.net/browse/FS-3249
     future_all_applications_metadata = thread_executor.submit(
         get_application_overviews, fund_id, round_id, ""
@@ -306,7 +278,8 @@ def fund_dashboard(fund_short_name: str, round_short_name: str):
 
     # this is only used for querying applications, so remove it from the search params,
     # so it's not reflected on the user interface
-    del search_params["countries"]
+    if "countries" in search_params:
+        del search_params["countries"]
 
     round_details = {
         "assessment_deadline": _round.assessment_deadline,
@@ -400,6 +373,7 @@ def get_sorted_application_overviews(application_overviews, column, reverse=Fals
         local_authorities=all_application_locations._local_authorities,
         migration_banner_enabled=Config.MIGRATION_BANNER_ENABLED,
         dpi_filters=dpi_filters,
+        users=["All"],  # TODO: Add users api call
     )
 
 
diff --git a/app/blueprints/assessments/templates/assessor_dashboard.html b/app/blueprints/assessments/templates/assessor_dashboard.html
index c3075bf5..33f456e3 100644
--- a/app/blueprints/assessments/templates/assessor_dashboard.html
+++ b/app/blueprints/assessments/templates/assessor_dashboard.html
@@ -2,12 +2,8 @@
 {%- from 'govuk_frontend_jinja/components/inset-text/macro.html' import govukInsetText -%}
 {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
 {%- from 'govuk_frontend_jinja/components/back-link/macro.html' import govukBackLink -%}
-{% import "macros/application_overviews_table_cyp.html" as application_overviews_table_cyp -%}
-{% import "macros/application_overviews_table_nstf.html" as application_overviews_table_nstf -%}
-{% import "macros/application_overviews_table_cof.html" as application_overviews_table_cof -%}
-{% import "macros/application_overviews_table_cof_eoi.html" as application_overviews_table_cof_eoi -%}
-{% import "macros/application_overviews_table_dpif.html" as application_overviews_table_dpif -%}
-{% import "macros/application_overviews_table_hsra.html" as application_overviews_table_hsra -%}
+{%- from 'govuk_frontend_jinja/components/tabs/macro.html' import govukTabs -%}
+{% import "macros/application_overviews_table_all.html" as application_overviews_table -%}
 {% from "macros/banner_summary.html" import banner_summary %}
 {% from "macros/logout_partial.html" import logout_partial %}
 {% from "macros/migration_banner.html" import migration_banner %}
@@ -75,116 +71,79 @@ <h2 class="govuk-heading-l fsd-banner-content"> {% if is_active_status %}All act
 {% block content %}
 {# CLOSE THE GOVUK-WIDTH-CONTAINER AND OPEN A WIDER CONTAINER FOR THE TABLE VIEW #}
 
+
 <div class="govuk-grid-row">
     {% if migration_banner_enabled %}
     {{ migration_banner() }}
     {% endif %}
-    <section class="govuk-width-container govuk-grid-column-full">
-        {% if round_details.fund_short_name.upper() == 'CYP' %}
-        {{ application_overviews_table_cyp.render(
-        application_overviews,
-        round_details,
-        query_params,
-        cohort,
-        assessment_statuses,
-        countries,
-        regions,
-        local_authorities,
-        show_clear_filters,
-        sort_column,
-        sort_order,
-        tag_option_groups,
-        tags,
-        tagging_purpose_config
-        ) }}
-        {% elif round_details.fund_short_name.upper() == 'NSTF' %}
-        {{ application_overviews_table_nstf.render(
-        application_overviews,
-        round_details,
-        query_params,
-        funding_types,
-        assessment_statuses,
-        countries,
-        regions,
-        local_authorities,
-        show_clear_filters,
-        sort_column,
-        sort_order,
-        tag_option_groups,
-        tags,
-        tagging_purpose_config
-        ) }}
-        {% elif round_details.fund_short_name.upper() == "COF" %}
-        {{ application_overviews_table_cof.render(
+    <section id="application-overview" class="govuk-width-container govuk-grid-column-full">
+        {% set applicationsOverviewHtml %}
+        <header class="govuk-body ">
+                    <!--
+            TODO: Add later
+                <section class="govuk-phase-banner govuk-grid-row">
+                    <span id="empty-positioning-child" class="govuk-grid-column-two-thirds empty-positioning-child">&nbsp;</span>
+                    <span class="govuk-grid-column-one-third">
+                        <a href="." class="govuk-link govuk-!-margin-right-4">
+                            Edit table columns</a>
+                        <a href="." class="govuk-link">
+                            Assign assessments
+                        </a>
+                    </span>
+                </section>
+            -->
+            <h1 class="govuk-heading-l">All applications</h1>
+        </header>
+        {{ application_overviews_table.render(
         application_overviews,
         round_details,
         query_params,
         asset_types,
         assessment_statuses,
-        countries,
-        regions,
-        local_authorities,
-        show_clear_filters,
-        sort_column,
-        sort_order,
-        tag_option_groups,
-        tags,
-        tagging_purpose_config
-        ) }}
-        {% elif round_details.fund_short_name.upper() == "DPIF" %}
-        {{ application_overviews_table_dpif.render(
-        application_overviews,
-        round_details,
-        query_params,
-        asset_types,
-        assessment_statuses,
-        countries,
-        regions,
-        local_authorities,
         show_clear_filters,
         sort_column,
         sort_order,
         tag_option_groups,
         tags,
         tagging_purpose_config,
-        dpi_filters
+        users
         ) }}
-        {% elif round_details.fund_short_name.upper() == "COF-EOI" %}
-        {{ application_overviews_table_cof_eoi.render(
-        application_overviews,
-        round_details,
-        query_params,
-        asset_types,
-        assessment_statuses,
-        countries,
-        regions,
-        local_authorities,
-        show_clear_filters,
-        sort_column,
-        sort_order,
-        tag_option_groups,
-        tags,
-        tagging_purpose_config
-        ) }}
-         {% elif round_details.fund_short_name.upper() == "HSRA" %}
-        {{ application_overviews_table_hsra.render(
-        application_overviews,
-        round_details,
-        query_params,
-        asset_types,
-        assessment_statuses,
-        joint_application_options,
-        countries,
-        regions,
-        local_authorities,
-        show_clear_filters,
-        sort_column,
-        sort_order,
-        tag_option_groups,
-        tags,
-        tagging_purpose_config
-        ) }}
-        {% endif %}
+        {% endset -%}
+
+        {{ govukTabs({
+        "items": [
+        {
+        "label": "All applications",
+        "id": "all-applications",
+        "panel": {
+        "html": applicationsOverviewHtml
+        }
+        },
+        ]
+        }) }}
+        <!--
+        TODO: Add to tabs later
+        [{
+            "label": "Reporting to you",
+            "id": "reporting-to-you",
+            "panel": {
+            "html": "TBC"
+            }
+            },
+            {
+            "label": "Assigned to you",
+            "id": "past-week",
+            "panel": {
+            "html": "TBC"
+            }
+            },
+            {
+            "label": "Scoring",
+            "id": "scoring",
+            "panel": {
+            "html": "TBC"
+            }
+        }] -->
     </section>
 </div>
 {% endblock content %}
diff --git a/app/blueprints/assessments/templates/macros/application_overviews_table_all.html b/app/blueprints/assessments/templates/macros/application_overviews_table_all.html
new file mode 100644
index 00000000..4dba0954
--- /dev/null
+++ b/app/blueprints/assessments/templates/macros/application_overviews_table_all.html
@@ -0,0 +1,81 @@
+{% from "govuk_frontend_jinja/components/input/macro.html" import govukInput %}
+{% from "macros/sortable_table_header.html" import sortable_table_header %}
+{% from "macros/filter_options_all.html" import filter_options %}
+{% from "macros/application_status_column.html" import application_status_column %}
+{% from "macros/tags_table.html" import tags_table %}
+
+{% macro render(application_overviews, round_details, query_params, asset_types,
+assessment_statuses, show_clear_filters,
+sort_column, sort_order, tag_option_groups, tags, tagging_purpose_config, users) -%}
+<nav class="search-bar-flex-container">
+  <form method="get" class="govuk-!-width-full">
+    {{ filter_options(
+    query_params,
+    'Search reference or project name',
+    assessment_statuses,
+    round_details,
+    show_clear_filters,
+    tag_option_groups,
+    users
+    ) }}
+  </form>
+</nav>
+
+{% if not application_overviews %}
+<div role="status" aria-live="assertive" class="govuk-!-margin-top-4">
+  <p class="govuk-body" autofocus>
+    <strong>No matching results.</strong>
+  </p>
+  <p class="govuk-body">Improve your results by:</p>
+  <ul class="govuk-list govuk-list--bullet">
+    <li>removing filters</li>
+    <li>double-checking your spelling</li>
+  </ul>
+</div>
+{% else %}
+<table class="govuk-table govuk-!-margin-top-4" id="application_overviews_table">
+  <thead class="govuk-table__head">
+    <tr class="govuk-table__row">
+      <th scope="col" class="govuk-table__header">
+        Reference
+      </th>
+      {{ sortable_table_header('project_name', 'Project name', sort_order, sort_column, round_details, query_params) }}
+      {{ sortable_table_header('funding_requested', 'Funding requested', sort_order, sort_column, round_details,
+      query_params) }}
+      {{ sortable_table_header('asset_type', 'Asset type', sort_order, sort_column, round_details, query_params) }}
+      {{ sortable_table_header('location', 'Location', sort_order, sort_column, round_details, query_params) }}
+      {{ sortable_table_header('tags', 'Tags', sort_order, sort_column, round_details, query_params) }}
+      {% if g.access_controller.has_any_assessor_role %}
+      {{ sortable_table_header('status', 'Status', sort_order, sort_column, round_details, query_params) }}
+      {% endif %}
+      {{ sortable_table_header('assigned_to', 'Assigned to', sort_order, sort_column, round_details, query_params) }}
+      {{ sortable_table_header('last_action', 'Last action', sort_order, sort_column, round_details, query_params) }}
+      {{ sortable_table_header('time_since_last_action', 'Time since last action', sort_order, sort_column,
+      round_details, query_params) }}
+    </tr>
+  </thead>
+  <tbody class="govuk-table__body">
+    {% for overview in application_overviews %}
+    <tr class="govuk-table__row">
+
+      <td class="govuk-table__cell">{{ overview.short_id[-6:] }}</td>
+      <td class="govuk-table__cell"><a class="govuk-link" data-qa="project_name"
+          href="{{ url_for('assessment_bp.application',application_id=overview.application_id) }}">{{
+          overview.project_name }}</a></td>
+      <td class="govuk-table__cell">£{{ "{:,.2f}".format(overview.funding_amount_requested|int|round) }}</td>
+      <td class="govuk-table__cell">{{ asset_types[overview.asset_type] }}</td>
+      <td class="govuk-table__cell">{{ overview.location_json_blob.get('country') or "Not found" }}</td>
+      {{ tags_table(tags[overview.application_id], tagging_purpose_config, query_params.show_tags == "ON") }}
+      {% if g.access_controller.has_any_assessor_role %}
+      {{ application_status_column(overview.application_status, overview.get("progress", ""), assessment_statuses) }}
+      {% endif %}
+      <!-- TODO: requires 'assigned to' API -->
+      <td class="govuk-table__cell">-</td>
+      <td class="govuk-table__cell">-</td>
+      <td class="govuk-table__cell">-</td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+{% endif %}
+{%- endmacro %}
diff --git a/app/blueprints/assessments/templates/macros/application_overviews_table_cof.html b/app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_cof.html
similarity index 100%
rename from app/blueprints/assessments/templates/macros/application_overviews_table_cof.html
rename to app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_cof.html
diff --git a/app/blueprints/assessments/templates/macros/application_overviews_table_cof_eoi.html b/app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_cof_eoi.html
similarity index 100%
rename from app/blueprints/assessments/templates/macros/application_overviews_table_cof_eoi.html
rename to app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_cof_eoi.html
diff --git a/app/blueprints/assessments/templates/macros/application_overviews_table_cyp.html b/app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_cyp.html
similarity index 100%
rename from app/blueprints/assessments/templates/macros/application_overviews_table_cyp.html
rename to app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_cyp.html
diff --git a/app/blueprints/assessments/templates/macros/application_overviews_table_dpif.html b/app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_dpif.html
similarity index 100%
rename from app/blueprints/assessments/templates/macros/application_overviews_table_dpif.html
rename to app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_dpif.html
diff --git a/app/blueprints/assessments/templates/macros/application_overviews_table_hsra.html b/app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_hsra.html
similarity index 100%
rename from app/blueprints/assessments/templates/macros/application_overviews_table_hsra.html
rename to app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_hsra.html
diff --git a/app/blueprints/assessments/templates/macros/application_overviews_table_nstf.html b/app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_nstf.html
similarity index 100%
rename from app/blueprints/assessments/templates/macros/application_overviews_table_nstf.html
rename to app/blueprints/assessments/templates/macros/deprecated/application_overviews_table_nstf.html
diff --git a/app/blueprints/assessments/templates/macros/filter_options.html b/app/blueprints/assessments/templates/macros/deprecated/filter_options.html
similarity index 100%
rename from app/blueprints/assessments/templates/macros/filter_options.html
rename to app/blueprints/assessments/templates/macros/deprecated/filter_options.html
diff --git a/app/blueprints/assessments/templates/macros/filter_options_dpif.html b/app/blueprints/assessments/templates/macros/deprecated/filter_options_dpif.html
similarity index 100%
rename from app/blueprints/assessments/templates/macros/filter_options_dpif.html
rename to app/blueprints/assessments/templates/macros/deprecated/filter_options_dpif.html
diff --git a/app/blueprints/assessments/templates/macros/filter_options_eoi.html b/app/blueprints/assessments/templates/macros/deprecated/filter_options_eoi.html
similarity index 100%
rename from app/blueprints/assessments/templates/macros/filter_options_eoi.html
rename to app/blueprints/assessments/templates/macros/deprecated/filter_options_eoi.html
diff --git a/app/blueprints/assessments/templates/macros/filter_options_hsra.html b/app/blueprints/assessments/templates/macros/deprecated/filter_options_hsra.html
similarity index 100%
rename from app/blueprints/assessments/templates/macros/filter_options_hsra.html
rename to app/blueprints/assessments/templates/macros/deprecated/filter_options_hsra.html
diff --git a/app/blueprints/assessments/templates/macros/filter_options_all.html b/app/blueprints/assessments/templates/macros/filter_options_all.html
new file mode 100644
index 00000000..3d18204e
--- /dev/null
+++ b/app/blueprints/assessments/templates/macros/filter_options_all.html
@@ -0,0 +1,74 @@
+{% macro filter_options(query_params, search_label, assessment_statuses, round_details, show_clear_filters, tag_option_groups, users) %}
+
+<fieldset class="govuk-fieldset">
+    <div class="govuk-grid-row">
+        <div class="govuk-grid-column-full dluhc-column-auto">
+            <div class="govuk-form-group govuk-!-display-inline-block">
+                <div
+                    class="govuk-width-full govuk-!-display-none-print gem-c-search--on-white govuk-!-margin-bottom-0 govuk-!-margin-right-2">
+                    <label for="application_search" class="govuk-label govuk-!-margin-right-8">{{ search_label }}</label>
+                    <input class="govuk-input" type="text" spellcheck="false" aria-label="{{ search_label }}"
+                        id="application_search" name="search_term" , value="{{ query_params['search_term'] }}">
+                </div>
+            </div>
+            {% if g.access_controller.has_any_assessor_role %}
+            <div class="govuk-form-group govuk-!-display-inline-block govuk-!-margin-bottom-0 govuk-!-margin-right-2">
+                <label class="govuk-label" for="filter_status">
+                    Filter by status
+                </label>
+                <select class="govuk-select govuk-!-width-full" name="status" id="filter_status">
+                    {% for item in assessment_statuses %}
+                    <option value='{{ item }}' {% if query_params.status==item %} selected="" {% endif %}>{{
+                        assessment_statuses[item] }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+            {% endif %}
+            <div class="govuk-form-group govuk-!-display-inline-block govuk-!-margin-bottom-0 govuk-!-margin-right-2">
+                <label class="govuk-label" for="filter_assigned_to">
+                    Filter by assigned to
+                </label>
+                <select class="govuk-select govuk-!-width-one-quarter" id="filter_assigned_to" name="assigned_to">
+                    {% for user in users %}
+                        <option value='{{ user }}' {% if query_params.assigned_to==user %} selected="" {% endif %}>{{ user }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+            <div class="govuk-form-group govuk-!-display-inline-block govuk-!-margin-bottom-0 govuk-!-margin-right-2">
+                <label class="govuk-label" for="filter_by_tag">
+                    Filter by tag
+                </label>
+                <select class="govuk-select govuk-!-width-one-quarter" id="filter_by_tag" name="filter_by_tag">
+                    <option value="ALL">All</option>
+                    {% for option_group in tag_option_groups %}
+                    {% if option_group.options %}
+                    <optgroup label="{{ option_group.label }}">
+                        {% for option in option_group.options %}
+                        <option value="{{ option.value }}" {% if query_params.filter_by_tag==option.value %} selected=""
+                            {% endif %}>{{ option.text_content }}</option>
+                        {% endfor %}
+                    </optgroup>
+                    {% endif %}
+                    {% endfor %}
+                </select>
+            </div>
+            <div class="govuk-button-group govuk-!-display-inline-block">
+                <button class="govuk-button primary-button search-button govuk-!-margin-top-4 left-margin-negative"
+                    type="submit">
+                    Search
+                </button>
+                {% if show_clear_filters %}
+                <p>
+                    <a class="govuk-link govuk-link--no-visited-state" href="{{ url_for('assessment_bp.fund_dashboard',
+                                      fund_short_name=round_details.fund_short_name,
+                                      round_short_name=round_details.round_short_name,
+                                      clear_filters=true) }}" aria-label="Clear Filters">Clear search</a>
+                </p>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
+</fieldset>
+
+{% endmacro %}
diff --git a/app/static/src/js/init.js b/app/static/src/js/init.js
new file mode 100644
index 00000000..bf9bc25a
--- /dev/null
+++ b/app/static/src/js/init.js
@@ -0,0 +1,4 @@
+// init.js
+window.addEventListener('load', (event) => {
+    window.GOVUKFrontend.initAll();
+});
diff --git a/app/templates/base.html b/app/templates/base.html
index 2db3ee32..a2637131 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -29,14 +29,8 @@
 
 {% block bodyEnd %}
   <!--[if gt IE 8]><!-->
-    <script nonce="{{ csp_nonce() }}" src="{{ url_for('static', filename='govuk-frontend/govuk-frontend-4.7.0.min.js') }}"> </script>
-    <script nonce="{{ csp_nonce() }}">
-
-      window.addEventListener('load', (event) => {
-
-          window.GOVUKFrontend.initAll();
-      });
-    </script>
+    <script nonce="{{ csp_nonce() }}" src="{{ url_for('static', filename='govuk-frontend/govuk-frontend-4.7.0.min.js') }}"></script>
+    <script nonce="{{ csp_nonce() }}" src="{{ url_for('static', filename='js/main.min.js') }}"></script>
   <!--<![endif]-->
     <!-- Google Tag Manager (noscript) -->
     {# djlint:off #}
diff --git a/app/templates/cookie_policy.html b/app/templates/cookie_policy.html
index f0182af9..b7aa9b83 100644
--- a/app/templates/cookie_policy.html
+++ b/app/templates/cookie_policy.html
@@ -142,7 +142,6 @@ <h2 class="govuk-heading-m" id="essential-cookies">Analytics cookies (optional)<
 
   </div>
 </div>
-<script nonce="{{ csp_nonce() }}" type="text/javascript" src="{{ url_for('static', filename='js/fsd_cookies.js') }}"></script>
 <script nonce="{{ csp_nonce() }}">
 
    window.dataLayer = window.dataLayer || [];
diff --git a/config/display_value_mappings.py b/config/display_value_mappings.py
index f1098b8c..21331a24 100644
--- a/config/display_value_mappings.py
+++ b/config/display_value_mappings.py
@@ -45,6 +45,13 @@
     "afghan-citizens-resettlement-scheme": "Afghanistan",
 }
 
+search_params_default = {
+    "search_term": "",
+    "search_in": "project_name,short_id",
+    "asset_type": ALL_VALUE,
+    "status": ALL_VALUE,
+    "filter_by_tag": ALL_VALUE,
+}
 search_params_cof = {
     "search_term": "",
     "search_in": "project_name,short_id",
diff --git a/static_assets.py b/static_assets.py
index 6465de3d..7af2860d 100644
--- a/static_assets.py
+++ b/static_assets.py
@@ -24,8 +24,8 @@ def init_assets(app=None, auto_build=False, static_folder="app/static/dist"):
             "./js/namespaces.js",
             "./js/helpers.js",
             "./js/all.js",
-            "./js/fsd_cookies.js",
             "./js/components/*/*.js",
+            "./js/init.js",
             filters="jsmin",
             output="js/main.min.js",
         )
diff --git a/tests/conftest.py b/tests/conftest.py
index 8b63a1cc..bb8221ae 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -450,9 +450,6 @@ def mock_get_application_overviews(request, mocker):
             "asset_type": "ALL",
             "status": "ALL",
             "filter_by_tag": "ALL",
-            "country": "ALL",
-            "region": "ALL",
-            "local_authority": "ALL",
         }
         path = func_path
         fund_id = "test-fund"
diff --git a/tests/deprecated/dashboard_per_fund.py b/tests/deprecated/dashboard_per_fund.py
new file mode 100644
index 00000000..ab56de31
--- /dev/null
+++ b/tests/deprecated/dashboard_per_fund.py
@@ -0,0 +1,196 @@
+# @pytest.mark.mock_parameters(
+#     {
+#         "fund_short_name": "NSTF",
+#         "round_short_name": "TR",
+#         "expected_search_params": {
+#             "search_term": "",
+#             "search_in": "organisation_name,short_id",
+#             "funding_type": "ALL",
+#             "status": "ALL",
+#             "filter_by_tag": "ALL",
+#             "local_authority": "ALL",
+#             "country": "ALL",
+#             "region": "ALL",
+#         },
+#     }
+# )
+# @pytest.mark.application_id("resolved_app")
+# def test_route_fund_dashboard_NSTF(
+#     self,
+#     request,
+#     flask_test_client,
+#     mock_get_funds,
+#     mock_get_round,
+#     mock_get_fund,
+#     mock_get_application_overviews,
+#     mock_get_assessment_progress,
+#     mock_get_application_metadata,
+#     mock_get_active_tags_for_fund_round,
+#     mock_get_tag_types,
+# ):
+#     flask_test_client.set_cookie(
+#         "localhost",
+#         "fsd_user_token",
+#         create_valid_token(fund_specific_claim_map["NSTF"]["ASSESSOR"]),
+#     )
+
+#     params = request.node.get_closest_marker("mock_parameters").args[0]
+
+#     fund_short_name = params["fund_short_name"]
+#     round_short_name = params["round_short_name"]
+
+#     response = flask_test_client.get(
+#         f"/assess/assessor_dashboard/{fund_short_name}/{round_short_name}",
+#         follow_redirects=True,
+#     )
+#     assert 200 == response.status_code, "Wrong status code on response"
+#     soup = BeautifulSoup(response.data, "html.parser")
+
+#     all_table_headings = str(soup.find_all("th", class_="govuk-table__header"))
+#     expected_titles = [
+#         "Reference",
+#         "Organisation name",
+#         "Funding type",
+#         "Funding requested",
+#         "Status",
+#     ]
+#     assert all(title in all_table_headings for title in expected_titles)
+
+# @pytest.mark.mock_parameters(
+#     {
+#         "fund_short_name": "COF",
+#         "round_short_name": "TR",
+#         "expected_search_params": {
+#             "search_term": "",
+#             "search_in": "project_name,short_id",
+#             "asset_type": "ALL",
+#             "status": "ALL",
+#             "filter_by_tag": "ALL",
+#             "local_authority": "ALL",
+#             "country": "ALL",
+#             "region": "ALL",
+#         },
+#     }
+# )
+# @pytest.mark.application_id("resolved_app")
+# def test_route_fund_dashboard_COF(
+#     self,
+#     request,
+#     flask_test_client,
+#     mock_get_fund,
+#     mock_get_funds,
+#     mock_get_round,
+#     mock_get_application_overviews,
+#     mock_get_assessment_progress,
+#     mock_get_active_tags_for_fund_round,
+#     mock_get_tag_types,
+# ):
+#     flask_test_client.set_cookie(
+#         "localhost",
+#         "fsd_user_token",
+#         create_valid_token(fund_specific_claim_map["COF"]["ASSESSOR"]),
+#     )
+
+#     params = request.node.get_closest_marker("mock_parameters").args[0]
+
+#     fund_short_name = params["fund_short_name"]
+#     round_short_name = params["round_short_name"]
+
+#     response = flask_test_client.get(
+#         f"/assess/assessor_dashboard/{fund_short_name}/{round_short_name}",
+#         follow_redirects=True,
+#     )
+#     assert 200 == response.status_code, "Wrong status code on response"
+#     soup = BeautifulSoup(response.data, "html.parser")
+#     assert (
+#         soup.title.string == "Team dashboard – Assessment Hub – GOV.UK"
+#     ), "Response does not contain expected heading"
+
+#     all_table_headings = str(soup.find_all("th", class_="govuk-table__header"))
+#     expected_titles = [
+#         "Reference",
+#         "Project name",
+#         "Asset type",
+#         "Funding requested",
+#         "Location",
+#         "Status",
+#     ]
+#     assert all(title in all_table_headings for title in expected_titles)
+
+#     all_table_data_elements = str(soup.find_all("td", class_="govuk-table__cell"))
+#     project_titles = [
+#         "Project In prog and Res",
+#         "Project In prog and Stop",
+#         "Project Completed Flag and QA",
+#     ]
+#     assert all(title in all_table_data_elements for title in project_titles)
+
+# @pytest.mark.mock_parameters(
+#     {
+#         "fund_short_name": "DPIF",
+#         "round_short_name": "TR",
+#         "expected_search_params": {
+#             "search_term": "",
+#             "search_in": "organisation_name,short_id",
+#             "status": "ALL",
+#             "filter_by_tag": "ALL",
+#             "publish_datasets": "ALL",
+#             "datasets": "ALL",
+#             "team_in_place": "ALL",
+#         },
+#     }
+# )
+# @pytest.mark.application_id("resolved_app")
+# def test_route_fund_dashboard_DPIF(
+#     self,
+#     request,
+#     flask_test_client,
+#     mock_get_fund,
+#     mock_get_funds,
+#     mock_get_round,
+#     mock_get_application_overviews,
+#     mock_get_assessment_progress,
+#     mock_get_active_tags_for_fund_round,
+#     mock_get_tag_types,
+# ):
+#     flask_test_client.set_cookie(
+#         "localhost",
+#         "fsd_user_token",
+#         create_valid_token(fund_specific_claim_map["DPIF"]["ASSESSOR"]),
+#     )
+
+#     params = request.node.get_closest_marker("mock_parameters").args[0]
+
+#     fund_short_name = params["fund_short_name"]
+#     round_short_name = params["round_short_name"]
+
+#     response = flask_test_client.get(
+#         f"/assess/assessor_dashboard/{fund_short_name}/{round_short_name}",
+#         follow_redirects=True,
+#     )
+#     assert 200 == response.status_code, "Wrong status code on response"
+#     soup = BeautifulSoup(response.data, "html.parser")
+#     assert (
+#         soup.title.string == "Team dashboard – Assessment Hub – GOV.UK"
+#     ), "Response does not contain expected heading"
+
+#     all_table_headings = str(soup.find_all("th", class_="govuk-table__header"))
+#     expected_titles = [
+#         "Reference",
+#         "Organisation Name",
+#         "Lead Contact",
+#         "Team in place",
+#         "Dataset",
+#         "Publish datasets",
+#         "Tags",
+#         "Status",
+#     ]
+#     assert all(title in all_table_headings for title in expected_titles)
+
+#     all_table_data_elements = str(soup.find_all("td", class_="govuk-table__cell"))
+#     project_titles = [
+#         "FQAC",
+#         "FS",
+#         "INP",
+#     ]
+#     assert all(title in all_table_data_elements for title in project_titles)
diff --git a/tests/test_maintenance.py b/tests/test_maintenance.py
index a8855a64..573f46af 100644
--- a/tests/test_maintenance.py
+++ b/tests/test_maintenance.py
@@ -55,9 +55,6 @@ def test_route_landing_maintenance_mode_enabled(
             "asset_type": "ALL",
             "status": "ALL",
             "filter_by_tag": "ALL",
-            "local_authority": "ALL",
-            "country": "ALL",
-            "region": "ALL",
         },
     }
 )
diff --git a/tests/test_routes.py b/tests/test_routes.py
index 68260767..379e3adf 100644
--- a/tests/test_routes.py
+++ b/tests/test_routes.py
@@ -133,23 +133,12 @@ def test_route_landing_export_link_visibility(
         if not download_available and mock_is_lead_assessor:
             assert "Assessment Tracker Export" in all_exports_links[-1].text
 
-    @pytest.mark.mock_parameters(
-        {
-            "fund_short_name": "CYP",
-            "round_short_name": "TR",
-            "expected_search_params": {
-                "search_term": "",
-                "search_in": "organisation_name,short_id",
-                "cohort": "ALL",
-                "status": "ALL",
-                "filter_by_tag": "ALL",
-                "country": "ALL",
-                "region": "ALL",
-            },
-        }
+    @pytest.mark.parametrize(
+        "fund_short_name, round_short_name",
+        [("CYP", "TR"), ("NSTF", "TR"), ("COF", "TR"), ("DPIF", "TR")],
     )
     @pytest.mark.application_id("resolved_app")
-    def test_route_fund_dashboard_CYP(
+    def test_route_fund_dashboard(
         self,
         request,
         flask_test_client,
@@ -161,76 +150,16 @@ def test_route_fund_dashboard_CYP(
         mock_get_application_metadata,
         mock_get_active_tags_for_fund_round,
         mock_get_tag_types,
+        fund_short_name,
+        round_short_name,
     ):
-        flask_test_client.set_cookie(
-            "localhost",
-            "fsd_user_token",
-            create_valid_token(fund_specific_claim_map["CYP"]["ASSESSOR"]),
-        )
-
-        params = request.node.get_closest_marker("mock_parameters").args[0]
-
-        fund_short_name = params["fund_short_name"]
-        round_short_name = params["round_short_name"]
-
-        response = flask_test_client.get(
-            f"/assess/assessor_dashboard/{fund_short_name}/{round_short_name}",
-            follow_redirects=True,
-        )
-        assert 200 == response.status_code, "Wrong status code on response"
-        soup = BeautifulSoup(response.data, "html.parser")
-
-        all_table_headings = str(soup.find_all("th", class_="govuk-table__header"))
-        expected_titles = [
-            "Reference",
-            "Organisation name",
-            "Cohort",
-            "National or regional",
-            "Status",
-        ]
-        assert all(title in all_table_headings for title in expected_titles)
 
-    @pytest.mark.mock_parameters(
-        {
-            "fund_short_name": "NSTF",
-            "round_short_name": "TR",
-            "expected_search_params": {
-                "search_term": "",
-                "search_in": "organisation_name,short_id",
-                "funding_type": "ALL",
-                "status": "ALL",
-                "filter_by_tag": "ALL",
-                "local_authority": "ALL",
-                "country": "ALL",
-                "region": "ALL",
-            },
-        }
-    )
-    @pytest.mark.application_id("resolved_app")
-    def test_route_fund_dashboard_NSTF(
-        self,
-        request,
-        flask_test_client,
-        mock_get_funds,
-        mock_get_round,
-        mock_get_fund,
-        mock_get_application_overviews,
-        mock_get_assessment_progress,
-        mock_get_application_metadata,
-        mock_get_active_tags_for_fund_round,
-        mock_get_tag_types,
-    ):
         flask_test_client.set_cookie(
             "localhost",
             "fsd_user_token",
-            create_valid_token(fund_specific_claim_map["NSTF"]["ASSESSOR"]),
+            create_valid_token(fund_specific_claim_map[fund_short_name]["ASSESSOR"]),
         )
 
-        params = request.node.get_closest_marker("mock_parameters").args[0]
-
-        fund_short_name = params["fund_short_name"]
-        round_short_name = params["round_short_name"]
-
         response = flask_test_client.get(
             f"/assess/assessor_dashboard/{fund_short_name}/{round_short_name}",
             follow_redirects=True,
@@ -238,154 +167,54 @@ def test_route_fund_dashboard_NSTF(
         assert 200 == response.status_code, "Wrong status code on response"
         soup = BeautifulSoup(response.data, "html.parser")
 
-        all_table_headings = str(soup.find_all("th", class_="govuk-table__header"))
-        expected_titles = [
-            "Reference",
-            "Organisation name",
-            "Funding type",
-            "Funding requested",
-            "Status",
-        ]
-        assert all(title in all_table_headings for title in expected_titles)
-
-    @pytest.mark.mock_parameters(
-        {
-            "fund_short_name": "COF",
-            "round_short_name": "TR",
-            "expected_search_params": {
-                "search_term": "",
-                "search_in": "project_name,short_id",
-                "asset_type": "ALL",
-                "status": "ALL",
-                "filter_by_tag": "ALL",
-                "local_authority": "ALL",
-                "country": "ALL",
-                "region": "ALL",
-            },
-        }
-    )
-    @pytest.mark.application_id("resolved_app")
-    def test_route_fund_dashboard_COF(
-        self,
-        request,
-        flask_test_client,
-        mock_get_fund,
-        mock_get_funds,
-        mock_get_round,
-        mock_get_application_overviews,
-        mock_get_assessment_progress,
-        mock_get_active_tags_for_fund_round,
-        mock_get_tag_types,
-    ):
-        flask_test_client.set_cookie(
-            "localhost",
-            "fsd_user_token",
-            create_valid_token(fund_specific_claim_map["COF"]["ASSESSOR"]),
-        )
-
-        params = request.node.get_closest_marker("mock_parameters").args[0]
-
-        fund_short_name = params["fund_short_name"]
-        round_short_name = params["round_short_name"]
-
-        response = flask_test_client.get(
-            f"/assess/assessor_dashboard/{fund_short_name}/{round_short_name}",
-            follow_redirects=True,
-        )
-        assert 200 == response.status_code, "Wrong status code on response"
-        soup = BeautifulSoup(response.data, "html.parser")
-        assert (
-            soup.title.string == "Team dashboard – Assessment Hub – GOV.UK"
-        ), "Response does not contain expected heading"
-
         all_table_headings = str(soup.find_all("th", class_="govuk-table__header"))
         expected_titles = [
             "Reference",
             "Project name",
-            "Asset type",
             "Funding requested",
+            "Asset type",
             "Location",
             "Status",
+            "Assigned to",
+            "Last action",
+            "Time since last action",
         ]
         assert all(title in all_table_headings for title in expected_titles)
 
-        all_table_data_elements = str(soup.find_all("td", class_="govuk-table__cell"))
-        project_titles = [
-            "Project In prog and Res",
-            "Project In prog and Stop",
+        # Find the first row in the table body
+        first_row = soup.find("tbody").find("tr")
+        # Iterate through each cell in the first row
+        # Define the array of expected answers
+        expected_answers = [
+            "FQAC",
             "Project Completed Flag and QA",
+            "£7,000.00",
+            "Gallery",
+            "England",
+            "1 tag\n                            \n\n\n\n\n                                Tag one red",
+            "Flagged",
+            "-",
+            "-",
+            "-",
         ]
-        assert all(title in all_table_data_elements for title in project_titles)
-
-    @pytest.mark.mock_parameters(
-        {
-            "fund_short_name": "DPIF",
-            "round_short_name": "TR",
-            "expected_search_params": {
-                "search_term": "",
-                "search_in": "organisation_name,short_id",
-                "status": "ALL",
-                "filter_by_tag": "ALL",
-                "publish_datasets": "ALL",
-                "datasets": "ALL",
-                "team_in_place": "ALL",
-            },
-        }
-    )
-    @pytest.mark.application_id("resolved_app")
-    def test_route_fund_dashboard_DPIF(
-        self,
-        request,
-        flask_test_client,
-        mock_get_fund,
-        mock_get_funds,
-        mock_get_round,
-        mock_get_application_overviews,
-        mock_get_assessment_progress,
-        mock_get_active_tags_for_fund_round,
-        mock_get_tag_types,
-    ):
-        flask_test_client.set_cookie(
-            "localhost",
-            "fsd_user_token",
-            create_valid_token(fund_specific_claim_map["DPIF"]["ASSESSOR"]),
-        )
-
-        params = request.node.get_closest_marker("mock_parameters").args[0]
-
-        fund_short_name = params["fund_short_name"]
-        round_short_name = params["round_short_name"]
-
-        response = flask_test_client.get(
-            f"/assess/assessor_dashboard/{fund_short_name}/{round_short_name}",
-            follow_redirects=True,
-        )
-        assert 200 == response.status_code, "Wrong status code on response"
-        soup = BeautifulSoup(response.data, "html.parser")
-        assert (
-            soup.title.string == "Team dashboard – Assessment Hub – GOV.UK"
-        ), "Response does not contain expected heading"
-
-        all_table_headings = str(soup.find_all("th", class_="govuk-table__header"))
-        expected_titles = [
-            "Reference",
-            "Organisation Name",
-            "Lead Contact",
-            "Team in place",
-            "Dataset",
-            "Publish datasets",
-            "Tags",
-            "Status",
-        ]
-        assert all(title in all_table_headings for title in expected_titles)
-
-        all_table_data_elements = str(soup.find_all("td", class_="govuk-table__cell"))
-        project_titles = [
-            "FQAC",
-            "FS",
-            "INP",
+        # Check each cell against the expected answers
+        for i, cell in enumerate(first_row.find_all("td")):
+            expected_answer = expected_answers[i]
+            actual_answer = (
+                cell.text.strip()
+            )  # Get the text content of the cell, stripping any whitespace
+            assert (
+                actual_answer == expected_answer
+            ), f"Cell {i+1} does not match! Expected: {expected_answer}, Actual: {actual_answer}"
+
+        all_filter_labels = str(soup.find_all("label", class_="govuk-label"))
+        expected_filter_labels = [
+            "Search reference or project name",
+            "Filter by status",
+            "Filter by assigned to",
+            "Filter by tag",
         ]
-        assert all(title in all_table_data_elements for title in project_titles)
+        assert all(label in all_filter_labels for label in expected_filter_labels)
 
     @pytest.mark.mock_parameters(
         {
@@ -397,9 +226,6 @@ def test_route_fund_dashboard_DPIF(
                 "asset_type": "ALL",
                 "status": "QA_COMPLETE",
                 "filter_by_tag": "ALL",
-                "local_authority": "ALL",
-                "country": "ALL",
-                "region": "ALL",
             },
         }
     )
@@ -441,9 +267,6 @@ def test_route_fund_dashboard_filter_status(
                 "asset_type": "pub",
                 "status": "ALL",
                 "filter_by_tag": "ALL",
-                "local_authority": "ALL",
-                "country": "ALL",
-                "region": "ALL",
             },
         }
     )
@@ -485,9 +308,6 @@ def test_route_fund_dashboard_filter_asset_type(
                 "asset_type": "ALL",
                 "status": "ALL",
                 "filter_by_tag": "ALL",
-                "local_authority": "ALL",
-                "country": "ALL",
-                "region": "ALL",
             },
         }
     )
@@ -530,9 +350,6 @@ def test_route_fund_dashboard_search_term(
                 "asset_type": "ALL",
                 "status": "ALL",
                 "filter_by_tag": "ALL",
-                "local_authority": "ALL",
-                "country": "ALL",
-                "region": "ALL",
             },
         }
     )
@@ -579,9 +396,6 @@ def test_route_fund_dashboard_clear_filters(
                 "asset_type": "ALL",
                 "status": "ALL",
                 "filter_by_tag": "ALL",
-                "local_authority": "ALL",
-                "country": "ALL",
-                "region": "ALL",
             },
         }
     )
@@ -1165,9 +979,6 @@ def test_qa_completed_flagged_application(
                 "asset_type": "ALL",
                 "status": "ALL",
                 "filter_by_tag": "ALL",
-                "local_authority": "ALL",
-                "country": "ALL",
-                "region": "ALL",
             },
         }
     )