Admin Manager changes

Admin manager changes