Tidy and re-ordered role drop down in admin UI

https://www.pivotaltracker.com/story/show/47509959