UI fixes.
UI update
Merge