Updated UI and Changed Icons