ui changes.
merge with chris.