refactor admin and started modal service