fix UI and new badge