Made UI more robust