Some UI changes.
Chage UI logic