Updated UI to be in sync with staging app