diff --git a/.github/workflows/copilot_deploy.yml b/.github/workflows/copilot_deploy.yml
index 3d190280..4e671fd4 100644
--- a/.github/workflows/copilot_deploy.yml
+++ b/.github/workflows/copilot_deploy.yml
@@ -23,16 +23,15 @@ on:
         type: boolean
         description: Run e2e tests
   push:
-    paths: # Ignore README markdown and only deploy when something in the copilot folder has changed
-      - 'copilot/**'
+    paths:
       - '!**/README.md'
+      - 'app/**'
+      - 'tests/**'
       - 'requirements-dev.in'
       - 'requirements-dev.txt'
       - 'requirements.in'
       - 'requirements.txt'
-  pull_request:
-    types:
-      - closed # Further protection - only allow this workflow to run automatically on closed pull requests
+      - '.github/workflows/copilot_deploy.yml'
 
 jobs:
   tag_version:
@@ -44,43 +43,46 @@ jobs:
         run: |
           echo "tag_value=$(echo '${{ github.ref }}' | sed -e 's,.*/\(.*\),\1,')" >> $GITHUB_OUTPUT
 
+  pre_deploy_tests:
+    uses: communitiesuk/funding-service-design-workflows/.github/workflows/pre-deploy.yml@main
+    with:
+      assets_required: true
+      postgres_unit_testing: false
+
   paketo_build:
     needs: [ tag_version ]
+    concurrency: build-assessment-pack
     permissions:
       packages: write
     uses: communitiesuk/funding-service-design-workflows/.github/workflows/package.yml@main
     with:
-      version_to_build: $(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+      version_to_build: ${{ needs.tag_version.outputs.version_to_tag }}
       owner: ${{ github.repository_owner }}
       application: funding-service-design-assessment
       assets_required: true
 
-  pre_deploy_tests:
-    secrets:
-      E2E_PAT: ${{secrets.E2E_PAT}}
-    uses: communitiesuk/funding-design-service-workflows/.github/workflows/pre-deploy.yml@main
-    with:
-      assets_required: true
-      postgres_unit_testing: false
-
   copilot_environments_workflow_setup:
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.copilot_env_matrix.outputs.env_list }}
+      pre_matrix: ${{ steps.copilot_env_matrix.outputs.pre_deploy_list }}
+      post_matrix: ${{ steps.copilot_env_matrix.outputs.post_deploy_list }}
     steps:
       - id: copilot_env_matrix
         run: |
-          if [ "${{ inputs.environment }}" != '' ]; then
+          if [ "${{ inputs.environment }}" != "" ]; then
             echo "env_list=[\"${{ inputs.environment }}\"]" >> $GITHUB_OUTPUT
           elif [ "${{ github.ref }}" == 'refs/heads/main' ]; then
-            echo "env_list=[\"dev\", \"test\", \"uat\", \"production\"]" >> $GITHUB_OUTPUT
+            echo "pre_deploy_list=[\"dev\", \"test\"]" >> $GITHUB_OUTPUT
+            echo "post_deploy_list=[\"uat\", \"production\"]" >> $GITHUB_OUTPUT
           else
-            echo "env_list=[\"dev\", \"test\"]" >> $GITHUB_OUTPUT
+            echo "pre_deploy_list=[\"dev\", \"test\"]" >> $GITHUB_OUTPUT
           fi
 
-  copilot_env_deploy:
+  individual_deploy:
+    if: inputs.environment != ''
     concurrency:
-      group: '${{ github.workflow }} @ ${{ github.ref }}'
+      group: 'fsd-preaward-copilot-individual-${{ matrix.value }}'
       cancel-in-progress: false
     permissions:
       id-token: write # This is required for requesting the JWT
@@ -107,7 +109,7 @@ jobs:
       uses: aws-actions/configure-aws-credentials@v4
       with:
         role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT }}:role/GithubCopilotDeploy
-        role-session-name: NOTIFICATION_${{ matrix.value }}_COPILOT_${{ steps.currentdatetime.outputs.datetime }}
+        role-session-name: ASSESSMENT_${{ matrix.value }}_COPILOT_${{ steps.currentdatetime.outputs.datetime }}
         aws-region: eu-west-2
 
     - name: Install AWS Copilot CLI
@@ -115,27 +117,280 @@ jobs:
       run: |
         curl -Lo aws-copilot https://github.com/aws/copilot-cli/releases/latest/download/copilot-linux && chmod +x aws-copilot && sudo mv aws-copilot /usr/local/bin/copilot
 
+    - name: confirm copilot env
+      shell: bash
+      run: |
+        if [ $(copilot env ls) != "${{ matrix.value }}" ]; then
+          echo $(copilot env ls)
+          exit 1
+        fi
+
     - name: Inject Git SHA into manifest
       run: |
         yq -i '.variables.GITHUB_SHA = "${{ github.sha }}"'  copilot/fsd-assessment/manifest.yml
 
     - name: Inject replacement image into manifest
       run: |
-        yq -i '.image.location = "ghcr.io/communitiesuk/funding-service-design-assessment:${{ github.ref_name == 'main' && 'latest' || github.ref_name }}"'  copilot/fsd-assessment/manifest.yml
+        yq -i '.image.location = "ghcr.io/communitiesuk/funding-service-design-assessment:${{ github.ref_name == 'main' && 'latest' || needs.tag_version.outputs.version_to_tag }}"'  copilot/fsd-assessment/manifest.yml
 
     - name: Copilot ${{ matrix.value }} deploy
       id: deploy_build
       run: |
         copilot svc deploy --env ${{ matrix.value }} --app pre-award
 
-  post_deploy_tests:
-    needs: copilot_env_deploy
-    if: inputs.environment == 'test' || inputs.environment == 'dev' || inputs.environment == ''
+  dev_deploy:
+    if: ${{ needs.copilot_environments_workflow_setup.outputs.pre_matrix != '' && toJson(fromJson(needs.copilot_environments_workflow_setup.outputs.pre_matrix)) != '[]' }}
+    concurrency:
+      group: 'fsd-preaward-copilot-dev'
+      cancel-in-progress: false
+    permissions:
+      id-token: write # This is required for requesting the JWT
+      contents: read  # This is required for actions/checkout
+    needs: [ tag_version, pre_deploy_tests, paketo_build, copilot_environments_workflow_setup ]
+    runs-on: ubuntu-latest
+    environment: dev
+    steps:
+    - name: Git clone the repository
+      uses: actions/checkout@v4
+
+    - name: Get current date
+      shell: bash
+      id: currentdatetime
+      run: echo "datetime=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
+
+    - name: configure aws credentials
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT }}:role/GithubCopilotDeploy
+        role-session-name: ASSESSMENT_DEV_COPILOT_${{ steps.currentdatetime.outputs.datetime }}
+        aws-region: eu-west-2
+
+    - name: Install AWS Copilot CLI
+      shell: bash
+      run: |
+        curl -Lo aws-copilot https://github.com/aws/copilot-cli/releases/latest/download/copilot-linux && chmod +x aws-copilot && sudo mv aws-copilot /usr/local/bin/copilot
+
+    - name: confirm copilot env
+      shell: bash
+      run: |
+        if [ $(copilot env ls) != "dev" ]; then
+          echo $(copilot env ls)
+          exit 1
+        fi
+
+    - name: Inject Git SHA into manifest
+      run: |
+        yq -i '.variables.GITHUB_SHA = "${{ github.sha }}"'  copilot/fsd-assessment/manifest.yml
+
+    - name: Inject replacement image into manifest
+      run: |
+        yq -i '.image.location = "ghcr.io/communitiesuk/funding-service-design-assessment:${{ github.ref_name == 'main' && 'latest' || needs.tag_version.outputs.version_to_tag }}"'  copilot/fsd-assessment/manifest.yml
+
+    - name: Copilot dev deploy
+      id: deploy_build
+      run: |
+        copilot svc deploy --env dev --app pre-award
+
+  post_dev_deploy_tests:
+    needs: dev_deploy
+    concurrency:
+      group: 'fsd-preaward-test-dev'
+      cancel-in-progress: false
     secrets:
