More Safety menu changes