Refactor AdminCtrl