WSTEAM1-785: Refactor Components to try fix NVDA time/flex bug

[Isabella-Mitchell]

Resolves JIRA [number]

Overall changes

A very high-level summary of easily-reproducible changes that can be understood by non-devs, and why these changes where made.

Code changes

• A bullet point list of key code changes that have been made.

Testing

1. List the steps used to test this PR.

Helpful Links

Add Links to useful resources related to this PR if applicable.

Coding Standards

Repository use guidelines