Some UI revised