-      E2E_PAT: ${{secrets.E2E_PAT}}
+      FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}
+      FSD_GH_APP_KEY: ${{ secrets.FSD_GH_APP_KEY }}
+    uses: communitiesuk/funding-service-design-workflows/.github/workflows/post-deploy.yml@main
+    with:
+      run_performance_tests: ${{ inputs.run_performance_tests || true }}
+      run_e2e_tests: ${{ inputs.run_e2e_tests || false }}
+      app_name: assessment
+      environment: dev
+
+  test_deploy:
+    if: ${{ needs.copilot_environments_workflow_setup.outputs.pre_matrix != '' && toJson(fromJson(needs.copilot_environments_workflow_setup.outputs.pre_matrix)) != '[]' }}
+    concurrency:
+      group: 'fsd-preaward-copilot-test'
+      cancel-in-progress: false
+    permissions:
+      id-token: write # This is required for requesting the JWT
+      contents: read  # This is required for actions/checkout
+    needs: [ tag_version, post_dev_deploy_tests, paketo_build, copilot_environments_workflow_setup ]
+    runs-on: ubuntu-latest
+    environment: test
+    steps:
+    - name: Git clone the repository
+      uses: actions/checkout@v4
+
+    - name: Get current date
+      shell: bash
+      id: currentdatetime
+      run: echo "datetime=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
+
+    - name: configure aws credentials
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT }}:role/GithubCopilotDeploy
+        role-session-name: ASSESSMENT_TEST_COPILOT_${{ steps.currentdatetime.outputs.datetime }}
+        aws-region: eu-west-2
+
+    - name: Install AWS Copilot CLI
+      shell: bash
+      run: |
+        curl -Lo aws-copilot https://github.com/aws/copilot-cli/releases/latest/download/copilot-linux && chmod +x aws-copilot && sudo mv aws-copilot /usr/local/bin/copilot
+
+    - name: confirm copilot env
+      shell: bash
+      run: |
+        if [ $(copilot env ls) != "test" ]; then
+          echo $(copilot env ls)
+          exit 1
+        fi
+
+    - name: Inject Git SHA into manifest
+      run: |
+        yq -i '.variables.GITHUB_SHA = "${{ github.sha }}"'  copilot/fsd-assessment/manifest.yml
+
+    - name: Inject replacement image into manifest
+      run: |
+        yq -i '.image.location = "ghcr.io/communitiesuk/funding-service-design-assessment:${{ github.ref_name == 'main' && 'latest' || needs.tag_version.outputs.version_to_tag }}"'  copilot/fsd-assessment/manifest.yml
+
+    - name: Copilot test deploy
+      id: deploy_build
+      run: |
+        copilot svc deploy --env test --app pre-award
+
+  post_test_deploy_tests:
+    needs: test_deploy
+    concurrency:
+      group: 'fsd-preaward-test-test'
+      cancel-in-progress: false
+    secrets:
+      FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}
+      FSD_GH_APP_KEY: ${{ secrets.FSD_GH_APP_KEY }}
+    uses: communitiesuk/funding-service-design-workflows/.github/workflows/post-deploy.yml@main
+    with:
+      run_performance_tests: ${{ inputs.run_performance_tests || false }}
+      run_e2e_tests: ${{ inputs.run_e2e_tests || true }}
+      app_name: assessment
+      environment: test
+
+  uat_deploy:
+    if: ${{ needs.copilot_environments_workflow_setup.outputs.post_matrix != '' && toJson(fromJson(needs.copilot_environments_workflow_setup.outputs.post_matrix)) != '[]' }}
+    concurrency:
+      group: 'fsd-preaward-copilot-uat'
+      cancel-in-progress: false
+    permissions:
+      id-token: write # This is required for requesting the JWT
+      contents: read  # This is required for actions/checkout
+    needs: [ tag_version, post_test_deploy_tests, paketo_build, copilot_environments_workflow_setup ]
+    runs-on: ubuntu-latest
+    environment: uat
+    steps:
+    - name: Git clone the repository
+      uses: actions/checkout@v4
+
+    - name: Get current date
+      shell: bash
+      id: currentdatetime
+      run: echo "datetime=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
+
+    - name: configure aws credentials
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT }}:role/GithubCopilotDeploy
+        role-session-name: ASSESSMENT_UAT_COPILOT_${{ steps.currentdatetime.outputs.datetime }}
+        aws-region: eu-west-2
+
+    - name: Install AWS Copilot CLI
+      shell: bash
+      run: |
+        curl -Lo aws-copilot https://github.com/aws/copilot-cli/releases/latest/download/copilot-linux && chmod +x aws-copilot && sudo mv aws-copilot /usr/local/bin/copilot
+
+    - name: confirm copilot env
+      shell: bash
+      run: |
+        if [ $(copilot env ls) != "uat" ]; then
+          echo $(copilot env ls)
+          exit 1
+        fi
+
+    - name: Inject Git SHA into manifest
+      run: |
+        yq -i '.variables.GITHUB_SHA = "${{ github.sha }}"'  copilot/fsd-assessment/manifest.yml
+
+    - name: Inject replacement image into manifest
+      run: |
+        yq -i '.image.location = "ghcr.io/communitiesuk/funding-service-design-assessment:${{ github.ref_name == 'main' && 'latest' || needs.tag_version.outputs.version_to_tag }}"'  copilot/fsd-assessment/manifest.yml
+
+    - name: Copilot uat deploy
+      id: deploy_build
+      run: |
+        copilot svc deploy --env uat --app pre-award
+
+  post_uat_deploy_tests:
+    needs: uat_deploy
+    concurrency:
+      group: 'fsd-preaward-test-uat'
+      cancel-in-progress: false
+    secrets:
+      FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}
+      FSD_GH_APP_KEY: ${{ secrets.FSD_GH_APP_KEY }}
     uses: communitiesuk/funding-service-design-workflows/.github/workflows/post-deploy.yml@main
     with:
       run_performance_tests: ${{ inputs.run_performance_tests || false }}
       run_e2e_tests: ${{ inputs.run_e2e_tests || true }}
       app_name: assessment
-      environment: ${{ inputs.environment == '' && 'test' || inputs.environment }}
+      environment: uat
+
+  production_deploy:
+    if: ${{ needs.copilot_environments_workflow_setup.outputs.post_matrix != '' && toJson(fromJson(needs.copilot_environments_workflow_setup.outputs.post_matrix)) != '[]' }}
+    concurrency:
+      group: 'fsd-preaward-copilot-production'
+      cancel-in-progress: false
+    permissions:
+      id-token: write # This is required for requesting the JWT
+      contents: read  # This is required for actions/checkout
+    needs: [ tag_version, post_uat_deploy_tests, paketo_build, copilot_environments_workflow_setup ]
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+    - name: Git clone the repository
+      uses: actions/checkout@v4
+
+    - name: Get current date
+      shell: bash
+      id: currentdatetime
+      run: echo "datetime=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_OUTPUT
+
+    - name: configure aws credentials
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT }}:role/GithubCopilotDeploy
+        role-session-name: ASSESSMENT_PRODUCTION_COPILOT_${{ steps.currentdatetime.outputs.datetime }}
+        aws-region: eu-west-2
+
+    - name: Install AWS Copilot CLI
+      shell: bash
+      run: |
+        curl -Lo aws-copilot https://github.com/aws/copilot-cli/releases/latest/download/copilot-linux && chmod +x aws-copilot && sudo mv aws-copilot /usr/local/bin/copilot
+
+    - name: confirm copilot env
+      shell: bash
+      run: |
+        if [ $(copilot env ls) != "production" ]; then
+          echo $(copilot env ls)
+          exit 1
+        fi
+
+    - name: Inject Git SHA into manifest
+      run: |
+        yq -i '.variables.GITHUB_SHA = "${{ github.sha }}"'  copilot/fsd-assessment/manifest.yml
+
+    - name: Inject replacement image into manifest
+      run: |
+        yq -i '.image.location = "ghcr.io/communitiesuk/funding-service-design-assessment:${{ github.ref_name == 'main' && 'latest' || needs.tag_version.outputs.version_to_tag }}"'  copilot/fsd-assessment/manifest.yml
+
+    - name: Copilot production deploy
+      id: deploy_build
+      run: |
+        copilot svc deploy --env production --app pre-award
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e8cfe0b9..0e23999d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -22,5 +22,6 @@ jobs:
       CF_SPACE: ${{secrets.CF_SPACE}}
       CF_USER: ${{secrets.CF_USERNAME}}
       CF_PASSWORD: ${{secrets.CF_PASSWORD}}
-      E2E_PAT: ${{secrets.E2E_PAT}}
       RSA256_PUBLIC_KEY_BASE64: ${{secrets.RSA256_PUBLIC_KEY_BASE64}}
