Some UI Bug FIxes