fix UI issues