Fixing a few recent UI issues