+      FSD_GH_APP_ID: ${{ secrets.FSD_GH_APP_ID }}
+      FSD_GH_APP_KEY: ${{ secrets.FSD_GH_APP_KEY }}
diff --git a/app/blueprints/assessments/activity_trail.py b/app/blueprints/assessments/activity_trail.py
new file mode 100644
index 00000000..09bc81f3
--- /dev/null
+++ b/app/blueprints/assessments/activity_trail.py
@@ -0,0 +1,290 @@
+import inspect
+from dataclasses import asdict
+from dataclasses import dataclass
+from dataclasses import field
+from datetime import datetime
+
+from app.blueprints.services.data_services import get_bulk_accounts_dict
+from app.blueprints.services.models.assessor_task_list import AssessorTaskList
+from app.blueprints.services.models.flag import FlagType
+from app.blueprints.tagging.models.tag import AssociatedTag
+from flask import current_app
+from flask_wtf import FlaskForm
+from wtforms import BooleanField
+from wtforms import StringField
+
+
+@dataclass
+class BaseModel:
+    @classmethod
+    def from_list(cls, data_list: list[dict]):
+        return [
+            cls(
+                **{
+                    k: v
+                    for k, v in d.items()
+                    if k in inspect.signature(cls).parameters
+                    and k != "date_created"
+                },
+                date_created=cls._format_date(d.get("date_created")),
+            )
+            for d in data_list
+        ]
+
+    @staticmethod
+    def _format_date(date_str):
+        if date_str:
+            return datetime.fromisoformat(date_str).strftime(
+                "%Y-%m-%d %H:%M:%S"
+            )
+        return date_str
+
+
+@dataclass
+class AssociatedTags(AssociatedTag):
+    full_name: str = ""
+    email_address: str = ""
+    highest_role: str = ""
+    email_address: str = ""
+    date_created: str = field(default="", metadata={"name": "created_at"})
+
+    @classmethod
+    def from_associated_tags_list(cls, associated_tags_list):
+        """Change the  attribute 'created_at' to 'date_created'"""
+        return [
+            cls(**asdict(tag), date_created=tag.created_at)
+            for tag in associated_tags_list
+        ]
+
+
+@dataclass
+class Flags(BaseModel):
+    allocation: str
+    date_created: str
+    id: str
+    justification: str
+    status: FlagType
+    user_id: str
+    sections_to_flag: list = ""
+    full_name: str = ""
+    email_address: str = ""
+    highest_role: str = ""
+
+    @classmethod
+    def process_flags(cls, flags_list) -> list[dict]:
+        """
+        Retrive all flags from updates & add sections_to_flag to RAISED flag.
+
+        Args: flags_list (list): A list of flags.
+
+        Returns:
+            list[dict]: A list of dictionaries containing flags with additional attribute.
+        """
+        result = []
+
+        for flag in flags_list:
+            for update in flag.updates:
+                if update.get("status").name == "RAISED":
+                    sections_to_flag = flag.sections_to_flag
+
+                    updated_update = {
+                        **update,
+                        "sections_to_flag": sections_to_flag,
+                    }
+                    result.append(updated_update)
+                else:
+                    result.append(update)
+        return result
+
+    @classmethod
+    def from_list(cls, flags_list: list[dict]):
+        if flags_list:
+            flags = cls.process_flags(flags_list)
+            return super().from_list(flags)
+        else:
+            return []
+
+
+@dataclass
+class Comments(BaseModel):
+    id: str
+    comment: str
+    comment_type: str
+    date_created: str
+    sub_criteria_id: str
+    theme_id: str
+    user_id: str
+    full_name: str = ""
+    highest_role: str = ""
+    email_address: str = ""
+
+    @classmethod
+    def process_comments(cls, comments_list: list) -> list[dict]:
+        """
+        Retrieve all comments from updates and add the following attributes to each comment:
+        - "user_id"
+        - "sub_criteria_id"
+        - "theme_id"
+        - "comment_type"
+        - "full_name"
+        - "email_address"
+        - "highest_role"
+
+        Args: comments_list (list): A list of comments.
+
+        Returns:
+            list[dict]: A list of dictionaries containing comments with additional attributes.
+        """
+        result = []
+
+        for comment in comments_list:
+            for update in comment.get("updates"):
+                updated_update = {
+                    **update,
+                    "user_id": comment.get("user_id"),
+                    "sub_criteria_id": comment.get("sub_criteria_id"),
+                    "theme_id": comment.get("theme_id"),
+                    "comment_type": comment.get("comment_type"),
+                    "full_name": comment.get("full_name"),
+                    "email_address": comment.get("email_address"),
+                    "highest_role": comment.get("highest_role"),
+                }
+                result.append(updated_update)
+
+        return result
+
+    @classmethod
+    def from_list(cls, comments_list: list[dict]):
+        if comments_list:
+            comments = cls.process_comments(comments_list)
+            return super().from_list(comments)
+        else:
+            return []
+
+
+@dataclass
+class Scores(BaseModel):
+    application_id: str
+    date_created: str
+    id: str
+    justification: str
+    score: int
+    sub_criteria_id: str
+    user_id: str
+    full_name: str = ""
+    highest_role: str = ""
+    email_address: str = ""
+
+
+def get_user_info(lst: list, state: AssessorTaskList) -> dict:
+
+    if lst is None:
+        return []
+
+    user_ids = {item.user_id for item in lst if item.user_id}
+
+    if user_ids:
+        current_app.logger.info("Retrieving account information")
+        account_list = get_bulk_accounts_dict(
+            list(user_ids),
+            state.fund_short_name,
+        )
+        return account_list
+    else:
+        return []
+
+
+def add_user_info(list_data: list, state) -> list:
+    account_info = get_user_info(list_data, state)
+    if list_data is None:
+        return []
+
+    for item in list_data:
+        user_id = item.user_id
+
+        if user_id in account_info:
+            user_data = account_info[user_id]
+            current_app.logger.info("Adding account information.")
+            for key, value in user_data.items():
+                setattr(item, key, value)
+    return list_data
+
+
+def order_by_dates(lst: list) -> tuple:
+    """Sorts a list of items by 'date_created' in descending order"""
+
+    return sorted(lst, key=lambda item: item.date_created, reverse=True)
+
+
+class SearchForm(FlaskForm):
+    search = StringField("Search")
+
+
+class CheckboxForm(FlaskForm):
+    all_activity = BooleanField("All activity", default=True)
+    comments = BooleanField("Comments")
+    assessment_status = BooleanField("Assessment status")
+    score = BooleanField("Score")
+    flag = BooleanField("Flags")
+    tag = BooleanField("Tags")
+
+
+def map_activities_classes_with_checkbox_filters(filters):
+    filters = [f.replace(" ", "") for f in filters if f != "All activity"]
+    _filters = []
+    for filter in filters:
+        if filter == "Score":
+            _filters.append("Scores")
+        if filter == "Tags":
+            _filters.append("AssociatedTags")
+        else:
+            _filters.append(filter)
+
+    return _filters
+
+
+def filter_all_activities(
+    all_activities: list, search_keyword: str = "", filters: list = None
+):
+    all_activities = order_by_dates(all_activities)
+    filtered_classes = map_activities_classes_with_checkbox_filters(filters)
+
+    if not search_keyword and not filtered_classes:
+        return all_activities
+
+    if search_keyword and filtered_classes:
+        return [
+            activity
+            for activity in all_activities
+            if any(
+                search_keyword.lower() in str(attr).lower()
+                for attr in asdict(activity).values()
+            )
+            and any(
+                class_name.lower() == activity.__class__.__name__.lower()
+                for class_name in filtered_classes
+            )
+        ]
+
+    if not search_keyword and filters:
+        return [
+            activity
+            for activity in all_activities
+            if any(
+                class_name.lower() == activity.__class__.__name__.lower()
+                for class_name in filtered_classes
+            )
+        ]
+
+    if search_keyword and not filtered_classes:
+        return [
+            activity
+            for activity in all_activities
+            if any(
+                search_keyword.lower() in str(attr).lower()
+                for attr in asdict(activity).values()
+            )
+        ]
+
+    else:
+        return all_activities
diff --git a/app/blueprints/assessments/routes.py b/app/blueprints/assessments/routes.py
index fe99f40d..e2f48160 100644
--- a/app/blueprints/assessments/routes.py
+++ b/app/blueprints/assessments/routes.py
@@ -6,6 +6,16 @@
 from urllib.parse import quote_plus
 from urllib.parse import unquote_plus
 
+from app.blueprints.assessments.activity_trail import (
+    add_user_info,
+)
+from app.blueprints.assessments.activity_trail import AssociatedTags
+from app.blueprints.assessments.activity_trail import CheckboxForm
+from app.blueprints.assessments.activity_trail import Comments
+from app.blueprints.assessments.activity_trail import filter_all_activities
+from app.blueprints.assessments.activity_trail import Flags
+from app.blueprints.assessments.activity_trail import Scores
+from app.blueprints.assessments.activity_trail import SearchForm
 from app.blueprints.assessments.forms.assessment_form import (
     AssessmentCompleteForm,
 )
@@ -54,6 +64,9 @@
 )
 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 (
+    get_all_associated_tags_for_application,
+)
 from app.blueprints.services.data_services import (
     get_all_uploaded_documents_theme_answers,
 )
@@ -77,6 +90,7 @@
 from app.blueprints.services.data_services import get_funds
 from app.blueprints.services.data_services import get_qa_complete
 from app.blueprints.services.data_services import get_round
+from app.blueprints.services.data_services import get_score_and_justification
 from app.blueprints.services.data_services import get_sub_criteria
 from app.blueprints.services.data_services import (
     get_sub_criteria_theme_answers,
@@ -100,6 +114,7 @@
 from config.display_value_mappings import assessment_statuses
 from config.display_value_mappings import asset_types
 from config.display_value_mappings import cohort
+from config.display_value_mappings import dpi_filters
 from config.display_value_mappings import funding_types
 from config.display_value_mappings import landing_filters
 from config.display_value_mappings import search_params_cof
@@ -246,10 +261,12 @@ def fund_dashboard(fund_short_name: str, round_short_name: str):
         "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
     )
 
+    # request all the application overviews based on the search parameters
     application_overviews = get_application_overviews(
         fund_id, round_id, search_params
     )
@@ -349,6 +366,7 @@ def get_sorted_application_overviews(
         countries=all_application_locations.countries,
         regions=all_application_locations.regions,
         local_authorities=all_application_locations._local_authorities,
+        dpi_filters=dpi_filters,
     )
 
 
@@ -704,6 +722,61 @@ def application(application_id):
     )
 
 
