UI and controller changes