Altered Profiles and System Setting pages to reference restructured lookup data.