More final UI changes.
Final UI change.