UI fixes polished