update and fix UI issues