Admin reports refactoring

Should be most of the last functional changes before going to prod.  Remaining to-do's are refactoring that shouldn't affect functionality.

@emord