simplifying admin flow