+@assessment_bp.route("/activity_trail/<application_id>", methods=["GET"])
+@check_access_application_id
+def activity_trail(application_id: str):
+    state = get_state_for_tasklist_banner(application_id)
+
+    # There is a better way of doing it by moving
+    # all activity related logics to an endpoint in the
+    # assessment store and write up a query to fetch all the information.
+
+    # ALL FLAGS
+    flags_list = get_flags(application_id)
+    all_flags = Flags.from_list(flags_list)
+
+    # ALL COMMENTS
+    comments_list = get_comments(application_id)
+    all_comments = Comments.from_list(comments_list)
+
+    # ALL SCORES
+    scores = get_score_and_justification(
+        application_id=application_id, score_history=True
+    )
+    all_scores = Scores.from_list(scores)
+
+    # ALL TAGS
+    tags = get_all_associated_tags_for_application(application_id)
+    all_tags = AssociatedTags.from_associated_tags_list(tags)
+
+    # Add search box and checkbox filters
+    available_filters = ["All activity", "Comments", "Score", "Flags", "Tags"]
+    search_form = SearchForm(request.form)
+    checkbox_form = CheckboxForm(request.form)
+
+    # Filter all activities
+    search_keyword = request.args.get("search")
+    checkbox_filters = request.args.getlist("filter")
+    all_activities = all_scores + all_comments + all_tags + all_flags
+
+    update_user_info = add_user_info(all_activities, state)
+    _all_activities = filter_all_activities(
+        update_user_info, search_keyword, checkbox_filters
+    )
+
+    return render_template(
+        "activity_trail.html",
+        application_id=application_id,
+        state=state,
+        activities=_all_activities,
+        search_form=search_form,
+        checkbox_form=checkbox_form,
+        available_filters=available_filters,
+        search_keyword=search_keyword,
+        checkbox_filters=checkbox_filters,
+    )
+
+
 @assessment_bp.route(
     "/assessor_export/<fund_short_name>/<round_short_name>/<report_type>",
     methods=["GET"],
diff --git a/app/blueprints/assessments/templates/activity_trail.html b/app/blueprints/assessments/templates/activity_trail.html
new file mode 100644
index 00000000..29202d9a
--- /dev/null
+++ b/app/blueprints/assessments/templates/activity_trail.html
@@ -0,0 +1,177 @@
+{% extends "base.html" %}
+{% from "macros/theme.html" import theme %}
+{% from "govuk_frontend_jinja/components/label/macro.html" import govukLabel %}
+{%- from "govuk_frontend_jinja/components/table/macro.html" import govukTable -%}
+{%- from "govuk_frontend_jinja/components/fieldset/macro.html" import govukFieldset -%}
+{%- from "govuk_frontend_jinja/components/textarea/macro.html" import govukTextarea -%}
+{%- from "govuk_frontend_jinja/components/checkboxes/macro.html" import govukCheckboxes -%}
+{%- from "govuk_frontend_jinja/components/radios/macro.html" import govukRadios %}
+{%- from 'govuk_frontend_jinja/components/back-link/macro.html' import govukBackLink -%}
+{% from "macros/logout_partial.html" import logout_partial %}
+{% from "macros/banner_summary.html" import banner_summary %}
+{% from "macros/assessment_flag.html" import assessment_flag as assessment_flagged %}
+{% from "macros/assessment_flag.html" import assessment_resolve as assessment_resolved %}
+{% from "macros/assessment_flag.html" import assessment_stop as assessment_stopped %}
+{% from "macros/comments.html" import comments %}
+{% from "macros/scores_justification.html" import score as scores %}
+{% from "macros/tags_table.html" import tags %}
+
+{% set pageHeading = "Activity trail" %}
+
+{% set assessment_status = assessment_status if assessment_status is defined else None %}
+{% set fund_shortname = fund_shortname if fund_shortname is defined else None %}
+{% set funding_amount = sub_criteria.funding_amount_requested if sub_criteria else state.funding_amount_requested %}
+
+{% block header %}
+<header role="banner" data-module="govuk-header">
+    <nav class="govuk-width-container govuk-header__navigation">
+        <div class="govuk-phase-banner flex-parent-element">
+            <p class="govuk-!-text-align-left flex-parent-element flexed-element-margins-collapse">
+                {{ govukBackLink({'href': url_for("assessment_bp.application", application_id=application_id), 'html':
+                'Back to <b>assessment tasklist</b>', 'attributes': {'data-qa': 'back-to-assessment-tasklist'} }) }}
+            </p>
+            {{ logout_partial(sso_logout_url) }}
+        </div>
+    </nav>
+
+    {{ banner_summary(
+    (state.fund_name if state else fund.name),
+    state.fund_short_name,
+    sub_criteria.short_id if sub_criteria else state.short_id,
+    sub_criteria.project_name if sub_criteria else state.project_name,
+    funding_amount,
+    assessment_status,
+    flag_status,
+    display_status=False
+    ) }}
+</header>
+{% endblock header %}
+
+{% block content %}
+
+{% set tag_color = 'not-started-tag' if state.workflow_status == 'NOT_STARTED' else state.workflow_status
+%}
+
+{# this logic may need to be moved to python when the workflow status and flag status mechanism is sorted #}
+{% set status = state.workflow_status|remove_dashes_underscores_capitalize|title %}
+{% set display_workflow_status = "Assessment complete" if status=="Completed" and not state.is_qa_complete
+else "QA complete" if status=="Completed" and  state.is_qa_complete
+else status %}
+
+<main class="govuk-main-wrapper" id="main-content" role="main">
+    <div class="govuk-grid-row">
+        <div>
+            <div class="govuk-!-padding-left-3">
+                <h1 class="govuk-heading-l">Activity trail</h1>
+                <p class="govuk-body">Current assessment status: <span class="{{tag_color}} govuk-body">{{display_workflow_status }}</span></p>
+            </div>
+
+
+            <div class="govuk-grid-column-one-third">
+                <table class="govuk-table">
+                    <thead class="govuk-table__head">
+                        <tr class="govuk-table__row">
+                            <th scope="col" class="govuk-table__header">
+                                Filters
+                            </th>
+                        </tr>
+                    </thead>
+                </table>
+
+
+       <form method="GET" action="{{ url_for('assessment_bp.activity_trail', application_id=application_id) }}">
+        {# Search input  #}
+        <div class="govuk-form-group govuk-body">
+            <label class="govuk-label">Search keywords or users</label>
+            <input class="search-input govuk-input govuk-!-width-full" aria-label="Search keywords or users" id="search" name="search" type="text" value="{% if search_keyword %}{{ search_keyword }}{% endif %}">
+        </div>
+
+        {# Checkbox filters #}
+        <div class="govuk-form-group">
+            {% for filter_option in available_filters %}
+                <div class="govuk-checkboxes__item">
+                    <input class="govuk-checkboxes__input" id="{{ filter_option|lower }}Checkbox" type="checkbox" name="filter" value="{{ filter_option }}"
+                    {% if (filter_option =="All activity" and not checkbox_filters) or filter_option in checkbox_filters %}checked{% endif %}>
+                    <label class="govuk-label govuk-checkboxes__label" for="{{ filter_option|lower }}Checkbox">
+                        {{ filter_option }}
+                    </label>
+                </div>
+            {% endfor %}
+        </div>
+
+        {# Apply filters button #}
+        <div class="govuk-button-group">
+            <button class="govuk-button primary-button" type="submit">
+                Apply Filters
+            </button>
+        </div>
+    </form>
+            </div>
+
+            <div class="govuk-grid-column-two-thirds">
+                <div class="">
+
+                    <table class="govuk-table" role="table">
+                        <thead class="govuk-table__head" role="rowgroup">
+                            <tr class="govuk-table__row" role="row">
+                                <th role="columnheader" scope="col" class="govuk-!-width-one-third govuk-table__header">
+                                    Actions ({{ activities|length }}) </th>
+                            </tr>
+                        </thead>
+                        {% for activity in activities %}
+
+                        <tbody class="govuk-table__body">
+                            <tr class="govuk-table__row" id="commentItem1" style="">
+                                <td scope="row" class="govuk-table__cell govuk-!-width-one-third">
+                                    <div>
+                                        {% if activity.__class__.__name__ == 'Flags' %}
+                                            {% if activity.status.name == "RAISED" %}
+                                                {{assessment_flagged(state, activity, application_id)}}
+                                            {% elif activity.status.name == "RESOLVED" %}
+                                                {{assessment_resolved(activity, application_id)}}
+                                            {% elif activity.status.name == "STOPPED" %}
+                                                {{assessment_stopped(activity, application_id)}}
+                                            {% endif %}
+
+                                        {% elif activity.__class__.__name__ == 'Comments' %}
+                                            {{comments(activity, application_id)}}
+
+                                        {% elif activity.__class__.__name__ == 'Scores' %}
+                                            {{scores(activity, application_id)}}
+
+                                        {% elif activity.__class__.__name__ == 'AssociatedTags' %}
+                                             {% if activity.purpose =="NEGATIVE" %}
+                                                 {{tags(activity, "red")}}
+                                             {% elif activity.purpose =="POSITIVE" %}
+                                                 {{tags(activity, "green")}}
+                                             {% elif activity.purpose =="GENERAL" %}
+                                                 {{tags(activity, "blue")}}
+                                             {% elif activity.purpose =="ACTION" %}
+                                                 {{tags(activity, "yellow")}}
+                                             {% elif activity.purpose =="PEOPLE" %}
+                                                 {{tags(activity, "grey")}}
+                                             {% endif %}
+
+                                        {% else %}
+                                        {{activity}}
+
+                                        {% endif %}
+
+                                    </div>
+                                </td>
+                            </tr>
+                        </tbody>
+                        {% endfor %}
+
+                    </table>
+                </div>
+            </div>
+
+        </div>
+
+    </div>
+
+
+</main>
+
+{% endblock content %}
diff --git a/app/blueprints/assessments/templates/assessor_dashboard.html b/app/blueprints/assessments/templates/assessor_dashboard.html
index eba2a6a4..eef3ac1d 100644
--- a/app/blueprints/assessments/templates/assessor_dashboard.html
+++ b/app/blueprints/assessments/templates/assessor_dashboard.html
@@ -129,7 +129,8 @@ <h2 class="govuk-heading-l fsd-banner-content"> {% if is_active_status %}All act
                 sort_order,
                 tag_option_groups,
                 tags,
-                tagging_purpose_config
+                tagging_purpose_config,
+                dpi_filters
             ) }}
         {% endif %}
     </section>
diff --git a/app/blueprints/assessments/templates/assessor_tasklist.html b/app/blueprints/assessments/templates/assessor_tasklist.html
index aa2c889f..9ac7e080 100644
--- a/app/blueprints/assessments/templates/assessor_tasklist.html
+++ b/app/blueprints/assessments/templates/assessor_tasklist.html
@@ -29,6 +29,7 @@
 
     {{ banner_summary(
         state.fund_name,
+        state.fund_short_name,
         state.short_id,
         state.project_name,
         state.funding_amount_requested,
@@ -73,12 +74,20 @@
 
 {% if g.access_controller.has_any_assessor_role %}
 <div class="govuk-grid-row">
-<div class="govuk-grid-column-three-quarters">
-       {{ flag_tabs(state, application_id, teams_flag_stats, flags_list, accounts_list) }}
-</div>
-<div class="govuk-grid-column-one-quarter">
+
+
+
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-one-half">
+        {{ flag_tabs(state, application_id, teams_flag_stats, flags_list, accounts_list) }}
+    </div>
+
+    <div class="govuk-grid-column-one-quarter gov-uk-table__cell--align-right left-margin govuk-!-padding-top-1">
+        <p class="govuk-body"> <a href="{{ url_for('assessment_bp.activity_trail', application_id=application_id) }}">View activity trail</a></p>
+      </div>
+
     <div class="gov-uk-table__cell--align-right">
-    <span class="left govuk-!-padding-right-1">
+    <span class="left govuk-!-padding-right-4">
         {% if is_flaggable and g.access_controller.has_any_assessor_role %}
         {{ flag_application_button(application_id) }}
         {% endif %}
diff --git a/app/blueprints/assessments/templates/macros/application_overviews_table_dpif.html b/app/blueprints/assessments/templates/macros/application_overviews_table_dpif.html
index 093bf363..c226bdb8 100644
--- a/app/blueprints/assessments/templates/macros/application_overviews_table_dpif.html
+++ b/app/blueprints/assessments/templates/macros/application_overviews_table_dpif.html
@@ -12,13 +12,12 @@
 
 {% macro 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) -%}
+    sort_column, sort_order, tag_option_groups, tags, tagging_purpose_config, dpi_filters) -%}
 <nav class="search-bar-flex-container">
   <form method="get" class="govuk-!-width-full">
     {{ filter_options(
       query_params,
-      team_in_place,
-      'team_in_place',
+      dpi_filters,
       'Search reference or project name',
       assessment_statuses,
       countries,
diff --git a/app/blueprints/assessments/templates/macros/assessment_flag.html b/app/blueprints/assessments/templates/macros/assessment_flag.html
index 6a388e1a..a914dbc7 100644
--- a/app/blueprints/assessments/templates/macros/assessment_flag.html
+++ b/app/blueprints/assessments/templates/macros/assessment_flag.html
@@ -24,6 +24,32 @@ <h2>Notification sent</h2>
     </div>
 {% endmacro %}
 
+{% macro assessment_resolved(flag, user_info, application_id) %}
+    <div class="assessment-complete  govuk-margin-bottom-8" role="alert">
+        {% if flag.updates[-1]["status"].name == "RESOLVED" %}
+            {% if flag.updates[-2]["status"].name == "STOPPED" %}
+                <h1 class="assessment-alert__heading govuk-heading-l">
+                    {{ ("Flagged for "+ flag.latest_allocation if flag.latest_allocation else "Flagged") + " - Continue assessment" }}
+                </h1>
+                <h2>Reason for continuing assessment</h2>
+                <p>{{ flag.updates[-1]["justification"] }}</p>
+            {% else %}
+                <h1 class="assessment-alert__heading govuk-heading-l">
+                    {{ ("Flagged for "+ flag.latest_allocation if flag.latest_allocation else "Flagged") + " resolved" }}
+                </h1>
+                <h2>Resolve flag action</h2>
+                <p>Query resolved</p>
+                <h2>Reason</h2>
+                <p>{{ flag.updates[-1]["justification"] }}</p>
+            {% endif %}
+        {% endif %}
+        <br>
+        <p class="govuk-body-s">{{ user_info["full_name"] or "N/A" }} ({{ user_info["highest_role"] | all_caps_to_human }}) {{ user_info["email_address"] }}</p>
+        <p class="govuk-body-s">{{ flag.updates[-1]["date_created"] | utc_to_bst }}</p>
+    </div>
+{% endmacro %}
+
+
 {% macro assessment_stopped(flag, user_info, application_id) %}
     <div class="assessment-alert assessment-alert--stopped" role="alert">
         <h1 class="assessment-alert__heading govuk-heading-l">
@@ -44,27 +70,72 @@ <h2 class="govuk-heading-m">Reason</h2>
     </div>
 {% endmacro %}
 
-{% macro assessment_resolved(flag, user_info, application_id) %}
+
+ {# NOTE: Below macro is only being used activity_trail #}
+{% macro assessment_flag(state, flag, application_id) %}
+<p class="govuk-body govuk-!-padding-top-5"> <span
+    class="govuk-body govuk-!-font-weight-bold">Flag</span> added to assessment</p>
+    <div class="assessment-alert assessment-alert--flagged" role="alert">
+        <h1 class="assessment-alert__heading govuk-heading-l">
+            {{ ("Flagged for "+ flag.allocation if flag.allocation else "Flagged") }}
+        </h1>
+        <h2>Reason</h2>
+        <p>{{ flag.justification }}</p>
+
+        <h2>Section(s) flagged</h2>
+        {{ display_flagged_sections(state, application_id, flag.sections_to_flag) }}
+        {# TODO: Notification is hardcoded. Change it once notification is implemented #}
+        <h2>Notification sent</h2>
+        <p>No</p><br>
+        <p class="govuk-body-s">{{ flag.full_name or "N/A" }} ({{ flag.highest_role | all_caps_to_human }}) {{ flag.email_address }}</p>
+        <p class="govuk-body-s">{{ flag.date_created|utc_to_bst }}</p>
+
+    </div>
+{% endmacro %}
+
+
+ {# NOTE: Below macro is only being used activity_trail #}
+{% macro assessment_resolve(flag,  application_id) %}
+<p class="govuk-body govuk-!-padding-top-5"> <span
+    class="govuk-body govuk-!-font-weight-bold">Flag</span> resolved on assessment</p>
     <div class="assessment-complete  govuk-margin-bottom-8" role="alert">
-        {% if flag.updates[-1]["status"].name == "RESOLVED" %}
-            {% if flag.updates[-2]["status"].name == "STOPPED" %}
+        {% if flag.status.name == "RESOLVED" %}
+            {% if flag.status.name == "STOPPED" %}
                 <h1 class="assessment-alert__heading govuk-heading-l">
-                    {{ ("Flagged for "+ flag.latest_allocation if flag.latest_allocation else "Flagged") + " - Continue assessment" }}
+                    {{ ("Flagged for "+ flag.allocation if flag.allocation else "Flagged") + " - Continue assessment" }}
                 </h1>
                 <h2>Reason for continuing assessment</h2>
-                <p>{{ flag.updates[-1]["justification"] }}</p>
+                <p>{{ flag.justification }}</p>
             {% else %}
                 <h1 class="assessment-alert__heading govuk-heading-l">
-                    {{ ("Flagged for "+ flag.latest_allocation if flag.latest_allocation else "Flagged") + " resolved" }}
+                    {{ ("Flagged for "+ flag.allocation if flag.allocation else "Flagged") + " resolved" }}
                 </h1>
                 <h2>Resolve flag action</h2>
                 <p>Query resolved</p>
                 <h2>Reason</h2>
-                <p>{{ flag.updates[-1]["justification"] }}</p>
+                <p>{{ flag.justification }}</p>
             {% endif %}
         {% endif %}
         <br>
-        <p class="govuk-body-s">{{ user_info["full_name"] or "N/A" }} ({{ user_info["highest_role"] | all_caps_to_human }}) {{ user_info["email_address"] }}</p>
-        <p class="govuk-body-s">{{ flag.updates[-1]["date_created"] | utc_to_bst }}</p>
+        <p class="govuk-body-s">{{ flag.full_name or "N/A" }} ({{ flag.highest_role | all_caps_to_human }}) {{ flag.email_address }}</p>
+        <p class="govuk-body-s">{{ flag.date_created|utc_to_bst }}</p>
+    </div>
+{% endmacro %}
+
+
+ {# NOTE: Below macro is only being used activity_trail #}
+{% macro assessment_stop(flag, user_info, application_id) %}
+<p class="govuk-body govuk-!-padding-top-5"> <span
+    class="govuk-body govuk-!-font-weight-bold">Flag</span> stopped on assessment</p>
+    <div class="assessment-alert assessment-alert--stopped" role="alert">
+        <h1 class="assessment-alert__heading govuk-heading-l">
+            {{ ("Flagged for "+ flag.allocation if flag.allocation else "Flagged") +  " - Assessment stopped" }}
+        </h1>
+        <h2 class="govuk-heading-m">Reason</h2>
+            <p class="govuk-body">{{ flag.justification }}</p>
+        <br>
+        <p class="govuk-body-s">{{ flag.full_name or "N/A" }} ({{ flag.highest_role | all_caps_to_human }}) {{ flag.email_address }}</p>
+        <p class="govuk-body-s">{{ flag.date_created|utc_to_bst }}</p>
+
     </div>
 {% endmacro %}
diff --git a/app/blueprints/assessments/templates/macros/comments.html b/app/blueprints/assessments/templates/macros/comments.html
index b4a12ade..68716f1b 100644
--- a/app/blueprints/assessments/templates/macros/comments.html
+++ b/app/blueprints/assessments/templates/macros/comments.html
@@ -50,3 +50,20 @@ <h2 class="govuk-heading-m govuk-!-margin-bottom-2">Comments</h2>
     {% endif %}
 </div>
 {% endmacro %}
+
+{# This macro is only being used in the activity_trail.html #}
+{% macro comments(comment, application_id) %}
+
+<div id="comments">
+    <p class="govuk-!-static-padding-top-1"><span
+        class="govuk-body govuk-!-font-weight-bold">Comment</span> on <a
+        href="{{ url_for('assessment_bp.display_sub_criteria',application_id=application_id ,sub_criteria_id=comment.sub_criteria_id)}}?theme_id={{comment.theme_id}}" target="_blank">{{comment.theme_id|remove_dashes_underscores_capitalize}}</a></p>
+
+    <div class="comment-group">
+        <p class="govuk-body">{{ comment.comment }}</p>
+        <p class="govuk-body-s">{{ comment.full_name }} ({{ comment.highest_role|all_caps_to_human }}) {{ comment.email_address }}</p>
+        <p class="govuk-body-s">{{ comment.date_created|utc_to_bst }}</p>
+    </div>
+
+</div>
+{% endmacro %}
diff --git a/app/blueprints/assessments/templates/macros/filter_options_dpif.html b/app/blueprints/assessments/templates/macros/filter_options_dpif.html
index 1dcd6faa..b663974f 100644
--- a/app/blueprints/assessments/templates/macros/filter_options_dpif.html
+++ b/app/blueprints/assessments/templates/macros/filter_options_dpif.html
@@ -1,47 +1,64 @@
-{% macro filter_options(query_params, item_types, item_type, search_label, assessment_statuses, countries, regions, local_authorities, round_details, show_clear_filters, tag_option_groups) %}
+{% macro filter_options(query_params, filter_types, search_label, assessment_statuses, countries, regions,
+local_authorities, round_details, show_clear_filters, tag_option_groups) %}
 <!--THIS FILE IS TEMPOARY UNTIL WE COM UP WITH A WAY FOR PER FUND FILTERING OPTIONS -->
-    <fieldset class="govuk-fieldset">
-        <div class="govuk-grid-row">
-            <div class="govuk-grid-column-one-half">
-                <div class="govuk-form-group">
-                    <div class="govuk-width-full govuk-!-display-none-print gem-c-search--on-white govuk-!-margin-bottom-0">
-                        <label for="application_search" class="govuk-label">{{ 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>
+<fieldset class="govuk-fieldset">
+    <div class="govuk-grid-row">
+        <div class="govuk-grid-column-one-half">
+            <div class="govuk-form-group">
+                <div class="govuk-width-full govuk-!-display-none-print gem-c-search--on-white govuk-!-margin-bottom-0">
+                    <label for="application_search" class="govuk-label">{{ 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>
         </div>
+    </div>
 
-        <div style="margin:0;padding:0;">
-            <div class="govuk-grid-row">
-                <div class="govuk-grid-column-three-quarters dluhc-column-auto">
-                    <div>
-                    <div class="govuk-form-group govuk-!-display-inline-block govuk-!-margin-bottom-0 govuk-!-margin-right-2">
+    <div style="margin:0;padding:0;">
+        <div class="govuk-grid-row">
+            <div class="govuk-grid-column-three-quarters dluhc-column-auto">
+                <div>
+                    {% for filter_type in filter_types %}
+                    <div
+                        class="govuk-form-group govuk-!-display-inline-block govuk-!-margin-bottom-0 govuk-!-margin-right-2">
+                        <label class="govuk-label" for="filter_{{ filter_type['name'] }}">
+                            Filter by {{ filter_type["name"] | replace("_", " ") }}
+                        </label>
+                        <select class="govuk-select" id="filter_{{ filter_type['name']}}"
+                            name="{{ filter_type['name'] }}">
+                            {% for item in filter_type["values"] %}
+                            <option value='{{ item }}' {% if query_params[filter_type["name"]]==item %} selected="" {%
+                                endif %}>{{
+                                item | title}}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    {% endfor %}
+                </div>
+                <div class="govuk-!-margin-top-5">
+                    <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" 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 %}
+                            {% 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 class="govuk-checkboxes govuk-checkboxes--small govuk-!-margin-top-1">
                             <div class="govuk-checkboxes__item">
-                                <input class="govuk-checkboxes__input" id="show-tags"
-                                       type="checkbox">
+                                <input class="govuk-checkboxes__input" id="show-tags" type="checkbox">
                                 <label class="govuk-label govuk-checkboxes__label" style="white-space: nowrap;"
-                                       for="show-tags">
+                                    for="show-tags">
                                     Show tags
                                 </label>
                             </div>
@@ -49,46 +66,58 @@
                     </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" 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>
+                    <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" 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>
 
-                <div>
+            </div>
 
-                </div>
-                </div>
 
-                <div class="govuk-grid-column-one-quarter">
-                    <div class="govuk-button-group govuk-!-margin-top-3">
-                        <button class="govuk-button primary-button search-button govuk-!-margin-top-4"
-                                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',
+            <div class="govuk-grid-column-one-quarter">
+                <div class="govuk-button-group govuk-!-margin-top-3">
+                    <button class="govuk-button primary-button search-button govuk-!-margin-top-4" 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>
+                                      clear_filters=true) }}" aria-label="Clear Filters">Clear search</a>
+                    </p>
+                    {% endif %}
                 </div>
             </div>
         </div>
+    </div>
+    </div>
 
-    </fieldset>
+</fieldset>
 
 {% endmacro %}
+
+
+{% for filter_type in filter_types %}
+<div class="govuk-form-group govuk-!-display-inline-block govuk-!-margin-bottom-0 govuk-!-margin-right-2">
+    <label class="govuk-label" for="filter_{{ item_type }}">
+        Filter by {{ filter_type["name"]}}
+    </label>
+    <select class="govuk-select" id="filter_{{ item_type }}" name="{{ item_type }}">
+        {% for item in filter_type["values"] %}
+        <option value='{{ item }}' {% if query_params[filter_type["name"]]==item %} selected="" {% endif %}>{{
+            item }}</option>
+        {% endfor %}
+    </select>
+</div>
+{% endfor %}
diff --git a/app/blueprints/assessments/templates/macros/tags_table.html b/app/blueprints/assessments/templates/macros/tags_table.html
index 6fef3e4f..df2722e1 100644
--- a/app/blueprints/assessments/templates/macros/tags_table.html
+++ b/app/blueprints/assessments/templates/macros/tags_table.html
@@ -26,3 +26,23 @@
     {% endif %}
 
 {% endmacro %}
+
+{# This macro is only being used in the activity_trail.html #}
+{% macro tags(tag, colour) %}
+
+{% if tag.associated %}
+<div class="govuk-!-static-padding-top-5 govuk-!-static-padding-bottom-4">
+    <p class="govuk-body"> <span class="govuk-body govuk-!-font-weight-bold">Tag</span> <strong class="govuk-tag govuk-tag--{{colour}}">{{tag.value}} </strong> added to assessment</p>
+    <p class="govuk-body">Added by <span class="govuk-body govuk-!-font-weight-bold">{{tag.full_name }}</span> ({{ tag.email_address}}) on {{tag.date_created|utc_to_bst}}
+    </p>
+</div>
+
+{% else %}
+<div class="govuk-!-static-padding-top-5 govuk-!-static-padding-bottom-4">
+    <p class="govuk-body"> <span class="govuk-body govuk-!-font-weight-bold">Tag</span> <strong class="govuk-tag govuk-tag--{{colour}}">{{tag.value}} </strong> removed from assessment</p>
+    <p class="govuk-body">Removed by <span class="govuk-body govuk-!-font-weight-bold">{{tag.full_name }}</span> ({{ tag.email_address}}) on {{tag.date_created|utc_to_bst}}
+    </p>
+</div>
+{% endif %}
+
+{% endmacro %}
diff --git a/app/blueprints/scoring/templates/macros/scores_justification.html b/app/blueprints/scoring/templates/macros/scores_justification.html
index 3b59653d..4ebff2e7 100644
--- a/app/blueprints/scoring/templates/macros/scores_justification.html
+++ b/app/blueprints/scoring/templates/macros/scores_justification.html
@@ -2,7 +2,7 @@
 {% from "macros/justification.html" import justification %}
 {%- from "govuk_frontend_jinja/components/button/macro.html" import govukButton -%}
 
-{% macro scores_justification(score_form, rescore_form, is_rescore, latest_score, application_id, sub_criteria_id, round_guidance_url) %}
+{% macro scores_justification(score_form, rescore_form, is_rescore, latest_score, application_id, sub_criteria_id, round_guidance_url, score_list) %}
 
 <div class="govuk-grid-column-full s26-scoring">
     {% if latest_score %}
@@ -21,7 +21,7 @@ <h2 class="govuk-heading-m">Current score: {{ latest_score['score'] }}</h2>
             <p class="govuk-body-s"> <strong>Date/time:</strong> {{ latest_score.date_created|utc_to_bst }}</p>
         </div>
     </div>
-    {% if score_form.score_list %}
+    {% if score_list %}
     <details class="govuk-details govuk-!-margin-top-4" data-module="govuk-details">
         <summary class="govuk-details__summary">
           <span class="govuk-details__summary-text">
@@ -30,7 +30,7 @@ <h2 class="govuk-heading-m">Current score: {{ latest_score['score'] }}</h2>
         </summary>
         <div class="govuk-details__text">
           <div id="anchor">
-            {% for score in score_form.score_list %}
+            {% for score in score_list %}
             <p><strong>Score: </strong>{{ score["score"] }}</p>
             <p><strong>Rationale: </strong>{{ score["justification"] }}</p>
             <p class="govuk-body-s"><strong>{{ score["user_full_name"] }}: </strong> {{ score["highest_role"]|all_caps_to_human }}, {{ score["user_email"] }}</p>
@@ -80,3 +80,26 @@ <h2 class="govuk-heading-m govuk-!-margin-top-4">Rescore</h2>
 </div>
 
 {% endmacro %}
+
+{# This macro is only being used in the activity_trail.html #}
+{% macro score(score, application_id) %}
+<p class="govuk-body govuk-!-padding-top-6"> <span
+    class="govuk-body govuk-!-font-weight-bold">Scored </span> on subcriteria <a
+    href="{{ url_for('assessment_bp.display_sub_criteria',application_id=application_id ,sub_criteria_id=score.sub_criteria_id) }}" target="_blank">{{score.sub_criteria_id|remove_dashes_underscores_capitalize}}</a></p>
+<div class="score-group govuk-!-padding-bottom-5" id="score" role="status">
+    <h2 class="govuk-heading-m">Scored: {{score.score }}</h2>
+    <div>
+        <p class="govuk-body-m"><strong>Rationale: </strong>{{ score.justification }}</p>
+        <p class="govuk-body-s">
+            <strong>
+                {% if score.full_name %}{{ score.full_name or 'NA' }} {% endif %}
+            </strong> ({{ score.highest_role|all_caps_to_human or 'NA' }})
+
+            {% if score.email_address %}{{ score.email_address or 'NA' }}{% endif %}
+    </p>
+
+        <p class="govuk-body-s"> <strong>Date/time:</strong> {{ score.date_created|utc_to_bst }}</p>
+    </div>
+</div>
+
+{% endmacro %}
diff --git a/app/blueprints/scoring/templates/score.html b/app/blueprints/scoring/templates/score.html
index ecfe3839..9fac1b42 100644
--- a/app/blueprints/scoring/templates/score.html
+++ b/app/blueprints/scoring/templates/score.html
@@ -52,7 +52,7 @@ <h2 class="govuk-error-summary__title" autofocus>
         </div>
         <div class="theme govuk-grid-column-two-thirds">
             {{ scores_justification(score_form, rescore_form, is_rescore, latest_score, application_id,
-            sub_criteria.id,state.fund_guidance_url) }}
+            sub_criteria.id,state.fund_guidance_url, score_list) }}
             {{ comment_summary(comments, sub_criteria.themes) }}
         </div>
 </div>
diff --git a/app/blueprints/services/data_services.py b/app/blueprints/services/data_services.py
index e091b815..368d28b5 100644
--- a/app/blueprints/services/data_services.py
+++ b/app/blueprints/services/data_services.py
@@ -217,6 +217,21 @@ def get_associated_tags_for_application(application_id) -> List[Tag]:
         return None
 
 
+def get_all_associated_tags_for_application(application_id) -> List[Tag]:
+    endpoint = Config.APPLICATION_ASSOCIATED_ALL_TAGS_ENDPOINT.format(
+        application_id=application_id
+    )
+    result = get_data(endpoint)
+    if result:
+        result = [AssociatedTag.from_dict(item) for item in result]
+        return result
+    else:
+        current_app.logger.info(
+            f"No associated tags found for application: {application_id}."
+        )
+        return []
+
+
 def update_associated_tags(application_id, tags) -> bool:
     endpoint = Config.ASSESSMENT_ASSOCIATE_TAGS_ENDPOINT.format(
         application_id=application_id
@@ -230,7 +245,6 @@ def update_associated_tags(application_id, tags) -> bool:
         f" application_id '{application_id}'"
     )
     response = requests.put(endpoint, json=payload)
-
     was_successful = response.ok
     if not was_successful:
         current_app.logger.error(
@@ -347,7 +361,7 @@ def get_bulk_accounts_dict(account_ids: List, fund_short_name: str):
 
 
 def get_score_and_justification(
-    application_id, sub_criteria_id, score_history=True
+    application_id, sub_criteria_id=None, score_history=True
 ):
     score_url = Config.ASSESSMENT_SCORES_ENDPOINT
     score_params = {
diff --git a/app/blueprints/shared/filters.py b/app/blueprints/shared/filters.py
index 854cde25..29af3a83 100644
--- a/app/blueprints/shared/filters.py
+++ b/app/blueprints/shared/filters.py
@@ -29,6 +29,7 @@ def utc_to_bst(value, tz="Europe/London"):
         "%Y-%m-%d %H:%M:%S.%f",
         "%Y-%m-%d %H:%M:%S",
         "%Y-%m-%dT%H:%M:%S",
+        "%Y-%m-%d %H:%M:%S.%f%z",
     ]
     for dt_format in dt_formats:
         try:
diff --git a/app/blueprints/tagging/models/tag.py b/app/blueprints/tagging/models/tag.py
index 1c01992a..48197e07 100644
--- a/app/blueprints/tagging/models/tag.py
+++ b/app/blueprints/tagging/models/tag.py
@@ -48,6 +48,7 @@ class AssociatedTag:
     user_id: str
     associated: bool
     purpose: str
+    created_at: str = ""
 
     @classmethod
     def from_dict(cls, d: dict):
diff --git a/app/blueprints/tagging/routes.py b/app/blueprints/tagging/routes.py
index 70393b53..8b0a3142 100644
--- a/app/blueprints/tagging/routes.py
+++ b/app/blueprints/tagging/routes.py
@@ -60,12 +60,30 @@
 )
 @check_access_application_id(roles_required=["ASSESSOR"])
 def load_change_tags(application_id):
-    tag_association_form = TagAssociationForm()
 
+    tag_association_form = TagAssociationForm()
     if request.method == "POST":
+        associated_tags = get_associated_tags_for_application(application_id)
+        association_form_data = tag_association_form.tags.data
         updated_tags = []
-        for tag_id in tag_association_form.tags.data:
-            updated_tags.append({"tag_id": tag_id, "user_id": g.account_id})
+
+        if associated_tags and len(associated_tags) > len(
+            association_form_data
+        ):
+            # Create a list of dictionaries with tag_id and user_id
+            updated_tags = [
+                {"tag_id": tag_id, "user_id": g.account_id}
+                for tag_id in association_form_data
+            ]
+            # Fill remaining with a empty tag_id and current user account_id
+            updated_tags.extend([{"tag_id": "", "user_id": g.account_id}])
+        else:
+            # If associated_tags is zero or null, or not greater than association_form_data
+            updated_tags = [
+                {"tag_id": tag_id, "user_id": g.account_id}
+                for tag_id in association_form_data
+            ]
+
         update_associated_tags(application_id, updated_tags)
         return redirect(
             url_for(
@@ -73,6 +91,7 @@ def load_change_tags(application_id):
                 application_id=application_id,
             )
         )
+
     state = get_state_for_tasklist_banner(application_id)
     all_tags = get_tags_for_fund_round(state.fund_id, state.round_id, "")
     associated_tags = get_associated_tags_for_application(application_id)
diff --git a/app/static/src/styles/landing.css b/app/static/src/styles/landing.css
index 37bbfe5c..e6cb1422 100644
--- a/app/static/src/styles/landing.css
+++ b/app/static/src/styles/landing.css
@@ -29,6 +29,11 @@
     width: 16em;
 }
 
+.left-margin {
+    margin-left: 80px;
+
+}
+
 .search-bar-flex-container {
     float: none;
     display: flex;
diff --git a/app/templates/components/header.html b/app/templates/components/header.html
index 541361d9..54e3c687 100644
--- a/app/templates/components/header.html
+++ b/app/templates/components/header.html
@@ -14,6 +14,7 @@
 
     {{ banner_summary(
         (state.fund_name if state else fund.name),
+        state.fund_short_name,
         sub_criteria.short_id if sub_criteria else state.short_id,
         sub_criteria.project_name if sub_criteria else state.project_name,
         sub_criteria.funding_amount_requested if sub_criteria else state.funding_amount_requested,
diff --git a/app/templates/macros/banner_summary.html b/app/templates/macros/banner_summary.html
index bfac0f64..5c1e3bb7 100644
--- a/app/templates/macros/banner_summary.html
+++ b/app/templates/macros/banner_summary.html
@@ -1,4 +1,5 @@
-{% macro banner_summary(fund_name, project_reference, project_name, funding_amount_requested, assessment_status, flag_status) %}
+{% macro banner_summary(fund_name,fund_shortname, project_reference, project_name, funding_amount_requested, assessment_status, flag_status, display_status=True) %}
+
 <div class="fsd-banner-background">
 <div class="govuk-width-container">
     <div class="govuk-grid-row">
@@ -7,9 +8,12 @@
                     <p class="govuk-heading-xl fsd-banner-content">Fund: <span class="govuk-!-font-weight-regular">{{ fund_name }}</span></p>
                     <p class="govuk-heading-l fsd-banner-content">Project reference: <span class="govuk-!-font-weight-regular">{{ project_reference | format_project_ref }}</span></p>
                     <p class="govuk-body-l fsd-banner-content fsd-banner-collapse-padding">Project name: {{ project_name }}</p>
-                    <p class="govuk-body-l fsd-banner-content ">Total funding requested: £{{ "{:,.2f}".format(funding_amount_requested | float) }}</p>
 
-                    {% if g.access_controller.has_any_assessor_role %}
+                    {% if fund_shortname not in ("DPIF",) %} {# Funds that should hide total funding requested. #}
+                        <p class="govuk-body-l fsd-banner-content ">Total funding requested: £{{ "{:,.2f}".format(funding_amount_requested | float) }}</p>
+                    {% endif %}
+
+                    {% if g.access_controller.has_any_assessor_role and display_status %}
                         <p><strong class="govuk-tag govuk-tag--grey govuk-!-margin-top-4">{{ assessment_status }}</strong>
                         {% if "Flagged" in flag_status or flag_status in ["Multiple flags to resolve", "Stopped", "Flagged"] %}
                             <p class="govuk-body-l fsd-banner-content fsd-banner-collapse-padding govuk-!-margin-top-3">{{ flag_status or "" }}</p>
diff --git a/app/templates/macros/theme/question_above_answer_html.jinja2 b/app/templates/macros/theme/question_above_answer_html.jinja2
index c984b12d..dbf17694 100644
--- a/app/templates/macros/theme/question_above_answer_html.jinja2
+++ b/app/templates/macros/theme/question_above_answer_html.jinja2
@@ -2,8 +2,12 @@
 
     <dl class="govuk-summary-list">
         <div class="govuk-summary-list__row">
-            <h4 class="govuk-heading-s"><strong> {{ meta.question }} </strong></h4>
-            <span class="govuk-body"> {{ meta.answer | safe }} </span>
+            <dt>
+                <h4 class="govuk-heading-s"><strong> {{ meta.question }} </strong></h4>
+            </dt>
+            <dd class="govuk-body govuk-!-margin-left-0">
+                <span> {{ meta.answer | safe }} </span>
+            </dd>
         </div>
     </dl>
 
diff --git a/config/display_value_mappings.py b/config/display_value_mappings.py
index 21b97ff2..3e75a7b3 100644
--- a/config/display_value_mappings.py
+++ b/config/display_value_mappings.py
@@ -73,7 +73,6 @@
     "filter_by_tag": ALL_VALUE,
     "country": ALL_VALUE,
     "region": ALL_VALUE,
-    "local_authority": ALL_VALUE,
 }
 
 search_params_dpif = {
@@ -81,8 +80,33 @@
     "search_in": "organisation_name,short_id",
     "status": ALL_VALUE,
     "filter_by_tag": ALL_VALUE,
+    "publish_datasets": ALL_VALUE,
+    "datasets": ALL_VALUE,
+    "team_in_place": ALL_VALUE,
 }
 
+dpi_filters = [
+    {
+        "name": "team_in_place",
+        "values": ["ALL", "Yes", "No"],
+    },
+    {
+        "name": "datasets",
+        "values": ["ALL", "Yes", "No"],
+    },
+    {
+        "name": "publish_datasets",
+        "values": [
+            "ALL",
+            "None",
+            "0-to-3-months",
+            "4-to-7-months",
+            "8-to-11-months",
+            "longer-than-11-months",
+        ],
+    },
+]
+
 search_params_tag = {
     "search_term": "",
     "search_in": "value",
diff --git a/config/envs/default.py b/config/envs/default.py
index 97bff036..81559e19 100644
--- a/config/envs/default.py
+++ b/config/envs/default.py
@@ -186,6 +186,9 @@ class DefaultConfig:
     ASSESSMENT_ASSOCIATE_TAGS_ENDPOINT = (
         ASSESSMENT_STORE_API_HOST + "/application/{application_id}/tag"
     )
+    APPLICATION_ASSOCIATED_ALL_TAGS_ENDPOINT = (
+        ASSESSMENT_STORE_API_HOST + "/application/{application_id}/tags"
+    )
     ASSESSMENT_GET_TAG_ENDPOINT = (
         ASSESSMENT_STORE_API_HOST
         + "/funds/{fund_id}/rounds/{round_id}/tags/{tag_id}"
diff --git a/copilot/fsd-assessment/manifest.yml b/copilot/fsd-assessment/manifest.yml
index 72416455..4133c91e 100644
--- a/copilot/fsd-assessment/manifest.yml
+++ b/copilot/fsd-assessment/manifest.yml
@@ -24,14 +24,14 @@ image:
 
 # Valid values: https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-cpu-memory-error.html
 # Number of CPU units for the task.
-cpu: 512
+cpu: 1024
 # Amount of memory in MiB used by the task.
-memory: 1024
+memory: 2048
 
 # See https://aws.github.io/copilot-cli/docs/manifest/lb-web-service/#platform
 platform: linux/x86_64
 # Number of tasks that should be running in your service.
-count: 1
+count: 2
 # Enable running commands in your container.
 exec: true
 
@@ -50,6 +50,7 @@ variables:
   ASSESSMENT_STORE_API_HOST: "http://fsd-assessment-store:8080"
   FUND_STORE_API_HOST: "http://fsd-fund-store:8080"
   ACCOUNT_STORE_API_HOST: "http://fsd-account-store:8080"
+  APPLICATION_STORE_API_HOST: "http://fsd-application-store:8080"
   COPILOT_AWS_BUCKET_NAME:
     from_cfn: ${COPILOT_APPLICATION_NAME}-${COPILOT_ENVIRONMENT_NAME}-FormUploadsBucket
   REDIS_INSTANCE_URI:
@@ -61,12 +62,37 @@ secrets:
 
 # You can override any of the values defined above by environment.
 environments:
-  # uat:
-    # http:
-    #   alias: assessment.uat.access-funding.test.levellingup.gov.uk
-  # production:
-    # http:
-    #   alias: assessment.prod.access-funding.levellingup.gov.uk
+  dev:
+    variables:
+      FORCE_OPEN_ALL_LIVE_ASSESSMENT_ROUNDS: "True"
   test:
     deployment:
       rolling: 'recreate'
+    variables:
+      FORCE_OPEN_ALL_LIVE_ASSESSMENT_ROUNDS: "True"
+  uat:
+    alias: ["assessment.${COPILOT_ENVIRONMENT_NAME}.access-funding.test.levellingup.gov.uk", "assessmentuat.access-funding.test.levellingup.gov.uk"]
+    count:
+      range: 2-4
+      cooldown:
+        in: 60s
+        out: 30s
+      cpu_percentage:
+        value: 70
+      memory_percentage:
+        value: 80
+      requests: 30
+      response_time: 2s
+  production:
+    alias: assessment.production.access-funding.levellingup.gov.uk
+    # alias: ["assessment.production.access-funding.levellingup.gov.uk", "assessment.access-funding.levellingup.gov.uk"] # For go live
+    count:
+      range: 2-4
+      cooldown:
+        in: 60s
+        out: 30s
+      cpu_percentage:
+        value: 70
+      memory_percentage:
+        value: 80
+      requests: 30
diff --git a/tests/api_data/test_data.py b/tests/api_data/test_data.py
index 7b2275eb..5b5a56ec 100644
--- a/tests/api_data/test_data.py
+++ b/tests/api_data/test_data.py
@@ -263,6 +263,12 @@
         "short_name": "COF",
         "description": "unit testing fund",
     },
+    "fund_store/funds/DPIF": {
+        "id": "DPIF",
+        "name": "Digital Planning Innovation Fund",
+        "short_name": "DPIF",
+        "description": "unit testing fund",
+    },
     "fund_store/funds/{fund_id}/rounds/{round_id}": {
         "id": test_round_id,
         "fund_id": test_fund_id,
diff --git a/tests/conftest.py b/tests/conftest.py
index d518042c..c85c0491 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -112,6 +112,26 @@
             "roles": ["COF_COMMENTER"],
         },
     },
+    "DPIF": {
+        "LEAD_ASSESSOR": {
+            "accountId": "dpif-lead-assessor",
+            "email": "dpif-lead-assessor@test.com",
+            "fullName": "Test User",
+            "roles": ["DPIF_LEAD_ASSESSOR", "DPIF_ASSESSOR", "DPIF_COMMENTER"],
+        },
+        "ASSESSOR": {
+            "accountId": "dpif-assessor",
+            "email": "dpif-assessor@test.com",
+            "fullName": "Test User",
+            "roles": ["DPIF_ASSESSOR", "DPIF_COMMENTER"],
+        },
+        "COMMENTER": {
+            "accountId": "dpif-commenter",
+            "email": "dpif-commenter@test.com",
+            "fullName": "Test User",
+            "roles": ["DPIF_COMMENTER"],
+        },
+    },
 }
 
 test_roleless_user_claims = {
@@ -297,6 +317,7 @@ def mock_get_funds():
         Fund.from_json(mock_api_results["fund_store/funds/NSTF"]),
         Fund.from_json(mock_api_results["fund_store/funds/CYP"]),
         Fund.from_json(mock_api_results["fund_store/funds/COF"]),
+        Fund.from_json(mock_api_results["fund_store/funds/DPIF"]),
     ]
 
     with (
diff --git a/tests/test_activity_trail.py b/tests/test_activity_trail.py
new file mode 100644
index 00000000..86ae5cfe
--- /dev/null
+++ b/tests/test_activity_trail.py
@@ -0,0 +1,82 @@
+import pytest
+from app.blueprints.assessments.activity_trail import add_user_info
+from app.blueprints.assessments.activity_trail import AssociatedTags
+from app.blueprints.assessments.activity_trail import BaseModel
+from app.blueprints.assessments.activity_trail import get_user_info
+from flask import Flask
+
+
+class TestActivityTrail:
+    test_app = Flask("app")
+    list_data_class = [type("AssociatedTags", (), {"user_id": "00000"})]
+    list_data_dict = [{"user_id": "00000"}]
+    state = type("AssessorTaskList", (), {"fund_short_name": "COF"})()
+    _accounts_list = {
+        "00000": {
+            "full_name": "Development User",
+            "email": "dev@example.com",
+            "roles": ["COF_LEAD_ASSESSOR", "COF_ASSESSOR"],
+            "email_address": "dev@example.com",
+            "highest_role": "LEAD_ASSESSOR",
+        }
+    }
+
+    @pytest.mark.parametrize(
+        "list_data",
+        [(list_data_class)],
+    )
+    def test_get_user_info(self, list_data, mocker):
+
+        # Patching the get_bulk_accounts_dict function
+        mocker.patch(
+            "app.blueprints.assessments.activity_trail.get_bulk_accounts_dict",
+            return_value=self._accounts_list,
+        )
+
+        with self.test_app.app_context():
+            result = get_user_info(list_data, self.state)
+        assert result == self._accounts_list
+
+    def test_add_user_info(self, mocker):
+        with self.test_app.app_context():
+            mocker.patch(
+                "app.blueprints.assessments.activity_trail.get_user_info",
+                return_value=self._accounts_list,
+            )
+            result = add_user_info(self.list_data_class, self.state)
+
+        expected_result = [
+            AssociatedTags(
+                application_id="e67851a3-a190-456e-b2fa-9f1f8a2732cb",
+                tag_id="bdd16710-5d13-4d15-a9b3-2344bc1fcc75",
+                value="Test General tag",
+                user_id="00000",
+                associated=True,
+                purpose="GENERAL",
+                created_at="2023-11-16 13:12:21.617459+00:00",
+                full_name="Development User",
+                email_address="dev@example.com",
+                highest_role="LEAD_ASSESSOR",
+                date_created="2023-11-16 13:12:21",
+            ),
+        ]
+
+        for instance in result:
+            assert instance.user_id == expected_result[0].user_id
+            assert "dev@example.com" == expected_result[0].email_address
+            assert "LEAD_ASSESSOR" == expected_result[0].highest_role
+            assert "2023-11-16 13:12:21" == expected_result[0].date_created
+
+    @pytest.mark.parametrize(
+        "date_str, expected_date_format",
+        [
+            ("2023-11-16T13:26:25.686556", "2023-11-16 13:26:25"),
+            ("2023-11-16 18:35:08.285688+00:00", "2023-11-16 18:35:08"),
+            ("2023-11-16 19:01:04", "2023-11-16 19:01:04"),
+        ],
+    )
+    def test_format_date(self, date_str, expected_date_format):
+        with self.test_app.app_context():
+            result = BaseModel._format_date(date_str)
+
+        assert result == expected_date_format
diff --git a/tests/test_authorisation.py b/tests/test_authorisation.py
index d4addbdc..8f44856e 100644
--- a/tests/test_authorisation.py
+++ b/tests/test_authorisation.py
@@ -103,7 +103,7 @@ def test_roleless_user_redirected_to_roles_error(
         assert response.status_code == 302
         assert response.location == (
             "https://authenticator/service/user?roles_required=TF_COMMENTER|NSTF_COMMENTER"
-            + "|CYP_COMMENTER|COF_COMMENTER"
+            + "|CYP_COMMENTER|COF_COMMENTER|DPIF_COMMENTER"
         )
 
     @pytest.mark.mock_parameters(
diff --git a/tests/test_jinja_macros.py b/tests/test_jinja_macros.py
index 7660490c..ff3f68b2 100644
--- a/tests/test_jinja_macros.py
+++ b/tests/test_jinja_macros.py
@@ -630,7 +630,16 @@ def test_theme_mapping_works_based_on_meta_key(
 
         assert expected_unique_id in rendered_html, "Unique ID not found"
 
-    def test_banner_summary_macro(self, request_ctx):
+    @pytest.mark.parametrize(
+        "fund_short_name, show_funding_amount_requested",
+        [
+            ("TFID", True),
+            ("DPIF", False),
+        ],
+    )
+    def test_banner_summary_macro(
+        self, request_ctx, fund_short_name, show_funding_amount_requested
+    ):
         fund_name = "Test Fund"
         project_reference = "TEST123"
         project_name = "Test Project"
@@ -639,12 +648,14 @@ def test_banner_summary_macro(self, request_ctx):
         flag_status = "Flagged"
 
         rendered_html = render_template_string(
-            "{{ banner_summary(fund_name, project_reference, project_name,"
-            " funding_amount_requested, assessment_status, flag_status) }}",
+            "{{ banner_summary(fund_name, fund_short_name, project_reference,"
+            " project_name, funding_amount_requested, assessment_status,"
+            " flag_status) }}",
             banner_summary=get_template_attribute(
                 "macros/banner_summary.html", "banner_summary"
             ),
             fund_name=fund_name,
+            fund_short_name=fund_short_name,
             project_reference=project_reference,
             project_name=project_name,
             funding_amount_requested=funding_amount_requested,
@@ -674,11 +685,17 @@ def test_banner_summary_macro(self, request_ctx):
             ),
             text="Project name: Test Project",
         ), "Project name not found"
-        assert soup.find(
+
+        funding_amount_requested_element = soup.find(
             "p",
             class_="govuk-body-l fsd-banner-content",
             text="Total funding requested: £123,456.78",
-        ), "Funding amount not found"
+        )
+        if show_funding_amount_requested:
+            assert funding_amount_requested_element, "Funding amount not found"
+        else:
+            assert not funding_amount_requested_element, "Funding amount found"
+
         assert soup.find(
             "strong",
             class_="govuk-tag",
@@ -690,6 +707,7 @@ def test_banner_summary_macro(self, request_ctx):
 
     def test_stopped_flag_macro(self, request_ctx):
         fund_name = "Test Fund"
+        fund_short_name = "TFID"
         project_reference = "TEST123"
         project_name = "Test Project"
         funding_amount_requested = 123456.78
@@ -697,12 +715,14 @@ def test_stopped_flag_macro(self, request_ctx):
         flag_status = "Stopped"
 
         rendered_html = render_template_string(
-            "{{ banner_summary(fund_name, project_reference, project_name,"
-            " funding_amount_requested, assessment_status, flag_status) }}",
+            "{{ banner_summary(fund_name, fund_short_name, project_reference,"
+            " project_name, funding_amount_requested, assessment_status,"
+            " flag_status) }}",
             banner_summary=get_template_attribute(
                 "macros/banner_summary.html", "banner_summary"
             ),
             fund_name=fund_name,
+            fund_short_name=fund_short_name,
             project_reference=project_reference,
             project_name=project_name,
             funding_amount_requested=funding_amount_requested,
diff --git a/tests/test_routes.py b/tests/test_routes.py
index eb992259..420e7a65 100644
--- a/tests/test_routes.py
+++ b/tests/test_routes.py
@@ -150,7 +150,6 @@ def test_route_landing_export_link_visibility(
                 "cohort": "ALL",
                 "status": "ALL",
                 "filter_by_tag": "ALL",
-                "local_authority": "ALL",
                 "country": "ALL",
                 "region": "ALL",
             },
@@ -335,6 +334,82 @@ def test_route_fund_dashboard_COF(
             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
+        )
+
     @pytest.mark.mock_parameters(
         {
             "fund_short_name": "TF",