Update for recent changes in the UI