- refactoring of admin pages