Made UI more friendly