modifying roles in sidebar.
Merge origin/master