Updated UI and automatic switch tracking