Update feature/ui with recent changes in dev

This pull request is simply a reminder for updating a feature branch with dev. However, it's a fairly nasty manual merge, and we'll probably want to deal with it soon.

![](https://i.chzbgr.com/maxW500/7055781888/h3DD4CAA5/.gif)