fix UI and comment