Some enhancements to the admin