Ticket #33 Removed roles in features
Ticket #33 Updated views to make use of flag