UI and benchmark improvements