Adjust UI to work with updated API