various PGP ui fixes