[UI] fix UI issues