refactoring and admin style