Few more UI updates.