Major cleanup, separating print functions into admin/