Fix UI a little
Disable substitute by admin