fix UI and other