Made UI more presentable