Admin & SIte enhancements issue