Admin & Members completely refactored