Some missing UI stuff I didn't push earlier.
Merge remote-tracking branch 'origin/develop' into develop