Some UI related fixes.