Few UI fixes