Finished Admin Console refactoring