Some changes in admin from code review.