Updates from the calls

This has most the updates from the call, still more coming, but opening the PR now so we can all get on the same page.
Can you add a comment about what this is doing from the UI perspective?