Some UI updates

Some UI updates