Bundle upgrade
Standardize admin