Client UI fixes