Further Updated UI