Some UI changes

Some UI changes