Prepare add/edit role in ACL and corrects some ACL views bugs for #2