admin panel forms refactoring part 3