general UI fixes