more refactoring, going to admin pages