More Admin UI fixes