UI fixes.
merge commit