Merge "UI bug fixes."