We need to consolidate a bunch of things that are unnecessarily different. I'm not sure what the eventual solution will be, but my current plan is a cleanup pass once we can get rid of all the old UI code.