Refactored administration area