Small changes to admin folder
Trying to fix merge