Refactor
Fix display for multiple roles