## First part of #22661
-Separating this work into 2 PRs, since this part of the fix will
immediately improve dev and user experience of the UI
[Demo](https://www.loom.com/share/b8f7657dca434f5aa929ca6cf4059cc8)
- [x] Manual QA for all new/changed functionality
- Change file will be included in PR 2/2 for this issue
Co-authored-by: Jacob Shandling <jacob@fleetdm.com>