Fix ordering of Roles and Services in UI detail and wizard pages