Privacy Panel new pull request

This is a new pull request. We had to remove the old one due to big problems with git and some Schroedinger patches....
bad merge, fixed :)