Some refactors to Admin Panel