Simplify passphrase dialog creation

Also latest style fixes