fix UI and more