refactoring
better admin views