Fixed compiler warning
Updated UI