Additional UI repairs for Confidentiality.