More ui and security improvements