Updated UX to sync with aaac55..5b72a7b in the master