Made UI fixes