User role improvements

Stories: https://www.pivotaltracker.com/story/show/61862422, https://www.pivotaltracker.com/story/show/63793462 and https://www.pivotaltracker.com/story/show/63793300.