Additional UI fixes