Did some refactoring and made the management page async