A small collection of XUI tweaks to fix UI issues caused by merges or to expand existing functionality from merges