Made UI more fluid