Small enhancements to make it easier to customise Admin