Admin console with override system
Resolved merge conflicts