Introduced changes suggested by EJ

This is a new pull regrets for the Privacy Panel. I am very sorry to open another pull request instead of reopening the old one, but before I thought twice I have deleted my mold branch and had to reopen everything from the beginning.