well I would merge this now, then fix this after ui-refactoring is rebased on here. I want to get this (and the other PR) "removed" from ui-refactoring, and then do some additional final cleanups on ui-refactoring itself.