[IMP] Some UI improvements