UI and performance fixes