Updated UI with Amir