Made UI more consistent