WIP #435 Moderation Tools Improvements
Fix conflicts
Merge pull request #684 from Sama34/wip-435

WIP #435 Moderation Tools Permissions