many UI fixes