Admin quality > quantity: Partial re-work of admin system.