fix UI issues.