Draft: UI fixes rebased
@glstonebraker this is the best I could do to rebase your changes. Please let me know what I missed.
Edited by Rebecca Claire Murphy
@glstonebraker this is the best I could do to rebase your changes. Please let me know what I missed.