Some UI fixes.
UI changes.