security, UI fixes