More changes on manage keys UI