some refactoring in admin area; starting working on collection highlighting for admins