admin tools enhancements