Feat/admin refactor