Use a tag for the admin menu
Fix roles control
Simplify roles management