Fixed up more of the admin views, models, and services.