More changes to the UI/security