UI bug squashing