Some improvements on admin views.