various UI fixes