Additional UI repairs for Confidentiality.
Merge remote-tracking branch 'origin/feature/confidential-issues-yaniv' into feature/confidential-issues-yaniv