Updated UI and icons