few UI fixes