refactor admin bundle 2