fix UI bugs. update UI